diff --git a/.gitattributes b/.gitattributes
index 98249070e4d..ad6b8438c32 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -495,6 +495,7 @@ src/emu/debug/express.h svneol=native#text/plain
 src/emu/debug/textbuf.c svneol=native#text/plain
 src/emu/debug/textbuf.h svneol=native#text/plain
 src/emu/debugger.h svneol=native#text/plain
+src/emu/deprecat.h svneol=native#text/plain
 src/emu/drawgfx.c svneol=native#text/plain
 src/emu/drawgfx.h svneol=native#text/plain
 src/emu/driver.c svneol=native#text/plain
diff --git a/src/emu/audio/generic.c b/src/emu/audio/generic.c
index bccea2bb0ee..8aabc35de13 100644
--- a/src/emu/audio/generic.c
+++ b/src/emu/audio/generic.c
@@ -11,6 +11,7 @@
 
 #include "driver.h"
 #include "generic.h"
+#include "deprecat.h"
 
 
 
diff --git a/src/emu/cpu/adsp2100/adsp2100.c b/src/emu/cpu/adsp2100/adsp2100.c
index 274f9c5e116..9177c3ee835 100644
--- a/src/emu/cpu/adsp2100/adsp2100.c
+++ b/src/emu/cpu/adsp2100/adsp2100.c
@@ -96,6 +96,7 @@
 ***************************************************************************/
 
 #include "debugger.h"
+#include "deprecat.h"
 #include "adsp2100.h"
 
 
diff --git a/src/emu/cpu/alph8201/alph8201.c b/src/emu/cpu/alph8201/alph8201.c
index 41986cd4efa..ae154bc398b 100644
--- a/src/emu/cpu/alph8201/alph8201.c
+++ b/src/emu/cpu/alph8201/alph8201.c
@@ -133,6 +133,7 @@ Timming
 ****************************************************************************/
 
 #include "debugger.h"
+#include "deprecat.h"
 #include "alph8201.h"
 
 /* instruction cycle count */
diff --git a/src/emu/cpu/apexc/apexc.c b/src/emu/cpu/apexc/apexc.c
index 5d99439728e..3c335c9206d 100644
--- a/src/emu/cpu/apexc/apexc.c
+++ b/src/emu/cpu/apexc/apexc.c
@@ -324,8 +324,9 @@ field:      X address   D           Function    Y address   D (part 2)
 */
 
 #include "cpuintrf.h"
-#include "apexc.h"
 #include "debugger.h"
+#include "deprecat.h"
+#include "apexc.h"
 
 typedef struct
 {
diff --git a/src/emu/cpu/arm/arm.c b/src/emu/cpu/arm/arm.c
index 6925e80274e..050467b1326 100644
--- a/src/emu/cpu/arm/arm.c
+++ b/src/emu/cpu/arm/arm.c
@@ -16,6 +16,7 @@
 */
 
 #include "arm.h"
+#include "deprecat.h"
 #include "debugger.h"
 
 #define READ8(addr)			cpu_read8(addr)
diff --git a/src/emu/cpu/arm7/arm7.c b/src/emu/cpu/arm7/arm7.c
index 5ff4e9fb592..97ba6223d1d 100644
--- a/src/emu/cpu/arm7/arm7.c
+++ b/src/emu/cpu/arm7/arm7.c
@@ -35,6 +35,7 @@
     **
 *****************************************************************************/
 #include "arm7.h"
+#include "deprecat.h"
 #include "debugger.h"
 #include "arm7core.h"   //include arm7 core
 
diff --git a/src/emu/cpu/asap/asap.c b/src/emu/cpu/asap/asap.c
index 871a1622da3..acbd2da787b 100644
--- a/src/emu/cpu/asap/asap.c
+++ b/src/emu/cpu/asap/asap.c
@@ -10,6 +10,7 @@
 ***************************************************************************/
 
 #include "debugger.h"
+#include "deprecat.h"
 #include "asap.h"
 
 
diff --git a/src/emu/cpu/ccpu/ccpu.c b/src/emu/cpu/ccpu/ccpu.c
index 9223432d343..ed710c0f753 100644
--- a/src/emu/cpu/ccpu/ccpu.c
+++ b/src/emu/cpu/ccpu/ccpu.c
@@ -9,6 +9,7 @@
 ***************************************************************************/
 
 #include "debugger.h"
+#include "deprecat.h"
 #include "ccpu.h"
 
 
diff --git a/src/emu/cpu/cdp1802/cdp1802.c b/src/emu/cpu/cdp1802/cdp1802.c
index 4567c077b2b..883d2cfd484 100644
--- a/src/emu/cpu/cdp1802/cdp1802.c
+++ b/src/emu/cpu/cdp1802/cdp1802.c
@@ -1,6 +1,6 @@
 #include "driver.h"
-#include "state.h"
 #include "debugger.h"
+#include "deprecat.h"
 #include "cdp1802.h"
 
 typedef struct
diff --git a/src/emu/cpu/cop400/cop410.c b/src/emu/cpu/cop400/cop410.c
index 7d0d86dd3fe..3135a0cf2ea 100644
--- a/src/emu/cpu/cop400/cop410.c
+++ b/src/emu/cpu/cop400/cop410.c
@@ -19,6 +19,7 @@
 
 #include "cpuintrf.h"
 #include "debugger.h"
+#include "deprecat.h"
 #include "cop400.h"
 
 /* The opcode table now is a combination of cycle counts and function pointers */
diff --git a/src/emu/cpu/cop400/cop420.c b/src/emu/cpu/cop400/cop420.c
index 77a9f4bb36d..e012748d688 100644
--- a/src/emu/cpu/cop400/cop420.c
+++ b/src/emu/cpu/cop400/cop420.c
@@ -20,6 +20,7 @@
 
 #include "cpuintrf.h"
 #include "debugger.h"
+#include "deprecat.h"
 #include "cop400.h"
 
 /* The opcode table now is a combination of cycle counts and function pointers */
diff --git a/src/emu/cpu/cp1610/cp1610.c b/src/emu/cpu/cp1610/cp1610.c
index a8a96a484b1..c185fcd93c4 100644
--- a/src/emu/cpu/cp1610/cp1610.c
+++ b/src/emu/cpu/cp1610/cp1610.c
@@ -23,6 +23,7 @@
 
 #include "cpuintrf.h"
 #include "debugger.h"
+#include "deprecat.h"
 #include "cp1610.h"
 
 #define S  0x80
diff --git a/src/emu/cpu/dsp32/dsp32.c b/src/emu/cpu/dsp32/dsp32.c
index 382897edb95..30724d0e4ef 100644
--- a/src/emu/cpu/dsp32/dsp32.c
+++ b/src/emu/cpu/dsp32/dsp32.c
@@ -27,8 +27,8 @@
 
 ***************************************************************************/
 
-#include <math.h>
 #include "debugger.h"
+#include "deprecat.h"
 #include "dsp32.h"
 
 
diff --git a/src/emu/cpu/dsp56k/dsp56k.c b/src/emu/cpu/dsp56k/dsp56k.c
index 4c66091ea43..e40523907e6 100644
--- a/src/emu/cpu/dsp56k/dsp56k.c
+++ b/src/emu/cpu/dsp56k/dsp56k.c
@@ -19,6 +19,7 @@
 ***************************************************************************/
 
 #include "debugger.h"
+#include "deprecat.h"
 #include "dsp56k.h"
 
 // #define PC_E000
diff --git a/src/emu/cpu/e132xs/e132xs.c b/src/emu/cpu/e132xs/e132xs.c
index 7c7d546bb15..09e403a4341 100644
--- a/src/emu/cpu/e132xs/e132xs.c
+++ b/src/emu/cpu/e132xs/e132xs.c
@@ -212,6 +212,7 @@
 *********************************************************************/
 
 #include "debugger.h"
+#include "deprecat.h"
 #include "eminline.h"
 #include "e132xs.h"
 #include "osd_cpu.h"
diff --git a/src/emu/cpu/f8/f8.c b/src/emu/cpu/f8/f8.c
index 6332a95dcda..06345509432 100644
--- a/src/emu/cpu/f8/f8.c
+++ b/src/emu/cpu/f8/f8.c
@@ -26,9 +26,8 @@
    added interrupt functionality
  */
 
-#include <stdio.h>
-#include "cpuintrf.h"
 #include "debugger.h"
+#include "deprecat.h"
 #include "f8.h"
 
 #define S	0x01
diff --git a/src/emu/cpu/g65816/g65816cm.h b/src/emu/cpu/g65816/g65816cm.h
index e1aaef6058c..d7248fb179e 100644
--- a/src/emu/cpu/g65816/g65816cm.h
+++ b/src/emu/cpu/g65816/g65816cm.h
@@ -9,9 +9,9 @@
 /* ================================ INCLUDES ============================== */
 /* ======================================================================== */
 
-#include <limits.h>
 #include "g65816.h"
-#include <stdio.h>
+#include "deprecat.h"
+#include <limits.h>
 
 
 /* ======================================================================== */
diff --git a/src/emu/cpu/h6280/h6280.c b/src/emu/cpu/h6280/h6280.c
index 9c5ced68236..5272473675f 100644
--- a/src/emu/cpu/h6280/h6280.c
+++ b/src/emu/cpu/h6280/h6280.c
@@ -108,6 +108,7 @@
 
 ******************************************************************************/
 #include "debugger.h"
+#include "deprecat.h"
 #include "h6280.h"
 
 static int 	h6280_ICount = 0;
diff --git a/src/emu/cpu/h83002/h83002.c b/src/emu/cpu/h83002/h83002.c
index a71bab1b741..22829735253 100644
--- a/src/emu/cpu/h83002/h83002.c
+++ b/src/emu/cpu/h83002/h83002.c
@@ -28,6 +28,7 @@
 ****************************************************************************/
 
 #include "debugger.h"
+#include "deprecat.h"
 #include "h83002.h"
 #include "h8priv.h"
 
diff --git a/src/emu/cpu/hd6309/hd6309.c b/src/emu/cpu/hd6309/hd6309.c
index 86f725689a8..4bb1a39d27f 100644
--- a/src/emu/cpu/hd6309/hd6309.c
+++ b/src/emu/cpu/hd6309/hd6309.c
@@ -103,6 +103,7 @@
 *****************************************************************************/
 
 #include "debugger.h"
+#include "deprecat.h"
 #include "hd6309.h"
 
 #define VERBOSE 0
diff --git a/src/emu/cpu/i386/i386.c b/src/emu/cpu/i386/i386.c
index 9c896356cfd..f1a364decbf 100644
--- a/src/emu/cpu/i386/i386.c
+++ b/src/emu/cpu/i386/i386.c
@@ -11,6 +11,7 @@
 */
 
 #include "debugger.h"
+#include "deprecat.h"
 #include "i386.h"
 #include "i386intf.h"
 
diff --git a/src/emu/cpu/i8039/i8039.c b/src/emu/cpu/i8039/i8039.c
index fe92faaac28..9ef604e31b4 100644
--- a/src/emu/cpu/i8039/i8039.c
+++ b/src/emu/cpu/i8039/i8039.c
@@ -35,6 +35,7 @@
 
 
 #include "debugger.h"
+#include "deprecat.h"
 #include "i8039.h"
 
 
diff --git a/src/emu/cpu/i8051/i8051.c b/src/emu/cpu/i8051/i8051.c
index 4d84d55c634..995c7b7d0eb 100644
--- a/src/emu/cpu/i8051/i8051.c
+++ b/src/emu/cpu/i8051/i8051.c
@@ -64,6 +64,7 @@
  *****************************************************************************/
 
 #include "debugger.h"
+#include "deprecat.h"
 #include "i8051.h"
 
 #define VERBOSE 0
diff --git a/src/emu/cpu/i8085/i8085.c b/src/emu/cpu/i8085/i8085.c
index a7d9e237cb5..5b605b2f2bf 100644
--- a/src/emu/cpu/i8085/i8085.c
+++ b/src/emu/cpu/i8085/i8085.c
@@ -121,6 +121,7 @@
 /*int survival_prot = 0; */
 
 #include "debugger.h"
+#include "deprecat.h"
 #include "i8085.h"
 #include "i8085cpu.h"
 #include "i8085daa.h"
diff --git a/src/emu/cpu/i86/i286.c b/src/emu/cpu/i86/i286.c
index bba38b2e843..ab51df8cb9a 100644
--- a/src/emu/cpu/i86/i286.c
+++ b/src/emu/cpu/i86/i286.c
@@ -3,8 +3,9 @@
 *               (initial work based on David Hedley's pcemu)                *
 ****************************************************************************/
 
-#include "host.h"
 #include "debugger.h"
+#include "deprecat.h"
+#include "host.h"
 
 
 #define VERBOSE 0
diff --git a/src/emu/cpu/i86/i86.c b/src/emu/cpu/i86/i86.c
index 08af0624c67..dfa07c698f3 100644
--- a/src/emu/cpu/i86/i86.c
+++ b/src/emu/cpu/i86/i86.c
@@ -4,9 +4,10 @@
 ****************************************************************************/
 /* 26.March 2000 PeT changed set_irq_line */
 
-#include "host.h"
 #include "debugger.h"
+#include "deprecat.h"
 
+#include "host.h"
 #include "i86.h"
 #include "i86intf.h"
 
diff --git a/src/emu/cpu/i8x41/i8x41.c b/src/emu/cpu/i8x41/i8x41.c
index ad4963b5252..2ed90721304 100644
--- a/src/emu/cpu/i8x41/i8x41.c
+++ b/src/emu/cpu/i8x41/i8x41.c
@@ -87,6 +87,7 @@
  *****************************************************************************/
 
 #include "debugger.h"
+#include "deprecat.h"
 #include "i8x41.h"
 
 typedef struct {
diff --git a/src/emu/cpu/i960/i960.c b/src/emu/cpu/i960/i960.c
index 6412deb056a..ac95e6e4b72 100644
--- a/src/emu/cpu/i960/i960.c
+++ b/src/emu/cpu/i960/i960.c
@@ -1,4 +1,5 @@
 #include "debugger.h"
+#include "deprecat.h"
 #include "i960.h"
 #include "i960dis.h"
 #include <math.h>
diff --git a/src/emu/cpu/jaguar/jaguar.c b/src/emu/cpu/jaguar/jaguar.c
index d3cee108069..0ce5f23eed2 100644
--- a/src/emu/cpu/jaguar/jaguar.c
+++ b/src/emu/cpu/jaguar/jaguar.c
@@ -7,6 +7,7 @@
 ***************************************************************************/
 
 #include "debugger.h"
+#include "deprecat.h"
 #include "jaguar.h"
 
 #define LOG_GPU_IO		0
diff --git a/src/emu/cpu/konami/konami.c b/src/emu/cpu/konami/konami.c
index 34629818f86..209e815b458 100644
--- a/src/emu/cpu/konami/konami.c
+++ b/src/emu/cpu/konami/konami.c
@@ -35,6 +35,7 @@
 *****************************************************************************/
 
 #include "debugger.h"
+#include "deprecat.h"
 #include "konami.h"
 
 #define VERBOSE 0
diff --git a/src/emu/cpu/lh5801/lh5801.c b/src/emu/cpu/lh5801/lh5801.c
index 61b69799cbe..fdb33dbf97d 100644
--- a/src/emu/cpu/lh5801/lh5801.c
+++ b/src/emu/cpu/lh5801/lh5801.c
@@ -17,13 +17,11 @@
  * based on info found on an artikel for the tandy trs80 pc2
  *
  *****************************************************************************/
-#include "cpuintrf.h"
 #include "debugger.h"
+#include "deprecat.h"
 
 #include "lh5801.h"
 
-//typedef int bool;
-
 #define VERBOSE 0
 
 #define LOG(x)	do { if (VERBOSE) logerror x; } while (0)
diff --git a/src/emu/cpu/m37710/m37710cm.h b/src/emu/cpu/m37710/m37710cm.h
index 1c429a8685e..53a56de7288 100644
--- a/src/emu/cpu/m37710/m37710cm.h
+++ b/src/emu/cpu/m37710/m37710cm.h
@@ -12,6 +12,7 @@
 #include <limits.h>
 #include "cpuintrf.h"
 #include "debugger.h"
+#include "deprecat.h"
 #include "m37710.h"
 
 
diff --git a/src/emu/cpu/m6502/m4510.c b/src/emu/cpu/m6502/m4510.c
index a92f36bfeb2..c1c1f77c0d3 100644
--- a/src/emu/cpu/m6502/m4510.c
+++ b/src/emu/cpu/m6502/m4510.c
@@ -101,6 +101,7 @@ z:      xxxx address bits a19 .. a16 for memory accesses with a15 1 ?
  */
 
 #include "debugger.h"
+#include "deprecat.h"
 #include "m6502.h"
 #include "m4510.h"
 
diff --git a/src/emu/cpu/m6502/m6502.c b/src/emu/cpu/m6502/m6502.c
index 7bd8f9b494d..24c3325fef4 100644
--- a/src/emu/cpu/m6502/m6502.c
+++ b/src/emu/cpu/m6502/m6502.c
@@ -30,6 +30,7 @@
 #endif
 
 #include "debugger.h"
+#include "deprecat.h"
 #include "m6502.h"
 #include "ops02.h"
 #include "ill02.h"
diff --git a/src/emu/cpu/m6502/m6509.c b/src/emu/cpu/m6502/m6509.c
index 7873330b328..49ee319c120 100644
--- a/src/emu/cpu/m6502/m6509.c
+++ b/src/emu/cpu/m6502/m6509.c
@@ -38,6 +38,7 @@ addresses take place.
 */
 
 #include "debugger.h"
+#include "deprecat.h"
 #include "m6509.h"
 
 #include "ops02.h"
diff --git a/src/emu/cpu/m6800/m6800.c b/src/emu/cpu/m6800/m6800.c
index ee42cf802ba..a7271c14081 100644
--- a/src/emu/cpu/m6800/m6800.c
+++ b/src/emu/cpu/m6800/m6800.c
@@ -74,6 +74,7 @@ TODO:
 */
 
 #include "debugger.h"
+#include "deprecat.h"
 #include "m6800.h"
 
 #define VERBOSE 0
diff --git a/src/emu/cpu/m68000/m68kmame.h b/src/emu/cpu/m68000/m68kmame.h
index f98bee2e33c..7273a345d24 100644
--- a/src/emu/cpu/m68000/m68kmame.h
+++ b/src/emu/cpu/m68000/m68kmame.h
@@ -5,8 +5,8 @@
 /* ============================== MAME STUFF ============================== */
 /* ======================================================================== */
 
-#include "cpuintrf.h"
 #include "debugger.h"
+#include "deprecat.h"
 #include "m68000.h"
 
 /* Configuration switches (see m68kconf.h for explanation) */
diff --git a/src/emu/cpu/m6805/m6805.c b/src/emu/cpu/m6805/m6805.c
index dfa61c964d0..948cdb867f4 100644
--- a/src/emu/cpu/m6805/m6805.c
+++ b/src/emu/cpu/m6805/m6805.c
@@ -32,6 +32,7 @@
 
 
 #include "debugger.h"
+#include "deprecat.h"
 #include "m6805.h"
 
 #define IRQ_LEVEL_DETECT 0
diff --git a/src/emu/cpu/m6809/m6809.c b/src/emu/cpu/m6809/m6809.c
index 7c70c531de0..ded25158c21 100644
--- a/src/emu/cpu/m6809/m6809.c
+++ b/src/emu/cpu/m6809/m6809.c
@@ -71,6 +71,7 @@
 *****************************************************************************/
 
 #include "debugger.h"
+#include "deprecat.h"
 #include "m6809.h"
 
 /* Enable big switch statement for the main opcodes */
diff --git a/src/emu/cpu/mb86233/mb86233.c b/src/emu/cpu/mb86233/mb86233.c
index 9b5f17365b9..0067d5da1ea 100644
--- a/src/emu/cpu/mb86233/mb86233.c
+++ b/src/emu/cpu/mb86233/mb86233.c
@@ -14,6 +14,7 @@
 ***************************************************************************/
 
 #include "mb86233.h"
+#include "deprecat.h"
 #include "debugger.h"
 
 /***************************************************************************
diff --git a/src/emu/cpu/mb88xx/mb88xx.c b/src/emu/cpu/mb88xx/mb88xx.c
index 8e94dbaca7b..27b14df3177 100644
--- a/src/emu/cpu/mb88xx/mb88xx.c
+++ b/src/emu/cpu/mb88xx/mb88xx.c
@@ -14,6 +14,7 @@
 ***************************************************************************/
 
 #include "debugger.h"
+#include "deprecat.h"
 #include "mb88xx.h"
 
 /***************************************************************************
diff --git a/src/emu/cpu/mc68hc11/mc68hc11.c b/src/emu/cpu/mc68hc11/mc68hc11.c
index ed5a7bfb225..1757d7922c6 100644
--- a/src/emu/cpu/mc68hc11/mc68hc11.c
+++ b/src/emu/cpu/mc68hc11/mc68hc11.c
@@ -5,6 +5,7 @@
  */
 
 #include "debugger.h"
+#include "deprecat.h"
 #include "mc68hc11.h"
 
 enum {
diff --git a/src/emu/cpu/mips/mdrc64.c b/src/emu/cpu/mips/mdrc64.c
index 71c85c0b031..a6200a3d324 100644
--- a/src/emu/cpu/mips/mdrc64.c
+++ b/src/emu/cpu/mips/mdrc64.c
@@ -79,6 +79,7 @@
 ***************************************************************************/
 
 #include "mips3fe.h"
+#include "deprecat.h"
 
 
 /***************************************************************************
diff --git a/src/emu/cpu/mips/mips3drc.c b/src/emu/cpu/mips/mips3drc.c
index 245fa74404b..1f4422ca878 100644
--- a/src/emu/cpu/mips/mips3drc.c
+++ b/src/emu/cpu/mips/mips3drc.c
@@ -16,6 +16,7 @@
 #include "debugger.h"
 #include "mips3com.h"
 #include "mips3fe.h"
+#include "deprecat.h"
 #include "cpu/x86log.h"
 #include "cpu/drcfe.h"
 
diff --git a/src/emu/cpu/mips/psx.c b/src/emu/cpu/mips/psx.c
index 77934017a87..713e690924d 100644
--- a/src/emu/cpu/mips/psx.c
+++ b/src/emu/cpu/mips/psx.c
@@ -13,10 +13,10 @@
  *
  */
 
-#include "ui.h"
 #include "debugger.h"
-#include "psx.h"
+#include "deprecat.h"
 #include "osd_cpu.h"
+#include "psx.h"
 
 #define LOG_BIOSCALL ( 0 )
 
diff --git a/src/emu/cpu/mips/r3000.c b/src/emu/cpu/mips/r3000.c
index 67d462dbeb5..32c9e61ff0f 100644
--- a/src/emu/cpu/mips/r3000.c
+++ b/src/emu/cpu/mips/r3000.c
@@ -7,6 +7,7 @@
 ***************************************************************************/
 
 #include "debugger.h"
+#include "deprecat.h"
 #include "r3000.h"
 
 
diff --git a/src/emu/cpu/nec/nec.c b/src/emu/cpu/nec/nec.c
index 4d2ae11365e..b7bbb5dfc66 100644
--- a/src/emu/cpu/nec/nec.c
+++ b/src/emu/cpu/nec/nec.c
@@ -104,6 +104,7 @@
 ****************************************************************************/
 
 #include "debugger.h"
+#include "deprecat.h"
 
 typedef UINT8 BOOLEAN;
 typedef UINT8 BYTE;
diff --git a/src/emu/cpu/pdp1/pdp1.c b/src/emu/cpu/pdp1/pdp1.c
index 97bb6f4b824..5b21b51513f 100644
--- a/src/emu/cpu/pdp1/pdp1.c
+++ b/src/emu/cpu/pdp1/pdp1.c
@@ -335,8 +335,8 @@
 */
 
 
-#include "cpuintrf.h"
 #include "debugger.h"
+#include "deprecat.h"
 #include "pdp1.h"
 
 #define LOG 0
diff --git a/src/emu/cpu/pic16c5x/pic16c5x.c b/src/emu/cpu/pic16c5x/pic16c5x.c
index bd2f82aadc4..c8e0b30ed95 100644
--- a/src/emu/cpu/pic16c5x/pic16c5x.c
+++ b/src/emu/cpu/pic16c5x/pic16c5x.c
@@ -54,6 +54,7 @@
 
 
 #include "debugger.h"
+#include "deprecat.h"
 #include "pic16c5x.h"
 
 
diff --git a/src/emu/cpu/powerpc/ppcdrc.c b/src/emu/cpu/powerpc/ppcdrc.c
index 2e375c610a6..9deb156f0a2 100644
--- a/src/emu/cpu/powerpc/ppcdrc.c
+++ b/src/emu/cpu/powerpc/ppcdrc.c
@@ -4,8 +4,9 @@
     Written by Ville Linde
 */
 
-#include "ppc.h"
 #include "debugger.h"
+#include "deprecat.h"
+#include "ppc.h"
 #include "cpu/x86drc.h"
 
 
diff --git a/src/emu/cpu/rsp/rsp.c b/src/emu/cpu/rsp/rsp.c
index 94b9675d058..739a65fd884 100644
--- a/src/emu/cpu/rsp/rsp.c
+++ b/src/emu/cpu/rsp/rsp.c
@@ -5,9 +5,9 @@
 */
 
 #include "cpuintrf.h"
-#include "rsp.h"
 #include "debugger.h"
-#include <math.h>	// sqrt
+#include "deprecat.h"
+#include "rsp.h"
 
 #define LOG_INSTRUCTION_EXECUTION		0
 #define SAVE_DISASM						0
diff --git a/src/emu/cpu/s2650/s2650.c b/src/emu/cpu/s2650/s2650.c
index 0be6518bd5c..3dbf86c8664 100644
--- a/src/emu/cpu/s2650/s2650.c
+++ b/src/emu/cpu/s2650/s2650.c
@@ -13,6 +13,7 @@
  *************************************************************************/
 
 #include "debugger.h"
+#include "deprecat.h"
 #include "s2650.h"
 #include "s2650cpu.h"
 
diff --git a/src/emu/cpu/saturn/saturn.c b/src/emu/cpu/saturn/saturn.c
index 7fad514bfe3..a0184b494a3 100644
--- a/src/emu/cpu/saturn/saturn.c
+++ b/src/emu/cpu/saturn/saturn.c
@@ -19,8 +19,8 @@
  *   - This entire notice must remain in the source code.
  *
  *****************************************************************************/
-#include "cpuintrf.h"
 #include "debugger.h"
+#include "deprecat.h"
 
 #include "saturn.h"
 #include "sat.h"
diff --git a/src/emu/cpu/sc61860/sc61860.c b/src/emu/cpu/sc61860/sc61860.c
index adbde246d93..86619ce601c 100644
--- a/src/emu/cpu/sc61860/sc61860.c
+++ b/src/emu/cpu/sc61860/sc61860.c
@@ -27,8 +27,8 @@
  *         Extended execute procudure with HLT-mode of CPU.
  *****************************************************************************/
 
-#include "cpuintrf.h"
 #include "debugger.h"
+#include "deprecat.h"
 
 #include "sc61860.h"
 #include "sc.h"
diff --git a/src/emu/cpu/se3208/se3208.c b/src/emu/cpu/se3208/se3208.c
index 88cfb9d6b31..aa19b74ee04 100644
--- a/src/emu/cpu/se3208/se3208.c
+++ b/src/emu/cpu/se3208/se3208.c
@@ -1,4 +1,5 @@
 #include "debugger.h"
+#include "deprecat.h"
 #include "se3208.h"
 
 /*
diff --git a/src/emu/cpu/sh2/sh2.c b/src/emu/cpu/sh2/sh2.c
index 42f8a12a252..0ceb32235c7 100644
--- a/src/emu/cpu/sh2/sh2.c
+++ b/src/emu/cpu/sh2/sh2.c
@@ -101,6 +101,7 @@
  *****************************************************************************/
 
 #include "debugger.h"
+#include "deprecat.h"
 #include "sh2.h"
 
 /* speed up delay loops, bail out of tight loops */
diff --git a/src/emu/cpu/sh4/sh4.c b/src/emu/cpu/sh4/sh4.c
index fe582b66eac..308e01d7247 100644
--- a/src/emu/cpu/sh4/sh4.c
+++ b/src/emu/cpu/sh4/sh4.c
@@ -25,7 +25,7 @@
 #include "debugger.h"
 #include "sh4.h"
 #include "sh4regs.h"
-#include <math.h>
+#include "deprecat.h"
 
 /* speed up delay loops, bail out of tight loops */
 #define BUSY_LOOP_HACKS 	0
diff --git a/src/emu/cpu/sharc/sharc.c b/src/emu/cpu/sharc/sharc.c
index ae120c096a4..e9041116132 100644
--- a/src/emu/cpu/sharc/sharc.c
+++ b/src/emu/cpu/sharc/sharc.c
@@ -4,6 +4,7 @@
 */
 
 #include "sharc.h"
+#include "deprecat.h"
 #include "debugger.h"
 
 #ifdef MAME_DEBUG
diff --git a/src/emu/cpu/sm8500/sm8500.c b/src/emu/cpu/sm8500/sm8500.c
index c98625340af..3a92c5ea023 100644
--- a/src/emu/cpu/sm8500/sm8500.c
+++ b/src/emu/cpu/sm8500/sm8500.c
@@ -9,8 +9,9 @@
   Code by Wilbert Pol
 */
 
-#include "sm8500.h"
 #include "debugger.h"
+#include "deprecat.h"
+#include "sm8500.h"
 
 #define FLAG_C	0x80
 #define FLAG_Z	0x40
diff --git a/src/emu/cpu/spc700/spc700.c b/src/emu/cpu/spc700/spc700.c
index 326fff93453..bb0ccab6c6a 100644
--- a/src/emu/cpu/spc700/spc700.c
+++ b/src/emu/cpu/spc700/spc700.c
@@ -61,8 +61,9 @@ Address  Function Register  R/W  When Reset          Remarks
 /* ======================================================================== */
 
 #include <limits.h>
-#include "spc700.h"
 #include "debugger.h"
+#include "deprecat.h"
+#include "spc700.h"
 
 /* ======================================================================== */
 /* ==================== ARCHITECTURE-DEPENDANT DEFINES ==================== */
diff --git a/src/emu/cpu/ssp1610/ssp1610.c b/src/emu/cpu/ssp1610/ssp1610.c
index 1ed498414ab..9fdcaafafb0 100644
--- a/src/emu/cpu/ssp1610/ssp1610.c
+++ b/src/emu/cpu/ssp1610/ssp1610.c
@@ -7,8 +7,8 @@
 *********************************************************************/
 
 #include "debugger.h"
+#include "deprecat.h"
 #include "ssp1610.h"
-#include "osd_cpu.h"
 
 #define READ_OP(addr)	       (cpu_readop16(addr<<1))
 
diff --git a/src/emu/cpu/t11/t11.c b/src/emu/cpu/t11/t11.c
index dc438e25687..17647b859fa 100644
--- a/src/emu/cpu/t11/t11.c
+++ b/src/emu/cpu/t11/t11.c
@@ -12,6 +12,7 @@
 *****************************************************************************/
 
 #include "debugger.h"
+#include "deprecat.h"
 #include "t11.h"
 
 
diff --git a/src/emu/cpu/tlcs90/tlcs90.c b/src/emu/cpu/tlcs90/tlcs90.c
index 82e22e92dc3..7e591c44982 100644
--- a/src/emu/cpu/tlcs90/tlcs90.c
+++ b/src/emu/cpu/tlcs90/tlcs90.c
@@ -7,6 +7,7 @@
 *************************************************************************************************************/
 
 #include "debugger.h"
+#include "deprecat.h"
 #include "tlcs90.h"
 
 typedef struct
diff --git a/src/emu/cpu/tms32010/tms32010.c b/src/emu/cpu/tms32010/tms32010.c
index 6d42a0fc17b..6a154755446 100644
--- a/src/emu/cpu/tms32010/tms32010.c
+++ b/src/emu/cpu/tms32010/tms32010.c
@@ -53,8 +53,9 @@
 
 
 
-#include "tms32010.h"
 #include "debugger.h"
+#include "deprecat.h"
+#include "tms32010.h"
 
 
 #define CLK  1		/* Moved the clock timing back into the driver */
diff --git a/src/emu/cpu/tms32025/tms32025.c b/src/emu/cpu/tms32025/tms32025.c
index 963b79f119b..153bb28b240 100644
--- a/src/emu/cpu/tms32025/tms32025.c
+++ b/src/emu/cpu/tms32025/tms32025.c
@@ -118,8 +118,9 @@ Table 3-2.  TMS32025/26 Memory Blocks
 
 
 
-#include "tms32025.h"
 #include "debugger.h"
+#include "deprecat.h"
+#include "tms32025.h"
 
 
 #define CLK 4	/* 1 cycle equals 4 clock ticks */		/* PE/DI */
diff --git a/src/emu/cpu/tms32031/tms32031.c b/src/emu/cpu/tms32031/tms32031.c
index 919d1fe9713..279c41dd0df 100644
--- a/src/emu/cpu/tms32031/tms32031.c
+++ b/src/emu/cpu/tms32031/tms32031.c
@@ -7,6 +7,7 @@
 ***************************************************************************/
 
 #include "debugger.h"
+#include "deprecat.h"
 #include "tms32031.h"
 #include "eminline.h"
 
diff --git a/src/emu/cpu/tms32051/tms32051.c b/src/emu/cpu/tms32051/tms32051.c
index 2261e906593..b357af04f14 100644
--- a/src/emu/cpu/tms32051/tms32051.c
+++ b/src/emu/cpu/tms32051/tms32051.c
@@ -4,9 +4,10 @@
    Written by Ville Linde
 */
 
+#include "debugger.h"
+#include "deprecat.h"
 #include "cpuintrf.h"
 #include "tms32051.h"
-#include "debugger.h"
 
 static void delay_slot(UINT16 startpc);
 static void save_interrupt_context(void);
diff --git a/src/emu/cpu/tms34010/tms34010.c b/src/emu/cpu/tms34010/tms34010.c
index 6a5cca67cb5..d9d418276e9 100644
--- a/src/emu/cpu/tms34010/tms34010.c
+++ b/src/emu/cpu/tms34010/tms34010.c
@@ -8,12 +8,11 @@
 ***************************************************************************/
 
 #include <stddef.h>
-#include "cpuintrf.h"
 #include "debugger.h"
+#include "deprecat.h"
+#include "osd_cpu.h"
 #include "tms34010.h"
 #include "34010ops.h"
-#include "osd_cpu.h"
-#include "driver.h"
 
 
 /***************************************************************************
diff --git a/src/emu/cpu/tms7000/tms7000.c b/src/emu/cpu/tms7000/tms7000.c
index 16d78f889d4..ef83592d2df 100644
--- a/src/emu/cpu/tms7000/tms7000.c
+++ b/src/emu/cpu/tms7000/tms7000.c
@@ -31,6 +31,7 @@
 #include "cpuintrf.h"
 #include "debugger.h"
 #include "tms7000.h"
+#include "deprecat.h"
 
 #define VERBOSE 0
 
diff --git a/src/emu/cpu/tms9900/99xxcore.h b/src/emu/cpu/tms9900/99xxcore.h
index 29d241eb625..4a2e1b194b7 100644
--- a/src/emu/cpu/tms9900/99xxcore.h
+++ b/src/emu/cpu/tms9900/99xxcore.h
@@ -86,10 +86,9 @@ Other references can be found on spies.com:
 */
 
 
-#include "cpuintrf.h"
 #include "debugger.h"
+#include "deprecat.h"
 #include "tms9900.h"
-#include <math.h>
 
 
 #if (TMS99XX_MODEL == TI990_10_ID)
diff --git a/src/emu/cpu/upd7810/upd7810.c b/src/emu/cpu/upd7810/upd7810.c
index c4a1065069a..7ff55dafe5d 100644
--- a/src/emu/cpu/upd7810/upd7810.c
+++ b/src/emu/cpu/upd7810/upd7810.c
@@ -397,6 +397,7 @@ STOP            01001000  10111011          12  stop
 
 #include "debugger.h"
 #include "upd7810.h"
+#include "deprecat.h"
 
 static UPD7810 upd7810;
 static int upd7810_icount;
diff --git a/src/emu/cpu/v30mz/v30mz.c b/src/emu/cpu/v30mz/v30mz.c
index 180522b28e0..24d54d21645 100644
--- a/src/emu/cpu/v30mz/v30mz.c
+++ b/src/emu/cpu/v30mz/v30mz.c
@@ -41,6 +41,7 @@
 ****************************************************************************/
 
 #include "debugger.h"
+#include "deprecat.h"
 
 typedef UINT8 BOOLEAN;
 typedef UINT8 BYTE;
diff --git a/src/emu/cpu/v60/v60.c b/src/emu/cpu/v60/v60.c
index 546aaa614cc..e6e08e35e07 100644
--- a/src/emu/cpu/v60/v60.c
+++ b/src/emu/cpu/v60/v60.c
@@ -4,6 +4,7 @@
 // Portability fixes by Richter Belmont
 
 #include "debugger.h"
+#include "deprecat.h"
 #include "v60.h"
 
 // memory accessors
diff --git a/src/emu/cpu/v810/v810.c b/src/emu/cpu/v810/v810.c
index 70acbd3f868..08940278b8f 100644
--- a/src/emu/cpu/v810/v810.c
+++ b/src/emu/cpu/v810/v810.c
@@ -17,6 +17,7 @@
 ********************************************/
 
 #include "debugger.h"
+#include "deprecat.h"
 #include "v810.h"
 
 #define clkIF 3
diff --git a/src/emu/cpu/x64drc.c b/src/emu/cpu/x64drc.c
index f9f88451b67..c224cb26586 100644
--- a/src/emu/cpu/x64drc.c
+++ b/src/emu/cpu/x64drc.c
@@ -65,7 +65,9 @@
 #include "x64drc.h"
 #include "debugger.h"
 
-#include <stddef.h>
+#ifdef MAME_DEBUG
+#include "deprecat.h"
+#endif
 
 
 
diff --git a/src/emu/cpu/x86drc.c b/src/emu/cpu/x86drc.c
index df18206c74b..7b065ee080e 100644
--- a/src/emu/cpu/x86drc.c
+++ b/src/emu/cpu/x86drc.c
@@ -9,9 +9,9 @@
 
 ***************************************************************************/
 
-#include "cpuintrf.h"
-#include "x86drc.h"
 #include "debugger.h"
+#include "deprecat.h"
+#include "x86drc.h"
 
 #define LOG_DISPATCHES				0
 #define BREAK_ON_MODIFIED_CODE		0
diff --git a/src/emu/cpu/z180/z180.c b/src/emu/cpu/z180/z180.c
index a3d29da9ac4..7d5ac78a268 100644
--- a/src/emu/cpu/z180/z180.c
+++ b/src/emu/cpu/z180/z180.c
@@ -44,6 +44,7 @@
  *****************************************************************************/
 
 #include "debugger.h"
+#include "deprecat.h"
 #include "z180.h"
 #include "cpu/z80/z80daisy.h"
 
diff --git a/src/emu/cpu/z80/z80.c b/src/emu/cpu/z80/z80.c
index 1ccbdd6d726..aad8bcd99f3 100644
--- a/src/emu/cpu/z80/z80.c
+++ b/src/emu/cpu/z80/z80.c
@@ -94,6 +94,7 @@
  *****************************************************************************/
 
 #include "debugger.h"
+#include "deprecat.h"
 #include "z80.h"
 #include "z80daisy.h"
 
diff --git a/src/emu/cpu/z8000/z8000.c b/src/emu/cpu/z8000/z8000.c
index 853e3a04906..8af59e6a5c4 100644
--- a/src/emu/cpu/z8000/z8000.c
+++ b/src/emu/cpu/z8000/z8000.c
@@ -44,6 +44,7 @@
  *****************************************************************************/
 
 #include "debugger.h"
+#include "deprecat.h"
 #include "z8000.h"
 #include "z8000cpu.h"
 #include "osd_cpu.h"
diff --git a/src/emu/cpu/z80gb/z80gb.c b/src/emu/cpu/z80gb/z80gb.c
index 4d7b8984ca8..68c4c7d2be4 100644
--- a/src/emu/cpu/z80gb/z80gb.c
+++ b/src/emu/cpu/z80gb/z80gb.c
@@ -36,8 +36,9 @@
 /**   Split fetch and execute cycles.                       **/
 /**                                                         **/
 /*************************************************************/
-#include "z80gb.h"
 #include "debugger.h"
+#include "deprecat.h"
+#include "z80gb.h"
 
 #define FLAG_Z	0x80
 #define FLAG_N  0x40
diff --git a/src/emu/cpuexec.c b/src/emu/cpuexec.c
index 4507502a6f6..cf6d8c1a73a 100644
--- a/src/emu/cpuexec.c
+++ b/src/emu/cpuexec.c
@@ -9,8 +9,8 @@
 
 ***************************************************************************/
 
-#include <math.h>
 #include "driver.h"
+#include "deprecat.h"
 #include "cheat.h"
 #include "profiler.h"
 #include "debugger.h"
diff --git a/src/emu/cpuexec.h b/src/emu/cpuexec.h
index 49a09edea67..7c277098f02 100644
--- a/src/emu/cpuexec.h
+++ b/src/emu/cpuexec.h
@@ -252,7 +252,6 @@ enum
 
 
 
-
 /*************************************
  *
  *  Core CPU execution
@@ -359,25 +358,6 @@ int cpu_scalebyfcount(int value);
 
 
 
-/*************************************
- *
- *  Video timing
- *
- *************************************/
-
-/***** OBSOLETE NOTICE: these functions are no longer considered */
-/***** to be the authority on scanline timing. Please use the */
-/***** video_screen_* functions in video.c for newer drivers. */
-/***** These functions may eventually go away. */
-
-/* Recomputes the VBLANK timing after, e.g., a visible area change */
-void cpu_compute_vblank_timing(running_machine *machine);
-
-/* Returns the number of the video frame we are currently playing */
-int cpu_getcurrentframe(void);
-
-
-
 /*************************************
  *
  *  Synchronization
diff --git a/src/emu/debug/debugcmd.c b/src/emu/debug/debugcmd.c
index 9f3341a0366..119e3f478fd 100644
--- a/src/emu/debug/debugcmd.c
+++ b/src/emu/debug/debugcmd.c
@@ -18,7 +18,7 @@
 #include "debughlp.h"
 #include "debugvw.h"
 #include "render.h"
-#include <stdarg.h>
+#include "deprecat.h"
 #include <ctype.h>
 
 
diff --git a/src/emu/debug/debugcmt.c b/src/emu/debug/debugcmt.c
index 02b8b815ba4..0a61da1d022 100644
--- a/src/emu/debug/debugcmt.c
+++ b/src/emu/debug/debugcmt.c
@@ -26,6 +26,7 @@
 #include "debugcpu.h"
 #include "debugvw.h"
 #include "info.h"
+#include "deprecat.h"
 #include <zlib.h>
 
 
diff --git a/src/emu/debug/debugcon.c b/src/emu/debug/debugcon.c
index 183e8927e6e..b83a9e58d54 100644
--- a/src/emu/debug/debugcon.c
+++ b/src/emu/debug/debugcon.c
@@ -15,7 +15,7 @@
 #include "debughlp.h"
 #include "debugvw.h"
 #include "textbuf.h"
-#include <stdarg.h>
+#include "deprecat.h"
 #include <ctype.h>
 
 
diff --git a/src/emu/debug/debugcpu.c b/src/emu/debug/debugcpu.c
index e91e6857aef..0c190ec1c53 100644
--- a/src/emu/debug/debugcpu.c
+++ b/src/emu/debug/debugcpu.c
@@ -17,6 +17,7 @@
 #include "debugcon.h"
 #include "express.h"
 #include "debugvw.h"
+#include "deprecat.h"
 #include <ctype.h>
 
 
diff --git a/src/emu/deprecat.h b/src/emu/deprecat.h
new file mode 100644
index 00000000000..14397bd7bb7
--- /dev/null
+++ b/src/emu/deprecat.h
@@ -0,0 +1,52 @@
+/***************************************************************************
+
+    deprecat.h
+
+    Definition of derprecated and obsolte constructs that should not
+    be used by new code, if at all possible.
+
+    Copyright Nicola Salmoria and the MAME Team.
+    Visit http://mamedev.org for licensing and usage restrictions.
+
+***************************************************************************/
+
+#pragma once
+
+#ifndef __DEPRECAT_H__
+#define __DEPRECAT_H__
+
+
+
+/*************************************
+ *
+ *  Global access to the currently
+ *  executing machine.
+ *
+ *  Please investigate if it is
+ *  possible to use a passed in
+ *  'machine' argument.
+ *
+ *************************************/
+
+extern running_machine *Machine;
+
+
+
+/*************************************
+ *
+ *  Video timing
+ *
+ *  These functions are no longer considered
+ *  to be the authority on scanline timing.
+ *  Please use the video_screen_* functions
+ *  in video.c for newer drivers.
+ *
+ *************************************/
+
+/* Recomputes the VBLANK timing after, e.g., a visible area change */
+void cpu_compute_vblank_timing(running_machine *machine);
+
+/* Returns the number of the video frame we are currently playing */
+int cpu_getcurrentframe(void);
+
+#endif	/* __DEPRECAT_H__ */
diff --git a/src/emu/drawgfx.c b/src/emu/drawgfx.c
index 178ea4276bf..98597a65be7 100644
--- a/src/emu/drawgfx.c
+++ b/src/emu/drawgfx.c
@@ -13,6 +13,7 @@
 
 #include "driver.h"
 #include "profiler.h"
+#include "deprecat.h"
 
 
 /***************************************************************************
diff --git a/src/emu/emupal.c b/src/emu/emupal.c
index 92f1a75ad79..626a3a97242 100644
--- a/src/emu/emupal.c
+++ b/src/emu/emupal.c
@@ -10,7 +10,7 @@
 ******************************************************************************/
 
 #include "driver.h"
-#include <math.h>
+#include "deprecat.h"
 
 #define VERBOSE 0
 
diff --git a/src/emu/inptport.c b/src/emu/inptport.c
index caf984cd5af..4e225625e41 100644
--- a/src/emu/inptport.c
+++ b/src/emu/inptport.c
@@ -98,7 +98,7 @@
 #include "profiler.h"
 #include "inputseq.h"
 #include "ui.h"
-#include <math.h>
+#include "deprecat.h"
 #include <ctype.h>
 #include <time.h>
 
diff --git a/src/emu/input.c b/src/emu/input.c
index 1f8e78ae0a3..266b9f3517c 100644
--- a/src/emu/input.c
+++ b/src/emu/input.c
@@ -22,7 +22,7 @@
 #include "mame.h"
 #include "emuopts.h"
 #include "profiler.h"
-#include <ctype.h>
+#include "deprecat.h"
 
 
 
diff --git a/src/emu/machine/6526cia.c b/src/emu/machine/6526cia.c
index 23729e413a8..97c4785c75d 100644
--- a/src/emu/machine/6526cia.c
+++ b/src/emu/machine/6526cia.c
@@ -9,6 +9,7 @@
 
 #include "driver.h"
 #include "6526cia.h"
+#include "deprecat.h"
 
 
 
diff --git a/src/emu/machine/6532riot.c b/src/emu/machine/6532riot.c
index fd5ed657d8f..62b77237713 100644
--- a/src/emu/machine/6532riot.c
+++ b/src/emu/machine/6532riot.c
@@ -12,6 +12,7 @@ The timer seems to follow these rules:
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "machine/6532riot.h"
 
 struct riot6532
diff --git a/src/emu/machine/6821pia.c b/src/emu/machine/6821pia.c
index d75e81b0870..d5f17ef56c4 100644
--- a/src/emu/machine/6821pia.c
+++ b/src/emu/machine/6821pia.c
@@ -5,6 +5,7 @@
 **********************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "6821pia.h"
 
 
diff --git a/src/emu/machine/6840ptm.c b/src/emu/machine/6840ptm.c
index fccff6b6eb9..e8ac8f3d956 100644
--- a/src/emu/machine/6840ptm.c
+++ b/src/emu/machine/6840ptm.c
@@ -33,6 +33,7 @@
 **********************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "6840ptm.h"
 
 #ifdef MAME_DEBUG
diff --git a/src/emu/machine/74181.c b/src/emu/machine/74181.c
index 2c730e8f45f..703bdb679f1 100644
--- a/src/emu/machine/74181.c
+++ b/src/emu/machine/74181.c
@@ -6,6 +6,7 @@
  */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "74181.h"
 
 
diff --git a/src/emu/machine/8042kbdc.c b/src/emu/machine/8042kbdc.c
index 43ed9a0bd4f..35c9faa747d 100644
--- a/src/emu/machine/8042kbdc.c
+++ b/src/emu/machine/8042kbdc.c
@@ -175,6 +175,7 @@
 
 #include "driver.h"
 #include "memconv.h"
+#include "deprecat.h"
 
 #include "machine/pckeybrd.h"
 #include "machine/8042kbdc.h"
diff --git a/src/emu/machine/8237dma.c b/src/emu/machine/8237dma.c
index 9e441d3f9bd..ca34a315b01 100644
--- a/src/emu/machine/8237dma.c
+++ b/src/emu/machine/8237dma.c
@@ -19,6 +19,7 @@
 **********************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "memconv.h"
 #include "8237dma.h"
 
diff --git a/src/emu/machine/8257dma.c b/src/emu/machine/8257dma.c
index 187f3867d94..c909c3a7afe 100644
--- a/src/emu/machine/8257dma.c
+++ b/src/emu/machine/8257dma.c
@@ -25,6 +25,7 @@
 **********************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "memconv.h"
 #include "8257dma.h"
 
diff --git a/src/emu/machine/ds1302.c b/src/emu/machine/ds1302.c
index 4a8dba5a590..1fcef19faab 100644
--- a/src/emu/machine/ds1302.c
+++ b/src/emu/machine/ds1302.c
@@ -1,4 +1,5 @@
 #include "driver.h"
+#include "deprecat.h"
 #include "ds1302.h"
 
 /********************
diff --git a/src/emu/machine/generic.c b/src/emu/machine/generic.c
index eb9f6e62fb3..bd5d5152e44 100644
--- a/src/emu/machine/generic.c
+++ b/src/emu/machine/generic.c
@@ -12,8 +12,7 @@
 #include "driver.h"
 #include "config.h"
 #include "generic.h"
-#include <stdarg.h>
-#include <ctype.h>
+#include "deprecat.h"
 
 
 
diff --git a/src/emu/machine/idectrl.c b/src/emu/machine/idectrl.c
index 9cb2e3c9057..3f2ebbe9915 100644
--- a/src/emu/machine/idectrl.c
+++ b/src/emu/machine/idectrl.c
@@ -7,6 +7,7 @@
 #include "driver.h"
 #include "idectrl.h"
 #include "debugger.h"
+#include "deprecat.h"
 
 
 /*************************************
diff --git a/src/emu/machine/laserdsc.c b/src/emu/machine/laserdsc.c
index fa764df3c8e..6678e54b509 100644
--- a/src/emu/machine/laserdsc.c
+++ b/src/emu/machine/laserdsc.c
@@ -14,6 +14,7 @@
 #include "avcomp.h"
 #include "profiler.h"
 #include "streams.h"
+#include "deprecat.h"
 #include "sound/custom.h"
 
 
diff --git a/src/emu/machine/mc146818.c b/src/emu/machine/mc146818.c
index b8390bbb788..ea02981c57b 100644
--- a/src/emu/machine/mc146818.c
+++ b/src/emu/machine/mc146818.c
@@ -73,6 +73,7 @@
 
 #include "driver.h"
 #include "memconv.h"
+#include "deprecat.h"
 #include "machine/mc146818.h"
 
 
diff --git a/src/emu/machine/msm6242.c b/src/emu/machine/msm6242.c
index e367e0775af..02287290ab3 100644
--- a/src/emu/machine/msm6242.c
+++ b/src/emu/machine/msm6242.c
@@ -5,6 +5,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "machine/msm6242.h"
 
 static UINT8 msm6264_reg[3] = { 0, 0, 0 };
diff --git a/src/emu/machine/rtc65271.c b/src/emu/machine/rtc65271.c
index dd5374bd981..d10cf1fe5c8 100644
--- a/src/emu/machine/rtc65271.c
+++ b/src/emu/machine/rtc65271.c
@@ -16,6 +16,7 @@
 */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "rtc65271.h"
 
 static void field_interrupts(void);
diff --git a/src/emu/machine/timekpr.c b/src/emu/machine/timekpr.c
index a8c5fce4ea1..85a7efe2f39 100644
--- a/src/emu/machine/timekpr.c
+++ b/src/emu/machine/timekpr.c
@@ -6,6 +6,7 @@
  */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "machine/timekpr.h"
 
 struct timekeeper_chip
diff --git a/src/emu/machine/tmp68301.c b/src/emu/machine/tmp68301.c
index e2e3cfdf700..2eb96698e7e 100644
--- a/src/emu/machine/tmp68301.c
+++ b/src/emu/machine/tmp68301.c
@@ -9,6 +9,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "machine/tmp68301.h"
 
 UINT16 *tmp68301_regs;
diff --git a/src/emu/machine/z80ctc.c b/src/emu/machine/z80ctc.c
index ec3b4a4adfb..69ca1fc3e59 100644
--- a/src/emu/machine/z80ctc.c
+++ b/src/emu/machine/z80ctc.c
@@ -10,6 +10,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "z80ctc.h"
 #include "cpu/z80/z80.h"
 #include "cpu/z80/z80daisy.h"
diff --git a/src/emu/machine/z80dma.c b/src/emu/machine/z80dma.c
index 9787c70e3e7..c081294ef49 100644
--- a/src/emu/machine/z80dma.c
+++ b/src/emu/machine/z80dma.c
@@ -21,6 +21,7 @@
 **********************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "memconv.h"
 #include "z80dma.h"
 
diff --git a/src/emu/mame.c b/src/emu/mame.c
index 0bb1b56b375..c1d05eb14f5 100644
--- a/src/emu/mame.c
+++ b/src/emu/mame.c
@@ -84,6 +84,7 @@
 #include "render.h"
 #include "ui.h"
 #include "uimenu.h"
+#include "deprecat.h"
 
 #ifdef MAME_DEBUG
 #include "debug/debugcon.h"
diff --git a/src/emu/mame.h b/src/emu/mame.h
index 030c2c1778e..866bbf826cd 100644
--- a/src/emu/mame.h
+++ b/src/emu/mame.h
@@ -188,7 +188,7 @@ struct _running_machine
 	const pen_t *			pens;				/* remapped palette pen numbers */
 	struct _colortable_t *	colortable;			/* global colortable for remapping */
 	const UINT16 *			game_colortable;	/* lookup table used to map gfx pen numbers to color numbers */
-	const pen_t *			remapped_colortable;/* the above, already remapped through Machine->pens */
+	const pen_t *			remapped_colortable;/* the above, already remapped through machine->pens */
 	pen_t *					shadow_table;		/* table for looking up a shadowed pen */
 
 	/* audio-related information */
@@ -248,7 +248,6 @@ struct _mame_system_time
     GLOBAL VARAIBLES
 ***************************************************************************/
 
-extern running_machine *Machine;
 extern const char mame_disclaimer[];
 extern char giant_string_buffer[];
 
diff --git a/src/emu/memory.c b/src/emu/memory.c
index 06559b80191..c7ee930a8a2 100644
--- a/src/emu/memory.c
+++ b/src/emu/memory.c
@@ -91,10 +91,10 @@
 
 #include "driver.h"
 #include "profiler.h"
+#include "deprecat.h"
 #ifdef MAME_DEBUG
 #include "debug/debugcpu.h"
 #endif
-#include <stdarg.h>
 
 
 #define MEM_DUMP		(0)
diff --git a/src/emu/profiler.c b/src/emu/profiler.c
index 71a600f9071..eb216a9acd4 100644
--- a/src/emu/profiler.c
+++ b/src/emu/profiler.c
@@ -12,6 +12,7 @@
 #include "osdepend.h"
 #include "driver.h"
 #include "profiler.h"
+#include "deprecat.h"
 
 
 /* in usrintf.c */
diff --git a/src/emu/render.c b/src/emu/render.c
index 64ec191afc3..613939dee5d 100644
--- a/src/emu/render.c
+++ b/src/emu/render.c
@@ -44,7 +44,7 @@
 #include "config.h"
 #include "output.h"
 #include "xmlfile.h"
-#include <math.h>
+#include "deprecat.h"
 
 
 
diff --git a/src/emu/rendlay.c b/src/emu/rendlay.c
index 49e10daae38..8b55d2d7913 100644
--- a/src/emu/rendlay.c
+++ b/src/emu/rendlay.c
@@ -61,6 +61,7 @@
 #include "output.h"
 #include "xmlfile.h"
 #include "png.h"
+#include "deprecat.h"
 
 
 
diff --git a/src/emu/romload.c b/src/emu/romload.c
index e1d17fc8316..7f392364ad5 100644
--- a/src/emu/romload.c
+++ b/src/emu/romload.c
@@ -16,8 +16,7 @@
 #include "harddisk.h"
 #include "config.h"
 #include "ui.h"
-#include <stdarg.h>
-#include <ctype.h>
+#include "deprecat.h"
 
 
 //#define LOG_LOAD
diff --git a/src/emu/sndintrf.c b/src/emu/sndintrf.c
index bd84009777f..867df8b31cb 100644
--- a/src/emu/sndintrf.c
+++ b/src/emu/sndintrf.c
@@ -514,7 +514,7 @@ static int totalsnd;
 /*-------------------------------------------------
     sndintrf_init - discover all linked sound
     systems and build a matrix for sound
-    (type,index) pairs for the current Machine
+    (type,index) pairs for the current machine
 -------------------------------------------------*/
 
 void sndintrf_init(running_machine *machine)
diff --git a/src/emu/sound.c b/src/emu/sound.c
index 614f11f3c15..9b192255c31 100644
--- a/src/emu/sound.c
+++ b/src/emu/sound.c
@@ -14,6 +14,7 @@
 #include "streams.h"
 #include "config.h"
 #include "profiler.h"
+#include "deprecat.h"
 #include "sound/wavwrite.h"
 
 
diff --git a/src/emu/sound/c6280.c b/src/emu/sound/c6280.c
index 1905ef3d827..a4c3197523d 100644
--- a/src/emu/sound/c6280.c
+++ b/src/emu/sound/c6280.c
@@ -53,10 +53,9 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include <math.h>
-
 #include "sndintrf.h"
 #include "streams.h"
+#include "deprecat.h"
 #include "c6280.h"
 
 typedef struct {
diff --git a/src/emu/sound/cdp1869.c b/src/emu/sound/cdp1869.c
index cd60072ddf5..06fd321ce9d 100644
--- a/src/emu/sound/cdp1869.c
+++ b/src/emu/sound/cdp1869.c
@@ -11,8 +11,9 @@
 ****************************************************************************/
 
 #include "sndintrf.h"
-#include "sound/cdp1869.h"
 #include "streams.h"
+#include "deprecat.h"
+#include "sound/cdp1869.h"
 
 struct CDP1869
 {
diff --git a/src/emu/sound/discrete.c b/src/emu/sound/discrete.c
index 986e7ad55f3..79ebd277144 100644
--- a/src/emu/sound/discrete.c
+++ b/src/emu/sound/discrete.c
@@ -37,10 +37,9 @@
 #include "sndintrf.h"
 #include "streams.h"
 #include "inptport.h"
+#include "deprecat.h"
 #include "wavwrite.h"
 #include "discrete.h"
-#include <stdarg.h>
-#include <math.h>
 
 
 /*************************************
diff --git a/src/emu/sound/filter.c b/src/emu/sound/filter.c
index e6c249538e2..eec1632307a 100644
--- a/src/emu/sound/filter.c
+++ b/src/emu/sound/filter.c
@@ -1,7 +1,6 @@
 #include "filter.h"
 #include "sndintrf.h"
-
-#include <math.h>
+#include "deprecat.h"
 
 static filter* filter_alloc(void) {
 	filter* f = malloc_or_die(sizeof(filter));
diff --git a/src/emu/sound/flt_rc.c b/src/emu/sound/flt_rc.c
index ca92aa2e367..be2d988f884 100644
--- a/src/emu/sound/flt_rc.c
+++ b/src/emu/sound/flt_rc.c
@@ -1,7 +1,7 @@
 #include "sndintrf.h"
 #include "streams.h"
+#include "deprecat.h"
 #include "flt_rc.h"
-#include <math.h>
 
 struct filter_rc_info
 {
diff --git a/src/emu/sound/flt_vol.c b/src/emu/sound/flt_vol.c
index 584ee53fc5f..eeb58b6e31b 100644
--- a/src/emu/sound/flt_vol.c
+++ b/src/emu/sound/flt_vol.c
@@ -1,5 +1,6 @@
 #include "sndintrf.h"
 #include "streams.h"
+#include "deprecat.h"
 #include "flt_vol.h"
 
 
diff --git a/src/emu/sound/msm5205.c b/src/emu/sound/msm5205.c
index bb1ac8550a6..a55f7339721 100644
--- a/src/emu/sound/msm5205.c
+++ b/src/emu/sound/msm5205.c
@@ -14,10 +14,9 @@
  *  separate MSM5205 emulator form adpcm.c and some fix
  */
 
-#include <math.h>
-
 #include "sndintrf.h"
 #include "streams.h"
+#include "deprecat.h"
 #include "msm5205.h"
 
 /*
diff --git a/src/emu/sound/nes_apu.c b/src/emu/sound/nes_apu.c
index 75ddab881ee..b81240be1b1 100644
--- a/src/emu/sound/nes_apu.c
+++ b/src/emu/sound/nes_apu.c
@@ -46,6 +46,7 @@
 
 #include "sndintrf.h"
 #include "streams.h"
+#include "deprecat.h"
 #include "nes_apu.h"
 #include "cpu/m6502/m6502.h"
 
diff --git a/src/emu/sound/rf5c400.c b/src/emu/sound/rf5c400.c
index 288167ae9d9..adb7b8c124f 100644
--- a/src/emu/sound/rf5c400.c
+++ b/src/emu/sound/rf5c400.c
@@ -17,8 +17,8 @@
 
 #include "sndintrf.h"
 #include "streams.h"
+#include "deprecat.h"
 #include "rf5c400.h"
-#include <math.h>
 
 struct rf5c400_info
 {
diff --git a/src/emu/sound/s14001a.c b/src/emu/sound/s14001a.c
index 47e2ef9ed17..211c831d4bf 100644
--- a/src/emu/sound/s14001a.c
+++ b/src/emu/sound/s14001a.c
@@ -128,10 +128,10 @@
  *
  */
 
-#include <math.h>
 #include "sndintrf.h"
-#include "s14001a.h"
 #include "streams.h"
+#include "deprecat.h"
+#include "s14001a.h"
 
 typedef struct
 {
diff --git a/src/emu/sound/samples.c b/src/emu/sound/samples.c
index 019f88594e3..5063113d1c0 100644
--- a/src/emu/sound/samples.c
+++ b/src/emu/sound/samples.c
@@ -1,5 +1,6 @@
 #include "driver.h"
 #include "streams.h"
+#include "deprecat.h"
 #include "samples.h"
 
 
diff --git a/src/emu/sound/scsp.c b/src/emu/sound/scsp.c
index 892ab0157f8..221622358e5 100644
--- a/src/emu/sound/scsp.c
+++ b/src/emu/sound/scsp.c
@@ -25,10 +25,10 @@
     * January 5, 2007   (kingshriek+RB) Working, good-sounding FM, removed obsolete non-USEDSP code.
 */
 
-#include <math.h>
 #include "sndintrf.h"
 #include "streams.h"
 #include "cpuintrf.h"
+#include "deprecat.h"
 #include "scsp.h"
 #include "scspdsp.h"
 
diff --git a/src/emu/sound/sid.c b/src/emu/sound/sid.c
index ceaa7803a48..ac61b278666 100644
--- a/src/emu/sound/sid.c
+++ b/src/emu/sound/sid.c
@@ -12,8 +12,7 @@
   MOS-8580 R5 combined waveforms recorded by Dennis "Deadman" Lindroos.
 */
 
-#include <math.h>
-
+#include "deprecat.h"
 #include "sndintrf.h"
 #include "sidvoice.h"
 #include "sidenvel.h"
diff --git a/src/emu/sound/sid6581.c b/src/emu/sound/sid6581.c
index 60a7e7580f0..d7ca6f78eb9 100644
--- a/src/emu/sound/sid6581.c
+++ b/src/emu/sound/sid6581.c
@@ -7,6 +7,7 @@
 ***************************************************************************/
 
 #include "sndintrf.h"
+#include "deprecat.h"
 #include "sid6581.h"
 #include "sid.h"
 
diff --git a/src/emu/sound/sn76477.c b/src/emu/sound/sn76477.c
index 99d31d47b20..28a7c2256ad 100644
--- a/src/emu/sound/sn76477.c
+++ b/src/emu/sound/sn76477.c
@@ -30,6 +30,7 @@
 #include <math.h>		/* for pow() */
 #include "sndintrf.h"
 #include "streams.h"
+#include "deprecat.h"
 #include "sn76477.h"
 
 
@@ -255,7 +256,7 @@ struct SN76477
 	/* others */
 	sound_stream *channel;				/* returned by stream_create() */
 	UINT32 index;
-	int sample_rate; 					/* from Machine->sample_rate */
+	int sample_rate; 					/* from machine->sample_rate */
 
 #if LOG_WAV
 	wav_file *file;						/* handle of the wave file to produce */
diff --git a/src/emu/sound/speaker.c b/src/emu/sound/speaker.c
index 7be7bf7d2c0..18795380841 100644
--- a/src/emu/sound/speaker.c
+++ b/src/emu/sound/speaker.c
@@ -9,6 +9,7 @@
 
 #include "sndintrf.h"
 #include "streams.h"
+#include "deprecat.h"
 #include "speaker.h"
 
 static const INT16 default_levels[2] = {0,32767};
diff --git a/src/emu/sound/vlm5030.c b/src/emu/sound/vlm5030.c
index ef6a1b7d722..be50345067d 100644
--- a/src/emu/sound/vlm5030.c
+++ b/src/emu/sound/vlm5030.c
@@ -75,6 +75,7 @@ chirp 12-..: vokume   0   : silent
 */
 #include "sndintrf.h"
 #include "streams.h"
+#include "deprecat.h"
 #include "vlm5030.h"
 
 /* interpolator per frame   */
diff --git a/src/emu/sound/votrax.c b/src/emu/sound/votrax.c
index 0c131faa160..e41f2486ea6 100644
--- a/src/emu/sound/votrax.c
+++ b/src/emu/sound/votrax.c
@@ -18,6 +18,7 @@ the variable VotraxBaseFrequency, this is defaulted to 8000
 
 #include "sndintrf.h"
 #include "streams.h"
+#include "deprecat.h"
 #include "samples.h"
 
 
diff --git a/src/emu/sound/wave.c b/src/emu/sound/wave.c
index 7b6307bfb01..3c3721919e6 100644
--- a/src/emu/sound/wave.c
+++ b/src/emu/sound/wave.c
@@ -10,6 +10,7 @@
 
 #include "driver.h"
 #include "streams.h"
+#include "deprecat.h"
 #ifdef MESS
 #include "messdrv.h"
 #include "utils.h"
diff --git a/src/emu/state.c b/src/emu/state.c
index 6448ad90906..3f9b2996fd4 100644
--- a/src/emu/state.c
+++ b/src/emu/state.c
@@ -22,6 +22,7 @@
 
 #include "driver.h"
 #include "astring.h"
+#include "deprecat.h"
 #include <zlib.h>
 
 
diff --git a/src/emu/streams.c b/src/emu/streams.c
index a79438f8e4d..715edd4c76f 100644
--- a/src/emu/streams.c
+++ b/src/emu/streams.c
@@ -45,7 +45,7 @@
 
 #include "driver.h"
 #include "streams.h"
-#include <math.h>
+#include "deprecat.h"
 
 
 
diff --git a/src/emu/tilemap.c b/src/emu/tilemap.c
index 1278828bcda..24ef7360d8f 100644
--- a/src/emu/tilemap.c
+++ b/src/emu/tilemap.c
@@ -12,6 +12,7 @@
 #include "driver.h"
 #include "tilemap.h"
 #include "profiler.h"
+#include "deprecat.h"
 
 
 /***************************************************************************
diff --git a/src/emu/timer.c b/src/emu/timer.c
index b23a558d915..5a5c4548496 100644
--- a/src/emu/timer.c
+++ b/src/emu/timer.c
@@ -13,7 +13,7 @@
 #include "driver.h"
 #include "profiler.h"
 #include "pool.h"
-#include <math.h>
+#include "deprecat.h"
 
 
 /***************************************************************************
diff --git a/src/emu/ui.c b/src/emu/ui.c
index b824ed19230..e97f1e99609 100644
--- a/src/emu/ui.c
+++ b/src/emu/ui.c
@@ -19,6 +19,7 @@
 #include "ui.h"
 #include "uimenu.h"
 #include "uigfx.h"
+#include "deprecat.h"
 
 #ifdef MESS
 #include "mess.h"
@@ -27,8 +28,6 @@
 #endif
 
 #include <ctype.h>
-#include <stdarg.h>
-#include <math.h>
 
 
 
diff --git a/src/emu/uigfx.c b/src/emu/uigfx.c
index 2a8fb328bf1..2c4fee7d27e 100644
--- a/src/emu/uigfx.c
+++ b/src/emu/uigfx.c
@@ -14,6 +14,7 @@
 #include "rendfont.h"
 #include "rendutil.h"
 #include "uigfx.h"
+#include "deprecat.h"
 
 
 
diff --git a/src/emu/uimenu.c b/src/emu/uimenu.c
index 2cd9e4c1ee3..f8318bd0dd7 100644
--- a/src/emu/uimenu.c
+++ b/src/emu/uimenu.c
@@ -14,6 +14,7 @@
 #include "cheat.h"
 #include "uimenu.h"
 #include "audit.h"
+#include "deprecat.h"
 
 #ifdef MESS
 #include "uimess.h"
diff --git a/src/emu/video.c b/src/emu/video.c
index 29e34fdc552..c1c6c2701ef 100644
--- a/src/emu/video.c
+++ b/src/emu/video.c
@@ -14,10 +14,11 @@
 #include "profiler.h"
 #include "png.h"
 #include "debugger.h"
-#include "video/vector.h"
 #include "render.h"
 #include "rendutil.h"
 #include "ui.h"
+#include "deprecat.h"
+#include "video/vector.h"
 
 #include "snap.lh"
 
diff --git a/src/emu/video/cdp1869.c b/src/emu/video/cdp1869.c
index 2c32b4834d5..9d128dd0a29 100644
--- a/src/emu/video/cdp1869.c
+++ b/src/emu/video/cdp1869.c
@@ -1,4 +1,5 @@
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/cdp1802/cdp1802.h"
 #include "video/cdp1869.h"
 #include "sound/cdp1869.h"
diff --git a/src/emu/video/generic.c b/src/emu/video/generic.c
index aeed5b77ecd..a793a4574c7 100644
--- a/src/emu/video/generic.c
+++ b/src/emu/video/generic.c
@@ -10,6 +10,7 @@
 *********************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "generic.h"
 
 
diff --git a/src/emu/video/v9938.c b/src/emu/video/v9938.c
index d9f16074bb6..441ea9028aa 100644
--- a/src/emu/video/v9938.c
+++ b/src/emu/video/v9938.c
@@ -15,6 +15,7 @@
 */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "v9938.h"
 
 typedef struct {
diff --git a/src/emu/video/vector.c b/src/emu/video/vector.c
index 396f258ef27..9dc5ea3a795 100644
--- a/src/emu/video/vector.c
+++ b/src/emu/video/vector.c
@@ -30,8 +30,8 @@
  *
  **************************************************************************** */
 
-#include <math.h>
 #include "rendutil.h"
+#include "deprecat.h"
 #include "vector.h"
 
 
diff --git a/src/emu/video/voodoo.c b/src/emu/video/voodoo.c
index 7ad16bac529..4d5468d6bab 100644
--- a/src/emu/video/voodoo.c
+++ b/src/emu/video/voodoo.c
@@ -142,7 +142,7 @@ bits(7:4) and bit(24)), X, and Y:
 #include "voodoo.h"
 #include "vooddefs.h"
 #include "ui.h"
-#include <math.h>
+#include "deprecat.h"
 
 
 /*************************************
diff --git a/src/lib/util/sha1.c b/src/lib/util/sha1.c
index 90aa85fea1d..b1eb7a3f72f 100644
--- a/src/lib/util/sha1.c
+++ b/src/lib/util/sha1.c
@@ -24,7 +24,6 @@
  */
 
 #include "sha1.h"
-//#include "macros.h"
 
 #include <assert.h>
 #include <stdlib.h>
diff --git a/src/mame/audio/amiga.c b/src/mame/audio/amiga.c
index 14ef5e116f9..e5207df6dba 100644
--- a/src/mame/audio/amiga.c
+++ b/src/mame/audio/amiga.c
@@ -10,6 +10,7 @@
 
 #include "driver.h"
 #include "streams.h"
+#include "deprecat.h"
 #include "includes/amiga.h"
 #include "cpu/m68000/m68000.h"
 
diff --git a/src/mame/audio/atarijsa.c b/src/mame/audio/atarijsa.c
index 1637edabf07..cabd155052c 100644
--- a/src/mame/audio/atarijsa.c
+++ b/src/mame/audio/atarijsa.c
@@ -31,6 +31,7 @@ Static Program ROM (48K bytes)            4000-FFFF   R    D0-D7
 ****************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/m6502/m6502.h"
 #include "sound/5220intf.h"
 #include "sound/2151intf.h"
diff --git a/src/mame/audio/aztarac.c b/src/mame/audio/aztarac.c
index 6a979890800..e909ceb39ac 100644
--- a/src/mame/audio/aztarac.c
+++ b/src/mame/audio/aztarac.c
@@ -5,6 +5,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/z80/z80.h"
 #include "aztarac.h"
 
diff --git a/src/mame/audio/cage.c b/src/mame/audio/cage.c
index 49dc5149899..df5be42ae9b 100644
--- a/src/mame/audio/cage.c
+++ b/src/mame/audio/cage.c
@@ -10,6 +10,7 @@
 
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/tms32031/tms32031.h"
 #include "sound/dmadac.h"
 #include "cage.h"
diff --git a/src/mame/audio/carnival.c b/src/mame/audio/carnival.c
index e28df9cde4c..66dbe55aa54 100644
--- a/src/mame/audio/carnival.c
+++ b/src/mame/audio/carnival.c
@@ -37,6 +37,7 @@
 /*****************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/i8039/i8039.h"
 #include "sound/ay8910.h"
 #include "sound/samples.h"
diff --git a/src/mame/audio/cchasm.c b/src/mame/audio/cchasm.c
index e4f6da6cf8d..194fc077f58 100644
--- a/src/mame/audio/cchasm.c
+++ b/src/mame/audio/cchasm.c
@@ -6,6 +6,7 @@
 
 #include "driver.h"
 #include "streams.h"
+#include "deprecat.h"
 #include "cpu/z80/z80.h"
 #include "machine/z80ctc.h"
 #include "cchasm.h"
diff --git a/src/mame/audio/cinemat.c b/src/mame/audio/cinemat.c
index e4b79b2275b..6eeef2540cd 100644
--- a/src/mame/audio/cinemat.c
+++ b/src/mame/audio/cinemat.c
@@ -15,6 +15,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/ccpu/ccpu.h"
 #include "cpu/z80/z80daisy.h"
 #include "machine/z80ctc.h"
diff --git a/src/mame/audio/cyberbal.c b/src/mame/audio/cyberbal.c
index b24180b338a..240b8c32304 100644
--- a/src/mame/audio/cyberbal.c
+++ b/src/mame/audio/cyberbal.c
@@ -5,10 +5,10 @@
 ****************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "machine/atarigen.h"
 #include "sound/dac.h"
 #include "includes/cyberbal.h"
-#include <math.h>
 
 
 static UINT8 *bank_base;
diff --git a/src/mame/audio/dcs.c b/src/mame/audio/dcs.c
index a7f1d789171..7888a39e539 100644
--- a/src/mame/audio/dcs.c
+++ b/src/mame/audio/dcs.c
@@ -150,13 +150,12 @@
 ****************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/adsp2100/adsp2100.h"
 #include "dcs.h"
 #include "sound/dmadac.h"
 #include "machine/midwayic.h"
 
-#include <math.h>
-
 
 #define LOG_DCS_TRANSFERS			(0)
 #define LOG_DCS_IO					(0)
diff --git a/src/mame/audio/dkong.c b/src/mame/audio/dkong.c
index fb47790ac1f..1620440e7f8 100644
--- a/src/mame/audio/dkong.c
+++ b/src/mame/audio/dkong.c
@@ -1,4 +1,5 @@
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/i8039/i8039.h"
 #include "cpu/m6502/m6502.h"
 #include "sound/nes_apu.h"
diff --git a/src/mame/audio/exidy.c b/src/mame/audio/exidy.c
index 76c2382515d..3ec79d52740 100644
--- a/src/mame/audio/exidy.c
+++ b/src/mame/audio/exidy.c
@@ -7,6 +7,7 @@
 #include "driver.h"
 #include "rescap.h"
 #include "streams.h"
+#include "deprecat.h"
 #include "cpu/m6502/m6502.h"
 #include "machine/6821pia.h"
 #include "sound/hc55516.h"
diff --git a/src/mame/audio/exidy440.c b/src/mame/audio/exidy440.c
index 09ea3ce33c8..f350257cb2b 100644
--- a/src/mame/audio/exidy440.c
+++ b/src/mame/audio/exidy440.c
@@ -9,8 +9,8 @@
 
 #include "driver.h"
 #include "streams.h"
+#include "deprecat.h"
 #include "exidy440.h"
-#include <math.h>
 
 
 #define MAKE_WAVES		0
diff --git a/src/mame/audio/galaxian.c b/src/mame/audio/galaxian.c
index 7ebf571afdd..8b0276724f5 100644
--- a/src/mame/audio/galaxian.c
+++ b/src/mame/audio/galaxian.c
@@ -1,5 +1,6 @@
 #include "driver.h"
 #include "streams.h"
+#include "deprecat.h"
 #include "sound/samples.h"
 #include "includes/galaxian.h"
 
diff --git a/src/mame/audio/gottlieb.c b/src/mame/audio/gottlieb.c
index c961c074db8..0dac92202ff 100644
--- a/src/mame/audio/gottlieb.c
+++ b/src/mame/audio/gottlieb.c
@@ -1,4 +1,5 @@
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/m6502/m6502.h"
 #include "sound/samples.h"
 #include "sound/dac.h"
diff --git a/src/mame/audio/gridlee.c b/src/mame/audio/gridlee.c
index 5b504dd57e9..f5b8479860a 100644
--- a/src/mame/audio/gridlee.c
+++ b/src/mame/audio/gridlee.c
@@ -7,6 +7,7 @@
 #include "driver.h"
 #include "streams.h"
 #include "gridlee.h"
+#include "deprecat.h"
 #include "sound/custom.h"
 #include "sound/samples.h"
 
diff --git a/src/mame/audio/gyruss.c b/src/mame/audio/gyruss.c
index 9a8433c0ba2..26d748e42a6 100644
--- a/src/mame/audio/gyruss.c
+++ b/src/mame/audio/gyruss.c
@@ -1,4 +1,5 @@
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/i8039/i8039.h"
 #include "sound/flt_rc.h"
 
diff --git a/src/mame/audio/harddriv.c b/src/mame/audio/harddriv.c
index f51be69e782..61275af6451 100644
--- a/src/mame/audio/harddriv.c
+++ b/src/mame/audio/harddriv.c
@@ -5,6 +5,7 @@
 ****************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/tms32010/tms32010.h"
 #include "sound/dac.h"
 #include "machine/atarigen.h"
diff --git a/src/mame/audio/irem.c b/src/mame/audio/irem.c
index 6fcb0630b3f..9d49689a0e9 100644
--- a/src/mame/audio/irem.c
+++ b/src/mame/audio/irem.c
@@ -1,4 +1,5 @@
 #include "driver.h"
+#include "deprecat.h"
 #include "irem.h"
 #include "cpu/m6800/m6800.h"
 #include "sound/ay8910.h"
diff --git a/src/mame/audio/jaguar.c b/src/mame/audio/jaguar.c
index 6a2ae62144b..c100c0fa890 100644
--- a/src/mame/audio/jaguar.c
+++ b/src/mame/audio/jaguar.c
@@ -143,10 +143,10 @@
 ****************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "includes/jaguar.h"
 #include "cpu/jaguar/jaguar.h"
 #include "sound/dac.h"
-#include <math.h>
 
 
 /* Jerry registers */
diff --git a/src/mame/audio/leland.c b/src/mame/audio/leland.c
index 07106fec3fa..1a8a6b2d710 100644
--- a/src/mame/audio/leland.c
+++ b/src/mame/audio/leland.c
@@ -79,6 +79,7 @@
 
 #include "driver.h"
 #include "streams.h"
+#include "deprecat.h"
 #include "cpu/i86/i186intf.h"
 #include "cpu/z80/z80.h"
 #include "leland.h"
diff --git a/src/mame/audio/mario.c b/src/mame/audio/mario.c
index 5a6b22b4da4..90ac0a43c14 100644
--- a/src/mame/audio/mario.c
+++ b/src/mame/audio/mario.c
@@ -1,4 +1,5 @@
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/i8039/i8039.h"
 #include "sound/dac.h"
 #include "sound/ay8910.h"
diff --git a/src/mame/audio/mcr.c b/src/mame/audio/mcr.c
index 0146e410d00..9ff38b486cf 100644
--- a/src/mame/audio/mcr.c
+++ b/src/mame/audio/mcr.c
@@ -7,6 +7,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "audio/mcr.h"
 #include "audio/williams.h"
 #include "cpu/m6800/m6800.h"
diff --git a/src/mame/audio/n8080.c b/src/mame/audio/n8080.c
index ce4fb0869c2..7006466c24d 100644
--- a/src/mame/audio/n8080.c
+++ b/src/mame/audio/n8080.c
@@ -5,11 +5,11 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/i8039/i8039.h"
 #include "sound/sn76477.h"
 #include "sound/dac.h"
 #include "includes/n8080.h"
-#include <math.h>
 
 static int n8080_hardware;
 
diff --git a/src/mame/audio/namco54.c b/src/mame/audio/namco54.c
index 6d1c1798cdc..5c746fcdb1b 100644
--- a/src/mame/audio/namco54.c
+++ b/src/mame/audio/namco54.c
@@ -49,6 +49,7 @@ The command format is very simple:
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "namco54.h"
 #include "cpu/mb88xx/mb88xx.h"
 
diff --git a/src/mame/audio/namcoc7x.c b/src/mame/audio/namcoc7x.c
index 0f49db8f1a1..d231ad816a9 100644
--- a/src/mame/audio/namcoc7x.c
+++ b/src/mame/audio/namcoc7x.c
@@ -27,6 +27,7 @@
 */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "audio/namcoc7x.h"
 
 static UINT16 *namcoc7x_mcuram;
diff --git a/src/mame/audio/phoenix.c b/src/mame/audio/phoenix.c
index 1abf05c89de..4f9ebdb8e1b 100644
--- a/src/mame/audio/phoenix.c
+++ b/src/mame/audio/phoenix.c
@@ -8,9 +8,9 @@
  ****************************************************************************/
 
 
-#include <math.h>
 #include "driver.h"
 #include "streams.h"
+#include "deprecat.h"
 #include "sound/custom.h"
 #include "sound/tms36xx.h"
 #include "phoenix.h"
diff --git a/src/mame/audio/pleiads.c b/src/mame/audio/pleiads.c
index 442a0582ffa..4aba0bfab70 100644
--- a/src/mame/audio/pleiads.c
+++ b/src/mame/audio/pleiads.c
@@ -8,6 +8,7 @@
  ****************************************************************************/
 #include "driver.h"
 #include "streams.h"
+#include "deprecat.h"
 #include "sound/custom.h"
 #include "sound/tms36xx.h"
 #include "includes/phoenix.h"
diff --git a/src/mame/audio/redalert.c b/src/mame/audio/redalert.c
index 4e652ce5af9..3388eb975f5 100644
--- a/src/mame/audio/redalert.c
+++ b/src/mame/audio/redalert.c
@@ -9,6 +9,7 @@
 
 #include "driver.h"
 #include "rescap.h"
+#include "deprecat.h"
 #include "cpu/i8085/i8085.h"
 #include "machine/6821pia.h"
 #include "sound/ay8910.h"
diff --git a/src/mame/audio/scramble.c b/src/mame/audio/scramble.c
index ea1b3d8351d..6c19479dad2 100644
--- a/src/mame/audio/scramble.c
+++ b/src/mame/audio/scramble.c
@@ -12,6 +12,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/z80/z80.h"
 #include "machine/7474.h"
 #include "sound/flt_rc.h"
diff --git a/src/mame/audio/segag80r.c b/src/mame/audio/segag80r.c
index 5e52e5fe83a..809f332a84f 100644
--- a/src/mame/audio/segag80r.c
+++ b/src/mame/audio/segag80r.c
@@ -9,6 +9,7 @@
 
 #include "driver.h"
 #include "streams.h"
+#include "deprecat.h"
 #include "cpu/i8039/i8039.h"
 #include "segag80r.h"
 #include "machine/8255ppi.h"
diff --git a/src/mame/audio/segasnd.c b/src/mame/audio/segasnd.c
index 63741184497..6a9208ff18b 100644
--- a/src/mame/audio/segasnd.c
+++ b/src/mame/audio/segasnd.c
@@ -11,11 +11,11 @@
 
 #include "driver.h"
 #include "streams.h"
+#include "deprecat.h"
 #include "segag80v.h"
 #include "cpu/i8039/i8039.h"
 #include "sound/sp0250.h"
 #include "segasnd.h"
-#include <math.h>
 
 #define VERBOSE 0
 #define LOG(x) do { if (VERBOSE) logerror x; } while (0)
diff --git a/src/mame/audio/seibu.c b/src/mame/audio/seibu.c
index b6c778531df..f4f4870c835 100644
--- a/src/mame/audio/seibu.c
+++ b/src/mame/audio/seibu.c
@@ -34,6 +34,7 @@
 
 #include "driver.h"
 #include "streams.h"
+#include "deprecat.h"
 #include "audio/seibu.h"
 #include "sound/3812intf.h"
 #include "sound/2151intf.h"
diff --git a/src/mame/audio/senjyo.c b/src/mame/audio/senjyo.c
index 70401b5eb21..38a006eed71 100644
--- a/src/mame/audio/senjyo.c
+++ b/src/mame/audio/senjyo.c
@@ -1,8 +1,8 @@
 #include "driver.h"
+#include "deprecat.h"
 #include "machine/z80pio.h"
 #include "machine/z80ctc.h"
 #include "sound/samples.h"
-#include <math.h>
 
 
 /* z80 pio */
diff --git a/src/mame/audio/spacefb.c b/src/mame/audio/spacefb.c
index 46c0428402d..ad483bb4797 100644
--- a/src/mame/audio/spacefb.c
+++ b/src/mame/audio/spacefb.c
@@ -5,6 +5,7 @@
 ****************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/i8039/i8039.h"
 #include "sound/dac.h"
 #include "sound/samples.h"
diff --git a/src/mame/audio/starwars.c b/src/mame/audio/starwars.c
index 54c30249106..2f6f295ead1 100644
--- a/src/mame/audio/starwars.c
+++ b/src/mame/audio/starwars.c
@@ -8,6 +8,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/m6809/m6809.h"
 #include "sound/5220intf.h"
 #include "includes/starwars.h"
diff --git a/src/mame/audio/system16.c b/src/mame/audio/system16.c
index 64f5c402fda..d2ce54d2552 100644
--- a/src/mame/audio/system16.c
+++ b/src/mame/audio/system16.c
@@ -1,5 +1,6 @@
 // system 16 - 7751 emulation, based on monster bash code.
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/i8039/i8039.h"
 #include "sound/dac.h"
 
diff --git a/src/mame/audio/taito_en.c b/src/mame/audio/taito_en.c
index 73a769234a0..fa4160d31f5 100644
--- a/src/mame/audio/taito_en.c
+++ b/src/mame/audio/taito_en.c
@@ -1,4 +1,5 @@
 #include "driver.h"
+#include "deprecat.h"
 #include "sound/es5506.h"
 #include "includes/taito_f3.h"
 #include "taito_en.h"
diff --git a/src/mame/audio/taitosnd.c b/src/mame/audio/taitosnd.c
index 36d55de374e..77b32a4807f 100644
--- a/src/mame/audio/taitosnd.c
+++ b/src/mame/audio/taitosnd.c
@@ -1,4 +1,5 @@
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/z80/z80.h"
 #include "taitosnd.h"
 
diff --git a/src/mame/audio/timeplt.c b/src/mame/audio/timeplt.c
index eb8e860c2e8..fdd7e2d0bb6 100644
--- a/src/mame/audio/timeplt.c
+++ b/src/mame/audio/timeplt.c
@@ -11,6 +11,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "sound/ay8910.h"
 #include "sound/flt_rc.h"
 #include "timeplt.h"
diff --git a/src/mame/audio/trackfld.c b/src/mame/audio/trackfld.c
index fffa878dd90..9eb0f1c8615 100644
--- a/src/mame/audio/trackfld.c
+++ b/src/mame/audio/trackfld.c
@@ -1,4 +1,5 @@
 #include "driver.h"
+#include "deprecat.h"
 #include "sound/vlm5030.h"
 #include "sound/msm5205.h"
 #include "sound/sn76496.h"
diff --git a/src/mame/audio/turbo.c b/src/mame/audio/turbo.c
index d2b1a9fc35f..195a9559693 100644
--- a/src/mame/audio/turbo.c
+++ b/src/mame/audio/turbo.c
@@ -5,6 +5,7 @@
 *************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "turbo.h"
 #include "sound/samples.h"
 
diff --git a/src/mame/audio/tx1.c b/src/mame/audio/tx1.c
index f5e1bf1f1ce..d49cb1ffa5e 100644
--- a/src/mame/audio/tx1.c
+++ b/src/mame/audio/tx1.c
@@ -4,10 +4,11 @@
 
 ***************************************************************************/
 #include "driver.h"
+#include "streams.h"
+#include "deprecat.h"
 #include "includes/tx1.h"
 #include "video/resnet.h"
 #include "sound/custom.h"
-#include "streams.h"
 
 /*************************************
  *
diff --git a/src/mame/audio/williams.c b/src/mame/audio/williams.c
index 44e79618084..2d81c922e56 100644
--- a/src/mame/audio/williams.c
+++ b/src/mame/audio/williams.c
@@ -23,6 +23,7 @@
 ****************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "machine/6821pia.h"
 #include "cpu/m6809/m6809.h"
 #include "williams.h"
diff --git a/src/mame/drivers/20pacgal.c b/src/mame/drivers/20pacgal.c
index 25a028175ed..facfcdf2839 100644
--- a/src/mame/drivers/20pacgal.c
+++ b/src/mame/drivers/20pacgal.c
@@ -37,6 +37,7 @@ TODO:
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "machine/eeprom.h"
 #include "cpu/z180/z180.h"
 #include "pacman.h"
diff --git a/src/mame/drivers/2mindril.c b/src/mame/drivers/2mindril.c
index 17c58088287..3d78a81a0a9 100644
--- a/src/mame/drivers/2mindril.c
+++ b/src/mame/drivers/2mindril.c
@@ -51,6 +51,7 @@ DAC               -26.6860Mhz
 */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "sound/2610intf.h"
 
 static UINT16 *unkram;
diff --git a/src/mame/drivers/40love.c b/src/mame/drivers/40love.c
index 60b94888ff3..c945dc17637 100644
--- a/src/mame/drivers/40love.c
+++ b/src/mame/drivers/40love.c
@@ -216,8 +216,8 @@ Notes - Has jumper setting for 122HZ or 61HZ)
 
 */
 
-#include <math.h>
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/z80/z80.h"
 #include "cpu/m6805/m6805.h"
 #include "sound/ay8910.h"
diff --git a/src/mame/drivers/8080bw.c b/src/mame/drivers/8080bw.c
index f98f71eb5e1..9d49e4bd08e 100644
--- a/src/mame/drivers/8080bw.c
+++ b/src/mame/drivers/8080bw.c
@@ -77,6 +77,7 @@
 /****************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "8080bw.h"
 #include "mw8080bw.h"
 #include "machine/mb14241.h"
diff --git a/src/mame/drivers/88games.c b/src/mame/drivers/88games.c
index 650ca0a610f..2c72e6bfa4b 100644
--- a/src/mame/drivers/88games.c
+++ b/src/mame/drivers/88games.c
@@ -5,6 +5,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/konami/konami.h"
 #include "cpu/z80/z80.h"
 #include "video/konamiic.h"
diff --git a/src/mame/drivers/ace.c b/src/mame/drivers/ace.c
index 86fe58d1ff1..274e3db7a08 100644
--- a/src/mame/drivers/ace.c
+++ b/src/mame/drivers/ace.c
@@ -38,6 +38,7 @@ A1                   2101            2101
 ****************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 
 
 static UINT8 *ace_scoreram;
diff --git a/src/mame/drivers/actfancr.c b/src/mame/drivers/actfancr.c
index 748bf9b7a8c..fe1a6cd5e0f 100644
--- a/src/mame/drivers/actfancr.c
+++ b/src/mame/drivers/actfancr.c
@@ -23,6 +23,7 @@
 *******************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/m6502/m6502.h"
 #include "cpu/h6280/h6280.h"
 #include "sound/2203intf.h"
diff --git a/src/mame/drivers/aerofgt.c b/src/mame/drivers/aerofgt.c
index 1afd8232b80..d8a87024024 100644
--- a/src/mame/drivers/aerofgt.c
+++ b/src/mame/drivers/aerofgt.c
@@ -59,6 +59,7 @@ Verification still needed for the other PCBs.
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/z80/z80.h"
 #include "sound/2610intf.h"
 #include "sound/3812intf.h"
diff --git a/src/mame/drivers/airbustr.c b/src/mame/drivers/airbustr.c
index 30ac47b41a9..89e2cdd379a 100644
--- a/src/mame/drivers/airbustr.c
+++ b/src/mame/drivers/airbustr.c
@@ -218,6 +218,7 @@ Code at 505: waits for bit 1 to go low, writes command, waits for bit
 */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/z80/z80.h"
 #include "sound/2203intf.h"
 #include "sound/okim6295.h"
diff --git a/src/mame/drivers/alg.c b/src/mame/drivers/alg.c
index 8630a35b7cc..b0ed4c914ac 100644
--- a/src/mame/drivers/alg.c
+++ b/src/mame/drivers/alg.c
@@ -22,6 +22,7 @@
 
 #include "driver.h"
 #include "render.h"
+#include "deprecat.h"
 #include "includes/amiga.h"
 #include "machine/laserdsc.h"
 
diff --git a/src/mame/drivers/aliens.c b/src/mame/drivers/aliens.c
index e96015771d7..0fc5b7d3abe 100644
--- a/src/mame/drivers/aliens.c
+++ b/src/mame/drivers/aliens.c
@@ -8,6 +8,7 @@ Preliminary driver by:
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/konami/konami.h" /* for the callback and the firq irq definition */
 #include "video/konamiic.h"
 #include "sound/k007232.h"
diff --git a/src/mame/drivers/alpha68k.c b/src/mame/drivers/alpha68k.c
index 1a760a7cf4b..43a08029634 100644
--- a/src/mame/drivers/alpha68k.c
+++ b/src/mame/drivers/alpha68k.c
@@ -174,6 +174,7 @@ note: CLUT and color remap PROMs missing
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/z80/z80.h"
 #include "sound/ay8910.h"
 #include "sound/dac.h"
diff --git a/src/mame/drivers/amspdwy.c b/src/mame/drivers/amspdwy.c
index c5b7eb1767e..204122d33a5 100644
--- a/src/mame/drivers/amspdwy.c
+++ b/src/mame/drivers/amspdwy.c
@@ -14,6 +14,7 @@ Sound:  YM2151
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "sound/2151intf.h"
 
 /* Variables & functions defined in video: */
diff --git a/src/mame/drivers/angelkds.c b/src/mame/drivers/angelkds.c
index 5a2d9f6d5e0..ff530a0903c 100644
--- a/src/mame/drivers/angelkds.c
+++ b/src/mame/drivers/angelkds.c
@@ -127,6 +127,7 @@ Dumped by Chackn
 
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/z80/z80.h"
 #include "machine/segacrpt.h"
 #include "sound/2203intf.h"
diff --git a/src/mame/drivers/aquarium.c b/src/mame/drivers/aquarium.c
index 5842c9bd05e..ddd240fce89 100644
--- a/src/mame/drivers/aquarium.c
+++ b/src/mame/drivers/aquarium.c
@@ -50,6 +50,7 @@ Stephh's notes (based on the game M68000 code and some tests) :
 
 
 #include "driver.h"
+#include "deprecat.h"
 #include "sound/2151intf.h"
 #include "sound/okim6295.h"
 
diff --git a/src/mame/drivers/arcadecl.c b/src/mame/drivers/arcadecl.c
index 25f9a5aab89..10ef3d4b237 100644
--- a/src/mame/drivers/arcadecl.c
+++ b/src/mame/drivers/arcadecl.c
@@ -67,6 +67,7 @@
 
 
 #include "driver.h"
+#include "deprecat.h"
 #include "machine/atarigen.h"
 #include "arcadecl.h"
 #include "sound/okim6295.h"
diff --git a/src/mame/drivers/argus.c b/src/mame/drivers/argus.c
index 68fd2aa9ca8..7662a197304 100644
--- a/src/mame/drivers/argus.c
+++ b/src/mame/drivers/argus.c
@@ -84,6 +84,7 @@ Known issues :
 
 
 #include "driver.h"
+#include "deprecat.h"
 #include "sound/2203intf.h"
 
 
diff --git a/src/mame/drivers/artmagic.c b/src/mame/drivers/artmagic.c
index 8b5d35340cc..71651fd46f8 100644
--- a/src/mame/drivers/artmagic.c
+++ b/src/mame/drivers/artmagic.c
@@ -16,6 +16,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/tms34010/tms34010.h"
 #include "video/tlc34076.h"
 #include "artmagic.h"
diff --git a/src/mame/drivers/ashnojoe.c b/src/mame/drivers/ashnojoe.c
index fbccc4dbe38..a0de6825717 100644
--- a/src/mame/drivers/ashnojoe.c
+++ b/src/mame/drivers/ashnojoe.c
@@ -77,6 +77,7 @@ Coin B is not used
 *************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "sound/2203intf.h"
 #include "sound/msm5205.h"
 
diff --git a/src/mame/drivers/asterix.c b/src/mame/drivers/asterix.c
index 5c416fe7828..f924b5ad301 100644
--- a/src/mame/drivers/asterix.c
+++ b/src/mame/drivers/asterix.c
@@ -10,6 +10,7 @@ colour, including the word "Konami"
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "video/konamiic.h"
 #include "cpu/z80/z80.h"
 #include "machine/eeprom.h"
diff --git a/src/mame/drivers/astrocde.c b/src/mame/drivers/astrocde.c
index ddc71c60a28..d17a3c123f1 100644
--- a/src/mame/drivers/astrocde.c
+++ b/src/mame/drivers/astrocde.c
@@ -101,6 +101,7 @@
 ****************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/z80/z80daisy.h"
 #include "includes/astrocde.h"
 #include "machine/z80ctc.h"
diff --git a/src/mame/drivers/astrof.c b/src/mame/drivers/astrof.c
index b8bf94026ac..8150b37cf80 100644
--- a/src/mame/drivers/astrof.c
+++ b/src/mame/drivers/astrof.c
@@ -49,6 +49,7 @@
 
 
 #include "driver.h"
+#include "deprecat.h"
 #include "astrof.h"
 
 
diff --git a/src/mame/drivers/asuka.c b/src/mame/drivers/asuka.c
index de8b80e464d..7abe16c2830 100644
--- a/src/mame/drivers/asuka.c
+++ b/src/mame/drivers/asuka.c
@@ -205,6 +205,7 @@ the prog rom. Doesn't seem to cause problems though.
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "taitoipt.h"
 #include "video/taitoic.h"
 #include "audio/taitosnd.h"
diff --git a/src/mame/drivers/atarig42.c b/src/mame/drivers/atarig42.c
index 39fe4502e7a..558ea7761f0 100644
--- a/src/mame/drivers/atarig42.c
+++ b/src/mame/drivers/atarig42.c
@@ -19,6 +19,7 @@
 
 
 #include "driver.h"
+#include "deprecat.h"
 #include "machine/atarigen.h"
 #include "machine/asic65.h"
 #include "audio/atarijsa.h"
diff --git a/src/mame/drivers/atarigt.c b/src/mame/drivers/atarigt.c
index 875923439d2..57bab6588ab 100644
--- a/src/mame/drivers/atarigt.c
+++ b/src/mame/drivers/atarigt.c
@@ -19,6 +19,7 @@
 
 
 #include "driver.h"
+#include "deprecat.h"
 #include "machine/atarigen.h"
 #include "video/atarirle.h"
 #include "cpu/m68000/m68000.h"
diff --git a/src/mame/drivers/atarigx2.c b/src/mame/drivers/atarigx2.c
index 557df43d665..6bdcff11661 100644
--- a/src/mame/drivers/atarigx2.c
+++ b/src/mame/drivers/atarigx2.c
@@ -20,6 +20,7 @@
 
 
 #include "driver.h"
+#include "deprecat.h"
 #include "machine/atarigen.h"
 #include "audio/atarijsa.h"
 #include "video/atarirle.h"
diff --git a/src/mame/drivers/atarisy2.c b/src/mame/drivers/atarisy2.c
index 08c63972650..1e0dec46ae2 100644
--- a/src/mame/drivers/atarisy2.c
+++ b/src/mame/drivers/atarisy2.c
@@ -124,6 +124,7 @@
 
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/t11/t11.h"
 #include "machine/atarigen.h"
 #include "slapstic.h"
@@ -131,7 +132,6 @@
 #include "sound/5220intf.h"
 #include "sound/2151intf.h"
 #include "sound/pokey.h"
-#include <math.h>
 
 
 #define MASTER_CLOCK		XTAL_20MHz
diff --git a/src/mame/drivers/atetris.c b/src/mame/drivers/atetris.c
index 654037a3176..b7ef3cb9348 100644
--- a/src/mame/drivers/atetris.c
+++ b/src/mame/drivers/atetris.c
@@ -48,6 +48,7 @@
 
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/m6502/m6502.h"
 #include "slapstic.h"
 #include "atetris.h"
diff --git a/src/mame/drivers/backfire.c b/src/mame/drivers/backfire.c
index 85587c34c5e..1f52f899eaf 100644
--- a/src/mame/drivers/backfire.c
+++ b/src/mame/drivers/backfire.c
@@ -14,6 +14,7 @@
 extern void decrypt156(void);
 
 #include "driver.h"
+#include "deprecat.h"
 #include "decocrpt.h"
 #include "deco32.h"
 #include "machine/eeprom.h"
diff --git a/src/mame/drivers/baraduke.c b/src/mame/drivers/baraduke.c
index 6287ad621ed..4932d150619 100644
--- a/src/mame/drivers/baraduke.c
+++ b/src/mame/drivers/baraduke.c
@@ -100,6 +100,7 @@ TODO:
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/m6800/m6800.h"
 #include "sound/namco.h"
 
diff --git a/src/mame/drivers/batman.c b/src/mame/drivers/batman.c
index 9868294a685..b34e7d93dce 100644
--- a/src/mame/drivers/batman.c
+++ b/src/mame/drivers/batman.c
@@ -18,6 +18,7 @@
 
 
 #include "driver.h"
+#include "deprecat.h"
 #include "machine/atarigen.h"
 #include "audio/atarijsa.h"
 #include "batman.h"
diff --git a/src/mame/drivers/battlane.c b/src/mame/drivers/battlane.c
index 7f0cf020c61..28df01fe887 100644
--- a/src/mame/drivers/battlane.c
+++ b/src/mame/drivers/battlane.c
@@ -10,6 +10,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/m6809/m6809.h"
 #include "sound/3812intf.h"
 
diff --git a/src/mame/drivers/battlera.c b/src/mame/drivers/battlera.c
index 8532ce262ed..fc0360d4962 100644
--- a/src/mame/drivers/battlera.c
+++ b/src/mame/drivers/battlera.c
@@ -21,6 +21,7 @@
 **********************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/h6280/h6280.h"
 #include "sound/2203intf.h"
 #include "sound/msm5205.h"
diff --git a/src/mame/drivers/battlnts.c b/src/mame/drivers/battlnts.c
index 0913a677eb3..5d7c1fd979d 100644
--- a/src/mame/drivers/battlnts.c
+++ b/src/mame/drivers/battlnts.c
@@ -11,6 +11,7 @@ Preliminary driver by: Manuel Abadia <manu@teleline.es>
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/hd6309/hd6309.h"
 #include "cpu/z80/z80.h"
 #include "video/konamiic.h"
diff --git a/src/mame/drivers/bbusters.c b/src/mame/drivers/bbusters.c
index 5defa80cb7f..6eeb292d822 100644
--- a/src/mame/drivers/bbusters.c
+++ b/src/mame/drivers/bbusters.c
@@ -171,6 +171,7 @@ after adding the mechanized attack u.s. roms i suspect that there is more than j
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "sound/2608intf.h"
 #include "sound/2610intf.h"
 
diff --git a/src/mame/drivers/beathead.c b/src/mame/drivers/beathead.c
index c440a2491c0..243d1e69ee1 100644
--- a/src/mame/drivers/beathead.c
+++ b/src/mame/drivers/beathead.c
@@ -98,6 +98,7 @@
 
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/asap/asap.h"
 #include "machine/atarigen.h"
 #include "audio/atarijsa.h"
diff --git a/src/mame/drivers/bfcobra.c b/src/mame/drivers/bfcobra.c
index 5e485386c57..cb412fd0601 100644
--- a/src/mame/drivers/bfcobra.c
+++ b/src/mame/drivers/bfcobra.c
@@ -71,7 +71,7 @@
 
 ******************************************************************************/
 #include "driver.h"
-#include "debugger.h"
+#include "deprecat.h"
 #include "machine/6850acia.h"
 #include "machine/meters.h"
 #include "cpu/z80/z80.h"
diff --git a/src/mame/drivers/bfm_sc2.c b/src/mame/drivers/bfm_sc2.c
index 09131c17263..d692c302ac0 100644
--- a/src/mame/drivers/bfm_sc2.c
+++ b/src/mame/drivers/bfm_sc2.c
@@ -137,6 +137,7 @@ Adder hardware:
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/m6809/m6809.h"
 
 #include "video/bfm_adr2.h"
@@ -145,8 +146,6 @@ Adder hardware:
 #include "sound/upd7759.h"
 
 /* fruit machines only */
-//#include "video/bfm_dm01.h"
-//#include "video/awpvid.h"
 #include "machine/steppers.h" // stepper motor
 
 #include "machine/bfm_bd1.h"  // vfd
diff --git a/src/mame/drivers/bigevglf.c b/src/mame/drivers/bigevglf.c
index f685c598ada..d2d8d2566fb 100644
--- a/src/mame/drivers/bigevglf.c
+++ b/src/mame/drivers/bigevglf.c
@@ -56,6 +56,7 @@ J1100072A
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "sound/ay8910.h"
 #include "sound/msm5232.h"
 #include "cpu/m6805/m6805.h"
diff --git a/src/mame/drivers/bigfghtr.c b/src/mame/drivers/bigfghtr.c
index 4de79c9cefa..2f61e310178 100644
--- a/src/mame/drivers/bigfghtr.c
+++ b/src/mame/drivers/bigfghtr.c
@@ -109,6 +109,7 @@ Notes:
 
 **********************************************************************/
 #include "driver.h"
+#include "deprecat.h"
 #include "sound/dac.h"
 #include "sound/okim6295.h"
 #include "sound/3812intf.h"
diff --git a/src/mame/drivers/bishi.c b/src/mame/drivers/bishi.c
index 4f7c13584ed..4a22ba4b47b 100644
--- a/src/mame/drivers/bishi.c
+++ b/src/mame/drivers/bishi.c
@@ -11,6 +11,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "video/konamiic.h"
 #include "cpu/m68000/m68000.h"
 #include "sound/ymz280b.h"
diff --git a/src/mame/drivers/bishjan.c b/src/mame/drivers/bishjan.c
index 40373c41ddb..7a0241e3e58 100644
--- a/src/mame/drivers/bishjan.c
+++ b/src/mame/drivers/bishjan.c
@@ -46,6 +46,7 @@ Notes:
 *********************************************************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/h83002/h83002.h"
 
 #define BISHJAN_DEBUG	0
diff --git a/src/mame/drivers/bking2.c b/src/mame/drivers/bking2.c
index c341efef1af..2d4ac904f81 100644
--- a/src/mame/drivers/bking2.c
+++ b/src/mame/drivers/bking2.c
@@ -13,6 +13,7 @@ a000-bfff Unused?
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/m6805/m6805.h"
 #include "sound/ay8910.h"
 #include "sound/dac.h"
diff --git a/src/mame/drivers/bladestl.c b/src/mame/drivers/bladestl.c
index 7d97345459e..fec577cf9ec 100644
--- a/src/mame/drivers/bladestl.c
+++ b/src/mame/drivers/bladestl.c
@@ -26,6 +26,7 @@ Notes:
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/m6809/m6809.h"
 #include "cpu/hd6309/hd6309.h"
 #include "video/konamiic.h"
diff --git a/src/mame/drivers/blktiger.c b/src/mame/drivers/blktiger.c
index adc31f20f31..b72cfcc25ce 100644
--- a/src/mame/drivers/blktiger.c
+++ b/src/mame/drivers/blktiger.c
@@ -14,6 +14,7 @@ Notes:
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/z80/z80.h"
 #include "sound/2203intf.h"
 
diff --git a/src/mame/drivers/blmbycar.c b/src/mame/drivers/blmbycar.c
index f21ddda4a3a..dc8b6b20116 100644
--- a/src/mame/drivers/blmbycar.c
+++ b/src/mame/drivers/blmbycar.c
@@ -24,6 +24,7 @@ Check game speed, it depends on a bit we toggle..
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "sound/okim6295.h"
 
 /* Variables defined in video: */
diff --git a/src/mame/drivers/blockhl.c b/src/mame/drivers/blockhl.c
index 98eb0786b4f..67ead7b605e 100644
--- a/src/mame/drivers/blockhl.c
+++ b/src/mame/drivers/blockhl.c
@@ -20,6 +20,7 @@ found it.
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/konami/konami.h" /* for the callback and the firq irq definition */
 #include "video/konamiic.h"
 #include "sound/2151intf.h"
diff --git a/src/mame/drivers/blockout.c b/src/mame/drivers/blockout.c
index df80be4c75b..efdb637402c 100644
--- a/src/mame/drivers/blockout.c
+++ b/src/mame/drivers/blockout.c
@@ -7,6 +7,7 @@ driver by Nicola Salmoria
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/z80/z80.h"
 #include "sound/2151intf.h"
 #include "sound/okim6295.h"
diff --git a/src/mame/drivers/blstroid.c b/src/mame/drivers/blstroid.c
index 54a9cf9e626..bc9a92a2886 100644
--- a/src/mame/drivers/blstroid.c
+++ b/src/mame/drivers/blstroid.c
@@ -18,6 +18,7 @@
 
 
 #include "driver.h"
+#include "deprecat.h"
 #include "machine/atarigen.h"
 #include "audio/atarijsa.h"
 #include "blstroid.h"
diff --git a/src/mame/drivers/blueprnt.c b/src/mame/drivers/blueprnt.c
index 8a1363ab388..aa9acd34e83 100644
--- a/src/mame/drivers/blueprnt.c
+++ b/src/mame/drivers/blueprnt.c
@@ -51,6 +51,7 @@ write:
 */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/z80/z80.h"
 #include "sound/ay8910.h"
 
diff --git a/src/mame/drivers/bmcbowl.c b/src/mame/drivers/bmcbowl.c
index 41cd83e037e..3a35082efb8 100644
--- a/src/mame/drivers/bmcbowl.c
+++ b/src/mame/drivers/bmcbowl.c
@@ -104,6 +104,7 @@ Main board:
 */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/m68000/m68000.h"
 #include "machine/6522via.h"
 #include "sound/ay8910.h"
diff --git a/src/mame/drivers/bnstars.c b/src/mame/drivers/bnstars.c
index a703cf32fc0..4dfda1e755e 100644
--- a/src/mame/drivers/bnstars.c
+++ b/src/mame/drivers/bnstars.c
@@ -87,6 +87,7 @@ ROMs    : MR96004-10.1  [125661cd] (IC5 - Samples)
 */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "sound/ymf271.h"
 #include "rendlay.h"
 
diff --git a/src/mame/drivers/boogwing.c b/src/mame/drivers/boogwing.c
index b706219fc6e..7ef2fa4044d 100644
--- a/src/mame/drivers/boogwing.c
+++ b/src/mame/drivers/boogwing.c
@@ -75,6 +75,7 @@
 */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/m68000/m68000.h"
 #include "cpu/h6280/h6280.h"
 #include "decocrpt.h"
diff --git a/src/mame/drivers/bottom9.c b/src/mame/drivers/bottom9.c
index 8bd09db0dbe..b1b4e168c25 100644
--- a/src/mame/drivers/bottom9.c
+++ b/src/mame/drivers/bottom9.c
@@ -9,6 +9,7 @@ driver by Nicola Salmoria
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/m6809/m6809.h"
 #include "video/konamiic.h"
 #include "sound/k007232.h"
diff --git a/src/mame/drivers/boxer.c b/src/mame/drivers/boxer.c
index 641889eac29..87466c75b69 100644
--- a/src/mame/drivers/boxer.c
+++ b/src/mame/drivers/boxer.c
@@ -9,6 +9,7 @@ Atari Boxer (prototype) driver
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 
 extern UINT8* boxer_tile_ram;
 extern UINT8* boxer_sprite_ram;
diff --git a/src/mame/drivers/brkthru.c b/src/mame/drivers/brkthru.c
index e865955af40..299ec2d09e6 100644
--- a/src/mame/drivers/brkthru.c
+++ b/src/mame/drivers/brkthru.c
@@ -46,6 +46,7 @@ Sound: YM2203 and YM3526 driven by 6809.  Sound added by Bryan McPhail, 1/4/98.
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/m6809/m6809.h"
 #include "sound/2203intf.h"
 #include "sound/3812intf.h"
diff --git a/src/mame/drivers/btime.c b/src/mame/drivers/btime.c
index 9fef56c0f22..b44a5bc5b5c 100644
--- a/src/mame/drivers/btime.c
+++ b/src/mame/drivers/btime.c
@@ -47,6 +47,7 @@ can take. Should the game reset????
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/m6502/m6502.h"
 #include "sound/ay8910.h"
 
diff --git a/src/mame/drivers/btoads.c b/src/mame/drivers/btoads.c
index 2480db794e2..f33cf4eb3f0 100644
--- a/src/mame/drivers/btoads.c
+++ b/src/mame/drivers/btoads.c
@@ -7,6 +7,7 @@
 **************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/tms34010/tms34010.h"
 #include "video/tlc34076.h"
 #include "btoads.h"
diff --git a/src/mame/drivers/bublbobl.c b/src/mame/drivers/bublbobl.c
index ef8ff33feaf..92bbc706915 100644
--- a/src/mame/drivers/bublbobl.c
+++ b/src/mame/drivers/bublbobl.c
@@ -269,6 +269,7 @@ TODO:
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "sound/2203intf.h"
 #include "sound/3812intf.h"
 #include "cpu/m6805/m6805.h"
diff --git a/src/mame/drivers/buggychl.c b/src/mame/drivers/buggychl.c
index b6d4ec75f9c..c188c028ed8 100644
--- a/src/mame/drivers/buggychl.c
+++ b/src/mame/drivers/buggychl.c
@@ -78,6 +78,7 @@ dcxx = /SPOSI (S36)
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/z80/z80.h"
 #include "cpu/m6805/m6805.h"
 #include "sound/ay8910.h"
diff --git a/src/mame/drivers/bwidow.c b/src/mame/drivers/bwidow.c
index 97ee34725b8..d44515518e6 100644
--- a/src/mame/drivers/bwidow.c
+++ b/src/mame/drivers/bwidow.c
@@ -214,6 +214,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "video/vector.h"
 #include "video/avgdvg.h"
 #include "machine/atari_vg.h"
diff --git a/src/mame/drivers/bwing.c b/src/mame/drivers/bwing.c
index 07f7dda023d..06eb6ac374e 100644
--- a/src/mame/drivers/bwing.c
+++ b/src/mame/drivers/bwing.c
@@ -23,6 +23,7 @@ Known issues:
 // Directives
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/m6809/m6809.h"
 #include "cpu/m6502/m6502.h"
 #include "sound/ay8910.h"
diff --git a/src/mame/drivers/cabal.c b/src/mame/drivers/cabal.c
index 0b9018bf8a3..8152467758c 100644
--- a/src/mame/drivers/cabal.c
+++ b/src/mame/drivers/cabal.c
@@ -41,7 +41,7 @@ COLORRAM (Colors)
 ******************************************************************/
 
 #include "driver.h"
-#include "streams.h"
+#include "deprecat.h"
 #include "cpu/z80/z80.h"
 #include "audio/seibu.h"
 #include "sound/2151intf.h"
diff --git a/src/mame/drivers/capbowl.c b/src/mame/drivers/capbowl.c
index 8404d48ec3f..6c7c615412b 100644
--- a/src/mame/drivers/capbowl.c
+++ b/src/mame/drivers/capbowl.c
@@ -88,6 +88,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "machine/ticket.h"
 #include "cpu/m6809/m6809.h"
 #include "capbowl.h"
diff --git a/src/mame/drivers/carrera.c b/src/mame/drivers/carrera.c
index 7b090719e99..28652cddeee 100644
--- a/src/mame/drivers/carrera.c
+++ b/src/mame/drivers/carrera.c
@@ -42,6 +42,7 @@ Emulation Notes:
 #define MASTER_CLOCK 22118400
 
 #include "driver.h"
+#include "deprecat.h"
 #include "sound/ay8910.h"
 #include "video/crtc6845.h"
 
diff --git a/src/mame/drivers/cave.c b/src/mame/drivers/cave.c
index e99de955bcf..1dc21f85994 100644
--- a/src/mame/drivers/cave.c
+++ b/src/mame/drivers/cave.c
@@ -69,6 +69,7 @@ Versions known to exist but not dumped:
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "machine/eeprom.h"
 #include "machine/nmk112.h"
 #include "cpu/z80/z80.h"
diff --git a/src/mame/drivers/cbuster.c b/src/mame/drivers/cbuster.c
index de0cab1559a..14cab1bfa19 100644
--- a/src/mame/drivers/cbuster.c
+++ b/src/mame/drivers/cbuster.c
@@ -14,6 +14,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/h6280/h6280.h"
 #include "sound/2203intf.h"
 #include "sound/2151intf.h"
diff --git a/src/mame/drivers/ccastles.c b/src/mame/drivers/ccastles.c
index 35d75aaa1f8..3390d34eaf0 100644
--- a/src/mame/drivers/ccastles.c
+++ b/src/mame/drivers/ccastles.c
@@ -120,6 +120,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "sound/pokey.h"
 #include "ccastles.h"
 
diff --git a/src/mame/drivers/cchasm.c b/src/mame/drivers/cchasm.c
index dd517736d08..838fe6ae28f 100644
--- a/src/mame/drivers/cchasm.c
+++ b/src/mame/drivers/cchasm.c
@@ -13,6 +13,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "video/vector.h"
 #include "machine/6840ptm.h"
 #include "machine/z80ctc.h"
diff --git a/src/mame/drivers/cclimber.c b/src/mame/drivers/cclimber.c
index 63f7a957cc2..a3f0a18476d 100644
--- a/src/mame/drivers/cclimber.c
+++ b/src/mame/drivers/cclimber.c
@@ -126,6 +126,7 @@ TODO:
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "sound/ay8910.h"
 #include "sound/samples.h"
 #include "includes/cclimber.h"
diff --git a/src/mame/drivers/centiped.c b/src/mame/drivers/centiped.c
index d4a1725b0d6..651af862b8e 100644
--- a/src/mame/drivers/centiped.c
+++ b/src/mame/drivers/centiped.c
@@ -421,6 +421,7 @@ Milipede:
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/s2650/s2650.h"
 #include "machine/atari_vg.h"
 #include "centiped.h"
diff --git a/src/mame/drivers/cham24.c b/src/mame/drivers/cham24.c
index 1ef78878445..3d5e485d177 100644
--- a/src/mame/drivers/cham24.c
+++ b/src/mame/drivers/cham24.c
@@ -55,6 +55,7 @@ Notes:
 */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "video/ppu2c0x.h"
 #include "sound/nes_apu.h"
 #include "cpu/m6502/m6502.h"
diff --git a/src/mame/drivers/champbas.c b/src/mame/drivers/champbas.c
index d65c0896275..5263e31c46c 100644
--- a/src/mame/drivers/champbas.c
+++ b/src/mame/drivers/champbas.c
@@ -55,6 +55,7 @@ e000-e3ff   RAM
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "sound/ay8910.h"
 #include "sound/dac.h"
 
diff --git a/src/mame/drivers/chinagat.c b/src/mame/drivers/chinagat.c
index 728abc6fb5e..59901cf98e1 100644
--- a/src/mame/drivers/chinagat.c
+++ b/src/mame/drivers/chinagat.c
@@ -69,6 +69,7 @@ Input is unique but has a few similarities to DD2 (the coin inputs)
 
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/m6809/m6809.h"
 #include "cpu/z80/z80.h"
 #include "cpu/i8039/i8039.h"
diff --git a/src/mame/drivers/chinsan.c b/src/mame/drivers/chinsan.c
index 26634e5880e..97566dff3f1 100644
--- a/src/mame/drivers/chinsan.c
+++ b/src/mame/drivers/chinsan.c
@@ -40,6 +40,7 @@ MM63.10N
 */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "machine/mc8123.h"
 #include "sound/2203intf.h"
 
diff --git a/src/mame/drivers/chqflag.c b/src/mame/drivers/chqflag.c
index 8f86b6ab9a9..b6dbbe02a4c 100644
--- a/src/mame/drivers/chqflag.c
+++ b/src/mame/drivers/chqflag.c
@@ -9,6 +9,7 @@ Notes:
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/z80/z80.h"
 #include "cpu/konami/konami.h"
 #include "video/konamiic.h"
diff --git a/src/mame/drivers/circusc.c b/src/mame/drivers/circusc.c
index d67d23b3575..51c38e1a3e5 100644
--- a/src/mame/drivers/circusc.c
+++ b/src/mame/drivers/circusc.c
@@ -14,6 +14,7 @@ To enter service mode, keep 1&2 pressed on reset
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/m6809/m6809.h"
 #include "sound/dac.h"
 #include "sound/sn76496.h"
diff --git a/src/mame/drivers/cischeat.c b/src/mame/drivers/cischeat.c
index 35fa1ed3af0..3ec2c13a93d 100644
--- a/src/mame/drivers/cischeat.c
+++ b/src/mame/drivers/cischeat.c
@@ -162,6 +162,7 @@ To Do:
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "megasys1.h"
 #include "sound/2151intf.h"
 #include "sound/okim6295.h"
diff --git a/src/mame/drivers/cliffhgr.c b/src/mame/drivers/cliffhgr.c
index 385e06669f7..f0105479ad9 100644
--- a/src/mame/drivers/cliffhgr.c
+++ b/src/mame/drivers/cliffhgr.c
@@ -75,6 +75,7 @@ Side 2 = 0x8F7DDD (or 0x880000 | ( 0x77 << 12 ) | 0x0DDD)
 
 #include "driver.h"
 #include "render.h"
+#include "deprecat.h"
 #include "machine/laserdsc.h"
 #include "video/tms9928a.h"
 #include "sound/discrete.h"
diff --git a/src/mame/drivers/cloak.c b/src/mame/drivers/cloak.c
index 667647b7640..e79d3850a0b 100644
--- a/src/mame/drivers/cloak.c
+++ b/src/mame/drivers/cloak.c
@@ -108,6 +108,7 @@
 */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "sound/pokey.h"
 
 static int cloak_nvram_enabled;
diff --git a/src/mame/drivers/cloud9.c b/src/mame/drivers/cloud9.c
index aa51c2b1fae..7f6ebe124d4 100644
--- a/src/mame/drivers/cloud9.c
+++ b/src/mame/drivers/cloud9.c
@@ -91,6 +91,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "sound/pokey.h"
 #include "cloud9.h"
 
diff --git a/src/mame/drivers/cninja.c b/src/mame/drivers/cninja.c
index 734f0ab0838..cd5bf25940e 100644
--- a/src/mame/drivers/cninja.c
+++ b/src/mame/drivers/cninja.c
@@ -41,6 +41,7 @@ Note about version levels using Mutant Fighter as the example:
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cninja.h"
 #include "cpu/h6280/h6280.h"
 #include "deco16ic.h"
diff --git a/src/mame/drivers/cntsteer.c b/src/mame/drivers/cntsteer.c
index a6411f0ab9e..ef04912156c 100644
--- a/src/mame/drivers/cntsteer.c
+++ b/src/mame/drivers/cntsteer.c
@@ -26,6 +26,7 @@
 *******************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/m6809/m6809.h"
 #include "sound/ay8910.h"
 #include "sound/2203intf.h"
diff --git a/src/mame/drivers/combatsc.c b/src/mame/drivers/combatsc.c
index b1ee139fe52..7e878f5c399 100644
--- a/src/mame/drivers/combatsc.c
+++ b/src/mame/drivers/combatsc.c
@@ -118,6 +118,7 @@ e000-e001   YM2203
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/z80/z80.h"
 #include "sound/2203intf.h"
 #include "sound/upd7759.h"
diff --git a/src/mame/drivers/compgolf.c b/src/mame/drivers/compgolf.c
index 0f2a7eb3e33..bd1795dae05 100644
--- a/src/mame/drivers/compgolf.c
+++ b/src/mame/drivers/compgolf.c
@@ -11,6 +11,7 @@ as well.
 ****************************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "sound/2203intf.h"
 
 extern UINT8 *compgolf_bg_ram;
diff --git a/src/mame/drivers/contra.c b/src/mame/drivers/contra.c
index e4b49602247..bb3cd7c5217 100644
--- a/src/mame/drivers/contra.c
+++ b/src/mame/drivers/contra.c
@@ -14,6 +14,7 @@ Credits:
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/m6809/m6809.h"
 #include "sound/2151intf.h"
 
diff --git a/src/mame/drivers/coolpool.c b/src/mame/drivers/coolpool.c
index 6ad55efa7a5..34ee8434a9f 100644
--- a/src/mame/drivers/coolpool.c
+++ b/src/mame/drivers/coolpool.c
@@ -25,6 +25,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/tms34010/tms34010.h"
 #include "cpu/tms34010/34010ops.h"
 #include "cpu/tms32025/tms32025.h"
diff --git a/src/mame/drivers/cop01.c b/src/mame/drivers/cop01.c
index 0919880594b..d4987f5172b 100644
--- a/src/mame/drivers/cop01.c
+++ b/src/mame/drivers/cop01.c
@@ -50,6 +50,7 @@ Mighty Guy board layout:
 
 ***************************************************************************/
 #include "driver.h"
+#include "deprecat.h"
 #include "sound/ay8910.h"
 #include "sound/3812intf.h"
 
diff --git a/src/mame/drivers/cowrace.c b/src/mame/drivers/cowrace.c
index aa8897a9b98..6df08eb62b5 100644
--- a/src/mame/drivers/cowrace.c
+++ b/src/mame/drivers/cowrace.c
@@ -7,6 +7,7 @@
 *************************************************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "sound/okim6295.h"
 #include "sound/2203intf.h"
 
diff --git a/src/mame/drivers/cps1.c b/src/mame/drivers/cps1.c
index c0f93c92793..b08b81e65c7 100644
--- a/src/mame/drivers/cps1.c
+++ b/src/mame/drivers/cps1.c
@@ -153,6 +153,7 @@ Stephh's log (2006.09.20) :
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "machine/eeprom.h"
 #include "sound/2151intf.h"
 #include "sound/okim6295.h"
diff --git a/src/mame/drivers/cps2.c b/src/mame/drivers/cps2.c
index e1cc32642f3..039a7ba1e5b 100644
--- a/src/mame/drivers/cps2.c
+++ b/src/mame/drivers/cps2.c
@@ -545,10 +545,10 @@ Driver Note:
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "machine/eeprom.h"
 #include "cpu/m68000/m68000.h"
 #include "sound/qsound.h"
-#include "ui.h"
 #include "chd.h"
 
 #include "cps1.h"       /* External CPS1 definitions */
diff --git a/src/mame/drivers/cps3.c b/src/mame/drivers/cps3.c
index 696b26b4758..44763a70ca5 100644
--- a/src/mame/drivers/cps3.c
+++ b/src/mame/drivers/cps3.c
@@ -330,6 +330,7 @@ Notes:
 
 #include "driver.h"
 #include "cdrom.h"
+#include "deprecat.h"
 #include "cpu/sh2/sh2.h"
 #include "machine/intelfsh.h"
 #include "includes/cps3.h"
diff --git a/src/mame/drivers/crgolf.c b/src/mame/drivers/crgolf.c
index 8ba40ac7c25..bfecc1bc080 100644
--- a/src/mame/drivers/crgolf.c
+++ b/src/mame/drivers/crgolf.c
@@ -27,6 +27,7 @@ WHO AM I?      (In place of "ARIES ELECA")
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "crgolf.h"
 #include "sound/ay8910.h"
 #include "sound/msm5205.h"
diff --git a/src/mame/drivers/crimfght.c b/src/mame/drivers/crimfght.c
index f15249bf7b8..d706652d0c0 100644
--- a/src/mame/drivers/crimfght.c
+++ b/src/mame/drivers/crimfght.c
@@ -8,6 +8,7 @@ Preliminary driver by:
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/konami/konami.h" /* for the callback and the firq irq definition */
 #include "video/konamiic.h"
 #include "sound/2151intf.h"
diff --git a/src/mame/drivers/crospang.c b/src/mame/drivers/crospang.c
index b55c4889897..2bd76e631fd 100644
--- a/src/mame/drivers/crospang.c
+++ b/src/mame/drivers/crospang.c
@@ -27,6 +27,7 @@
 */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "sound/okim6295.h"
 #include "sound/3812intf.h"
 
diff --git a/src/mame/drivers/crshrace.c b/src/mame/drivers/crshrace.c
index d1ea6c8cf44..aff64753a23 100644
--- a/src/mame/drivers/crshrace.c
+++ b/src/mame/drivers/crshrace.c
@@ -124,6 +124,7 @@ TODO:
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "video/konamiic.h"
 #include "sound/2610intf.h"
 #include "crshrace.h"
diff --git a/src/mame/drivers/crystal.c b/src/mame/drivers/crystal.c
index dc28df49734..52be439ac82 100644
--- a/src/mame/drivers/crystal.c
+++ b/src/mame/drivers/crystal.c
@@ -117,6 +117,7 @@ Notes:
 */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/se3208/se3208.h"
 #include "video/vrender0.h"
 #include "machine/ds1302.h"
diff --git a/src/mame/drivers/cshooter.c b/src/mame/drivers/cshooter.c
index dabe79c49c3..dd87fdfd311 100644
--- a/src/mame/drivers/cshooter.c
+++ b/src/mame/drivers/cshooter.c
@@ -84,6 +84,7 @@ Stephh's notes (based on the game Z80 code and some tests) :
 */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "audio/seibu.h"
 
 static UINT8* cshooter_txram;
diff --git a/src/mame/drivers/cubocd32.c b/src/mame/drivers/cubocd32.c
index 7046a9ab1c0..69003518683 100644
--- a/src/mame/drivers/cubocd32.c
+++ b/src/mame/drivers/cubocd32.c
@@ -48,7 +48,6 @@
 #include "sound/custom.h"
 #include "includes/amiga.h"
 #include "includes/cubocd32.h"
-//#include "memconv.h"
 
 //READWRITE16BETO32BE(amiga_cia32,amiga_cia_r,amiga_cia_w)
 //READWRITE16BETO32BE(amiga_custom32,amiga_custom_r,amiga_custom_w)
diff --git a/src/mame/drivers/cvs.c b/src/mame/drivers/cvs.c
index 2c9b27802d2..3f85a9429dd 100644
--- a/src/mame/drivers/cvs.c
+++ b/src/mame/drivers/cvs.c
@@ -83,6 +83,7 @@ Hardware Info
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/s2650/s2650.h"
 #include "sound/dac.h"
 #include "sound/5110intf.h"
diff --git a/src/mame/drivers/cyberbal.c b/src/mame/drivers/cyberbal.c
index fee0f2db099..bb1ea8149a0 100644
--- a/src/mame/drivers/cyberbal.c
+++ b/src/mame/drivers/cyberbal.c
@@ -20,6 +20,7 @@
 
 
 #include "driver.h"
+#include "deprecat.h"
 #include "rendlay.h"
 #include "machine/atarigen.h"
 #include "audio/atarijsa.h"
diff --git a/src/mame/drivers/cybertnk.c b/src/mame/drivers/cybertnk.c
index a6667f5c91d..21ebac1f531 100644
--- a/src/mame/drivers/cybertnk.c
+++ b/src/mame/drivers/cybertnk.c
@@ -170,6 +170,7 @@ lev 7 : 0x7c : 0000 07e0 - input device clear?
 *******************************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "sound/3812intf.h"
 
 static tilemap *tx_tilemap;
diff --git a/src/mame/drivers/dacholer.c b/src/mame/drivers/dacholer.c
index 153841a8d76..626b470e3b6 100644
--- a/src/mame/drivers/dacholer.c
+++ b/src/mame/drivers/dacholer.c
@@ -12,6 +12,7 @@
 ******************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 
 static UINT8 *bgvideoram,*fgvideoram;
 static int bg_bank = 0;
diff --git a/src/mame/drivers/darius.c b/src/mame/drivers/darius.c
index 393b35ef551..f52e74b0676 100644
--- a/src/mame/drivers/darius.c
+++ b/src/mame/drivers/darius.c
@@ -126,9 +126,8 @@ sounds.
 
 ***************************************************************************/
 
-#include <stdarg.h>
-#include <math.h>
 #include "driver.h"
+#include "deprecat.h"
 #include "video/taitoic.h"
 #include "cpu/z80/z80.h"
 #include "audio/taitosnd.h"
diff --git a/src/mame/drivers/darkseal.c b/src/mame/drivers/darkseal.c
index 6a7f7dda609..f96f16d8c8d 100644
--- a/src/mame/drivers/darkseal.c
+++ b/src/mame/drivers/darkseal.c
@@ -11,6 +11,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/h6280/h6280.h"
 #include "sound/2203intf.h"
 #include "sound/2151intf.h"
diff --git a/src/mame/drivers/dassault.c b/src/mame/drivers/dassault.c
index 96766270807..decba949a73 100644
--- a/src/mame/drivers/dassault.c
+++ b/src/mame/drivers/dassault.c
@@ -119,6 +119,7 @@ Stephh's notes (based on the games M68000 code and some tests) :
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/h6280/h6280.h"
 #include "deco16ic.h"
 #include "sound/2203intf.h"
diff --git a/src/mame/drivers/dblewing.c b/src/mame/drivers/dblewing.c
index 960933bb0e0..2735322df7e 100644
--- a/src/mame/drivers/dblewing.c
+++ b/src/mame/drivers/dblewing.c
@@ -10,6 +10,7 @@ the most protected of the DE102 games?
 */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/m68000/m68000.h"
 #include "decocrpt.h"
 #include "deco16ic.h"
diff --git a/src/mame/drivers/dbz.c b/src/mame/drivers/dbz.c
index 314f61d5959..4b40347e1a6 100644
--- a/src/mame/drivers/dbz.c
+++ b/src/mame/drivers/dbz.c
@@ -51,6 +51,7 @@ Notes:
 */
 
 #include "driver.h"
+#include "deprecat.h"
 
 #include "video/konamiic.h"
 #include "cpu/m68000/m68000.h"
diff --git a/src/mame/drivers/dcheese.c b/src/mame/drivers/dcheese.c
index ae3473ad4b9..a4970272ec5 100644
--- a/src/mame/drivers/dcheese.c
+++ b/src/mame/drivers/dcheese.c
@@ -28,6 +28,7 @@
 
 
 #include "driver.h"
+#include "deprecat.h"
 #include "machine/eeprom.h"
 #include "machine/ticket.h"
 #include "sound/bsmt2000.h"
diff --git a/src/mame/drivers/ddayjlc.c b/src/mame/drivers/ddayjlc.c
index 76b7921253a..9be69071d50 100644
--- a/src/mame/drivers/ddayjlc.c
+++ b/src/mame/drivers/ddayjlc.c
@@ -52,6 +52,7 @@ $842f = lives
 */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "sound/ay8910.h"
 
 static INT32 char_bank = 0;
diff --git a/src/mame/drivers/ddealer.c b/src/mame/drivers/ddealer.c
index 43f1fb3f29c..23ab7678625 100644
--- a/src/mame/drivers/ddealer.c
+++ b/src/mame/drivers/ddealer.c
@@ -103,6 +103,7 @@ Few words about protection:
 
 
 #include "driver.h"
+#include "deprecat.h"
 
 static UINT16 *shared_ram;
 
diff --git a/src/mame/drivers/ddenlovr.c b/src/mame/drivers/ddenlovr.c
index 64cad58980c..14fdb14ef42 100644
--- a/src/mame/drivers/ddenlovr.c
+++ b/src/mame/drivers/ddenlovr.c
@@ -93,6 +93,7 @@ TODO:
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/z80/z80.h"
 #include "sound/ay8910.h"
 #include "sound/okim6295.h"
diff --git a/src/mame/drivers/ddragon.c b/src/mame/drivers/ddragon.c
index a4057782140..b7677371aba 100644
--- a/src/mame/drivers/ddragon.c
+++ b/src/mame/drivers/ddragon.c
@@ -65,6 +65,7 @@ conversion kit which could be applied to a bootleg double dragon :-p?
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/m6800/m6800.h"
 #include "cpu/m6805/m6805.h"
 #include "cpu/m6809/m6809.h"
diff --git a/src/mame/drivers/ddragon3.c b/src/mame/drivers/ddragon3.c
index ac8332d3a5c..908bf22e314 100644
--- a/src/mame/drivers/ddragon3.c
+++ b/src/mame/drivers/ddragon3.c
@@ -24,6 +24,7 @@
 
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/z80/z80.h"
 #include "cpu/m68000/m68000.h"
 #include "sound/2151intf.h"
diff --git a/src/mame/drivers/ddrible.c b/src/mame/drivers/ddrible.c
index 45c4d477c05..693b617402c 100644
--- a/src/mame/drivers/ddrible.c
+++ b/src/mame/drivers/ddrible.c
@@ -7,6 +7,7 @@ Driver by Manuel Abadia <manu@teleline.es>
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/m6809/m6809.h"
 #include "sound/2203intf.h"
 #include "sound/vlm5030.h"
diff --git a/src/mame/drivers/dec0.c b/src/mame/drivers/dec0.c
index 6076dfd626a..4f0ea204ffe 100644
--- a/src/mame/drivers/dec0.c
+++ b/src/mame/drivers/dec0.c
@@ -39,6 +39,7 @@ ToDo:
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/m6502/m6502.h"
 #include "cpu/h6280/h6280.h"
 #include "dec0.h"
diff --git a/src/mame/drivers/dec8.c b/src/mame/drivers/dec8.c
index 345d7a41c9d..37274f0e5a4 100644
--- a/src/mame/drivers/dec8.c
+++ b/src/mame/drivers/dec8.c
@@ -38,6 +38,7 @@ To do:
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/m6809/m6809.h"
 #include "cpu/m6502/m6502.h"
 #include "sound/2203intf.h"
diff --git a/src/mame/drivers/deco156.c b/src/mame/drivers/deco156.c
index 3798b8ddc5f..317f5c1cca6 100644
--- a/src/mame/drivers/deco156.c
+++ b/src/mame/drivers/deco156.c
@@ -16,6 +16,7 @@
 extern void decrypt156(void);
 
 #include "driver.h"
+#include "deprecat.h"
 #include "decocrpt.h"
 #include "deco32.h"
 #include "machine/eeprom.h"
diff --git a/src/mame/drivers/deco32.c b/src/mame/drivers/deco32.c
index 30584bce15d..9623b244867 100644
--- a/src/mame/drivers/deco32.c
+++ b/src/mame/drivers/deco32.c
@@ -224,6 +224,7 @@ Notes:
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/arm/arm.h"
 #include "cpu/h6280/h6280.h"
 #include "cpu/m6809/m6809.h"
diff --git a/src/mame/drivers/deco_mlc.c b/src/mame/drivers/deco_mlc.c
index b06f119ffbf..c8324229cad 100644
--- a/src/mame/drivers/deco_mlc.c
+++ b/src/mame/drivers/deco_mlc.c
@@ -96,6 +96,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "machine/eeprom.h"
 #include "sound/ymz280b.h"
 #include "decoprot.h"
diff --git a/src/mame/drivers/deniam.c b/src/mame/drivers/deniam.c
index cf340381195..20d018cfee1 100644
--- a/src/mame/drivers/deniam.c
+++ b/src/mame/drivers/deniam.c
@@ -32,6 +32,7 @@ Notes:
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/z80/z80.h"
 #include "sound/okim6295.h"
 #include "sound/3812intf.h"
diff --git a/src/mame/drivers/destroyr.c b/src/mame/drivers/destroyr.c
index e4becd9b254..7e10fbd259f 100644
--- a/src/mame/drivers/destroyr.c
+++ b/src/mame/drivers/destroyr.c
@@ -5,6 +5,7 @@ Atari Destroyer Driver
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 
 extern VIDEO_UPDATE( destroyr );
 
diff --git a/src/mame/drivers/dietgo.c b/src/mame/drivers/dietgo.c
index 2e154e1ef2a..842e16eba45 100644
--- a/src/mame/drivers/dietgo.c
+++ b/src/mame/drivers/dietgo.c
@@ -10,6 +10,7 @@
 */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/h6280/h6280.h"
 #include "sound/2151intf.h"
 #include "sound/okim6295.h"
diff --git a/src/mame/drivers/discoboy.c b/src/mame/drivers/discoboy.c
index 5c96a4cfa6c..d4405dd6e70 100644
--- a/src/mame/drivers/discoboy.c
+++ b/src/mame/drivers/discoboy.c
@@ -36,6 +36,7 @@ Notes:
 
 
 #include "driver.h"
+#include "deprecat.h"
 #include "sound/msm5205.h"
 #include "sound/3812intf.h"
 
diff --git a/src/mame/drivers/diverboy.c b/src/mame/drivers/diverboy.c
index 69e9365c9b1..97b0653f140 100644
--- a/src/mame/drivers/diverboy.c
+++ b/src/mame/drivers/diverboy.c
@@ -47,6 +47,7 @@
 */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "sound/okim6295.h"
 
 extern UINT16 *diverboy_spriteram;
diff --git a/src/mame/drivers/djboy.c b/src/mame/drivers/djboy.c
index 49c638b4ca5..9055922177b 100644
--- a/src/mame/drivers/djboy.c
+++ b/src/mame/drivers/djboy.c
@@ -154,6 +154,7 @@ Notes:
 */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/z80/z80.h"
 #include "sound/2203intf.h"
 #include "sound/okim6295.h"
diff --git a/src/mame/drivers/djmain.c b/src/mame/drivers/djmain.c
index 6964f77c78e..c0a7a4327ba 100644
--- a/src/mame/drivers/djmain.c
+++ b/src/mame/drivers/djmain.c
@@ -38,6 +38,7 @@
  */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/m68000/m68000.h"
 #include "machine/idectrl.h"
 #include "sound/k054539.h"
diff --git a/src/mame/drivers/dkong.c b/src/mame/drivers/dkong.c
index 948b26b4780..4ec501d0807 100644
--- a/src/mame/drivers/dkong.c
+++ b/src/mame/drivers/dkong.c
@@ -248,12 +248,12 @@ Changes:
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/s2650/s2650.h"
 #include "cpu/m6502/m6502.h"
 #include "includes/dkong.h"
 #include "machine/8257dma.h"
 #include "machine/z80dma.h"
-#include <math.h>
 
 /*************************************
  *
diff --git a/src/mame/drivers/dlair.c b/src/mame/drivers/dlair.c
index 6f39d395ee5..0e7763e0fb8 100644
--- a/src/mame/drivers/dlair.c
+++ b/src/mame/drivers/dlair.c
@@ -34,6 +34,7 @@
 
 #include "driver.h"
 #include "render.h"
+#include "deprecat.h"
 #include "cpu/z80/z80daisy.h"
 #include "machine/laserdsc.h"
 #include "machine/z80ctc.h"
diff --git a/src/mame/drivers/dmndrby.c b/src/mame/drivers/dmndrby.c
index 1c0c28f1ea4..1dec723cede 100644
--- a/src/mame/drivers/dmndrby.c
+++ b/src/mame/drivers/dmndrby.c
@@ -36,6 +36,7 @@ DD10 DD14  DD18     H5            DD21
 */
 
 #include "driver.h"
+#include "deprecat.h"
 
 static UINT8* dderby_vid;
 
diff --git a/src/mame/drivers/dogfgt.c b/src/mame/drivers/dogfgt.c
index edae4621695..5af115fcea3 100644
--- a/src/mame/drivers/dogfgt.c
+++ b/src/mame/drivers/dogfgt.c
@@ -8,6 +8,7 @@ driver by Nicola Salmoria
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "dogfgt.h"
 #include "sound/ay8910.h"
 
diff --git a/src/mame/drivers/dominob.c b/src/mame/drivers/dominob.c
index 184f0063152..a3e2898f3f9 100644
--- a/src/mame/drivers/dominob.c
+++ b/src/mame/drivers/dominob.c
@@ -151,7 +151,7 @@ ADDRESS_MAP_END
 /* I don't know if this has a purpose - also read in 'arkatayt' but not handled */
 static READ8_HANDLER( dominob_unk_port02_r )
 {
-	return 0xff;//mame_rand(Machine);
+	return 0xff;
 }
 
 static ADDRESS_MAP_START( portmap, ADDRESS_SPACE_IO, 8 )
diff --git a/src/mame/drivers/dooyong.c b/src/mame/drivers/dooyong.c
index 94effb1499b..3d972ef7480 100644
--- a/src/mame/drivers/dooyong.c
+++ b/src/mame/drivers/dooyong.c
@@ -50,6 +50,7 @@ Flying Tiger
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "sound/2203intf.h"
 #include "sound/2151intf.h"
 #include "sound/okim6295.h"
diff --git a/src/mame/drivers/dreamwld.c b/src/mame/drivers/dreamwld.c
index 2ab02602730..1855be83e82 100644
--- a/src/mame/drivers/dreamwld.c
+++ b/src/mame/drivers/dreamwld.c
@@ -37,6 +37,7 @@ Notes:
 */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "sound/okim6295.h"
 
 #define MASTER_CLOCK 32000000
diff --git a/src/mame/drivers/dribling.c b/src/mame/drivers/dribling.c
index 9bdd222ddd4..d62c66b77ea 100644
--- a/src/mame/drivers/dribling.c
+++ b/src/mame/drivers/dribling.c
@@ -26,6 +26,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "machine/8255ppi.h"
 #include "dribling.h"
 
diff --git a/src/mame/drivers/dunhuang.c b/src/mame/drivers/dunhuang.c
index 63091994bb4..c41eb4d598a 100644
--- a/src/mame/drivers/dunhuang.c
+++ b/src/mame/drivers/dunhuang.c
@@ -50,6 +50,7 @@ Notes:
 *********************************************************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "sound/ay8910.h"
 #include "sound/okim6295.h"
 #include "sound/2413intf.h"
diff --git a/src/mame/drivers/dynax.c b/src/mame/drivers/dynax.c
index 4746bad1dc4..40b7cdbbac1 100644
--- a/src/mame/drivers/dynax.c
+++ b/src/mame/drivers/dynax.c
@@ -71,6 +71,7 @@ TODO:
 *********************************************************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "includes/dynax.h"
 #include "cpu/tlcs90/tlcs90.h"
 #include "machine/msm6242.h"
diff --git a/src/mame/drivers/egghunt.c b/src/mame/drivers/egghunt.c
index 40707d453de..862c21cc79c 100644
--- a/src/mame/drivers/egghunt.c
+++ b/src/mame/drivers/egghunt.c
@@ -42,6 +42,7 @@ I dumped it with this configuration. In case I'll redump it desoldering pin 16 f
 */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "sound/okim6295.h"
 
 static UINT8 *egghunt_bgram;
diff --git a/src/mame/drivers/enigma2.c b/src/mame/drivers/enigma2.c
index f3902288baf..1cca0bf0785 100644
--- a/src/mame/drivers/enigma2.c
+++ b/src/mame/drivers/enigma2.c
@@ -19,6 +19,7 @@ TODO:
 *********************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "sound/ay8910.h"
 
 
diff --git a/src/mame/drivers/eolith.c b/src/mame/drivers/eolith.c
index 2ef2cbe9b59..dda95633921 100644
--- a/src/mame/drivers/eolith.c
+++ b/src/mame/drivers/eolith.c
@@ -52,6 +52,7 @@
  *********************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "machine/eeprom.h"
 
 READ32_HANDLER(eolith_vram_r);
diff --git a/src/mame/drivers/eprom.c b/src/mame/drivers/eprom.c
index 73e3972b70f..aecbf3d31a6 100644
--- a/src/mame/drivers/eprom.c
+++ b/src/mame/drivers/eprom.c
@@ -20,6 +20,7 @@
 
 
 #include "driver.h"
+#include "deprecat.h"
 #include "machine/atarigen.h"
 #include "audio/atarijsa.h"
 #include "eprom.h"
diff --git a/src/mame/drivers/ertictac.c b/src/mame/drivers/ertictac.c
index c2b52fadad2..0608e8c92ae 100644
--- a/src/mame/drivers/ertictac.c
+++ b/src/mame/drivers/ertictac.c
@@ -27,6 +27,7 @@ TODO:
 
 **********************************************************************/
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/arm/arm.h"
 
 static UINT32 *ertictac_mainram;
diff --git a/src/mame/drivers/esd16.c b/src/mame/drivers/esd16.c
index f3fbf7b8832..2ba358517c4 100644
--- a/src/mame/drivers/esd16.c
+++ b/src/mame/drivers/esd16.c
@@ -30,6 +30,7 @@ Head Panic
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "machine/eeprom.h"
 #include "sound/okim6295.h"
 #include "sound/3812intf.h"
diff --git a/src/mame/drivers/esh.c b/src/mame/drivers/esh.c
index f9016839a15..ad39059475a 100644
--- a/src/mame/drivers/esh.c
+++ b/src/mame/drivers/esh.c
@@ -23,7 +23,7 @@ Todo:
 */
 
 #include "driver.h"
-#include "render.h"
+#include "deprecat.h"
 #include "machine/laserdsc.h"
 
 /* From daphne */
diff --git a/src/mame/drivers/espial.c b/src/mame/drivers/espial.c
index c0e1512de4e..aa63f1dfd90 100644
--- a/src/mame/drivers/espial.c
+++ b/src/mame/drivers/espial.c
@@ -8,6 +8,7 @@ Espial: The Orca logo is displayed, but looks to be "blacked out" via the
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "espial.h"
 #include "cpu/z80/z80.h"
 #include "sound/ay8910.h"
diff --git a/src/mame/drivers/exctsccr.c b/src/mame/drivers/exctsccr.c
index 90b5b42ef40..3d658e2c913 100644
--- a/src/mame/drivers/exctsccr.c
+++ b/src/mame/drivers/exctsccr.c
@@ -25,6 +25,7 @@ based on wich Coin input was connected.
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "sound/ay8910.h"
 #include "sound/dac.h"
 
diff --git a/src/mame/drivers/exidy440.c b/src/mame/drivers/exidy440.c
index 62f6d8c0553..370d3e32162 100644
--- a/src/mame/drivers/exidy440.c
+++ b/src/mame/drivers/exidy440.c
@@ -215,6 +215,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "exidy440.h"
 
 
diff --git a/src/mame/drivers/expro02.c b/src/mame/drivers/expro02.c
index 6a05f03d553..0dc7e081945 100644
--- a/src/mame/drivers/expro02.c
+++ b/src/mame/drivers/expro02.c
@@ -119,6 +119,7 @@ U78 (22CV10)
 */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "includes/kaneko16.h"
 #include "sound/okim6295.h"
 
diff --git a/src/mame/drivers/exprraid.c b/src/mame/drivers/exprraid.c
index 6b399bf5432..4de04508c19 100644
--- a/src/mame/drivers/exprraid.c
+++ b/src/mame/drivers/exprraid.c
@@ -61,6 +61,7 @@ sign is intact, however Credit is spelt incorrectly.
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/m6809/m6809.h"
 #include "sound/2203intf.h"
 #include "sound/3812intf.h"
diff --git a/src/mame/drivers/exterm.c b/src/mame/drivers/exterm.c
index 4a8160c03a8..d9128b55e15 100644
--- a/src/mame/drivers/exterm.c
+++ b/src/mame/drivers/exterm.c
@@ -61,6 +61,7 @@
 ****************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/tms34010/tms34010.h"
 #include "cpu/m6502/m6502.h"
 #include "sound/dac.h"
diff --git a/src/mame/drivers/exzisus.c b/src/mame/drivers/exzisus.c
index bb15ab45b6a..de6d439a3a8 100644
--- a/src/mame/drivers/exzisus.c
+++ b/src/mame/drivers/exzisus.c
@@ -28,6 +28,7 @@ TODO:
 ****************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "taitoipt.h"
 #include "audio/taitosnd.h"
 #include "sound/2151intf.h"
diff --git a/src/mame/drivers/f1gp.c b/src/mame/drivers/f1gp.c
index 7fd853f1fa3..8eb98847ebf 100644
--- a/src/mame/drivers/f1gp.c
+++ b/src/mame/drivers/f1gp.c
@@ -20,6 +20,7 @@ f1gp2:
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "video/konamiic.h"
 #include "f1gp.h"
 #include "sound/2610intf.h"
diff --git a/src/mame/drivers/fantland.c b/src/mame/drivers/fantland.c
index 677a91478f5..a5ef8c31c6c 100644
--- a/src/mame/drivers/fantland.c
+++ b/src/mame/drivers/fantland.c
@@ -38,6 +38,7 @@ Year + Game             Main CPU    Sound CPU    Sound            Video
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "sound/2151intf.h"
 #include "sound/dac.h"
 #include "sound/msm5205.h"
diff --git a/src/mame/drivers/fgoal.c b/src/mame/drivers/fgoal.c
index 40907c0e1cf..62cd1de93e5 100644
--- a/src/mame/drivers/fgoal.c
+++ b/src/mame/drivers/fgoal.c
@@ -17,6 +17,7 @@ Differences between these sets include
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "includes/fgoal.h"
 
 UINT8* fgoal_video_ram;
diff --git a/src/mame/drivers/filetto.c b/src/mame/drivers/filetto.c
index 79a6acb7e52..2a6c46e3e8c 100644
--- a/src/mame/drivers/filetto.c
+++ b/src/mame/drivers/filetto.c
@@ -62,6 +62,7 @@ AH
 ******************************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "video/generic.h"
 #include "machine/pit8253.h"
 #include "machine/8255ppi.h"
diff --git a/src/mame/drivers/finalizr.c b/src/mame/drivers/finalizr.c
index f5f4c6a97ce..6cff3d9c6a1 100644
--- a/src/mame/drivers/finalizr.c
+++ b/src/mame/drivers/finalizr.c
@@ -7,6 +7,7 @@ driver by Nicola Salmoria
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/m6809/m6809.h"
 #include "cpu/i8039/i8039.h"
 #include "sound/sn76496.h"
diff --git a/src/mame/drivers/findout.c b/src/mame/drivers/findout.c
index 6251cc2b5a3..b98891c86fa 100644
--- a/src/mame/drivers/findout.c
+++ b/src/mame/drivers/findout.c
@@ -62,7 +62,6 @@ static WRITE8_HANDLER( findout_bitmap_w )
 static READ8_HANDLER( portC_r )
 {
 	return 4;
-//  return (mame_rand(Machine)&2);
 }
 
 static READ8_HANDLER( port1_r )
diff --git a/src/mame/drivers/firebeat.c b/src/mame/drivers/firebeat.c
index 883ea7c5d8d..81f557d5b24 100644
--- a/src/mame/drivers/firebeat.c
+++ b/src/mame/drivers/firebeat.c
@@ -109,6 +109,7 @@
 */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/powerpc/ppc.h"
 #include "machine/intelfsh.h"
 #include "machine/scsicd.h"
diff --git a/src/mame/drivers/firetrap.c b/src/mame/drivers/firetrap.c
index c458d56ffff..76ad96f7d19 100644
--- a/src/mame/drivers/firetrap.c
+++ b/src/mame/drivers/firetrap.c
@@ -57,6 +57,7 @@ write:
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/m6502/m6502.h"
 #include "sound/3812intf.h"
 #include "sound/msm5205.h"
diff --git a/src/mame/drivers/fitfight.c b/src/mame/drivers/fitfight.c
index 7bf867edd95..f5fb683f1d0 100644
--- a/src/mame/drivers/fitfight.c
+++ b/src/mame/drivers/fitfight.c
@@ -82,6 +82,7 @@ Stephh's notes :
 */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/upd7810/upd7810.h"
 #include "sound/okim6295.h"
 
diff --git a/src/mame/drivers/flkatck.c b/src/mame/drivers/flkatck.c
index 98210ebf327..a941e54307f 100644
--- a/src/mame/drivers/flkatck.c
+++ b/src/mame/drivers/flkatck.c
@@ -11,6 +11,7 @@ TO DO:
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/z80/z80.h"
 #include "cpu/hd6309/hd6309.h"
 #include "sound/2151intf.h"
diff --git a/src/mame/drivers/flower.c b/src/mame/drivers/flower.c
index 3ce1f5f0110..8b50694471c 100644
--- a/src/mame/drivers/flower.c
+++ b/src/mame/drivers/flower.c
@@ -33,6 +33,7 @@ CHIP #  POSITION   TYPE
 */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "sound/custom.h"
 
 extern UINT8 *flower_textram, *flower_bg0ram, *flower_bg1ram, *flower_bg0_scroll, *flower_bg1_scroll;
diff --git a/src/mame/drivers/flstory.c b/src/mame/drivers/flstory.c
index 6e5e30fc178..7860bc22eee 100644
--- a/src/mame/drivers/flstory.c
+++ b/src/mame/drivers/flstory.c
@@ -12,8 +12,8 @@ TODO:
 
 ***************************************************************************/
 
-#include <math.h>
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/z80/z80.h"
 #include "cpu/m6805/m6805.h"
 #include "sound/ay8910.h"
diff --git a/src/mame/drivers/fortecar.c b/src/mame/drivers/fortecar.c
index 336a37afe5e..4ec4c00a55d 100644
--- a/src/mame/drivers/fortecar.c
+++ b/src/mame/drivers/fortecar.c
@@ -19,6 +19,7 @@ dip 1X8
 
 
 #include "driver.h"
+#include "deprecat.h"
 
 static UINT8 *fortecar_ram;
 
diff --git a/src/mame/drivers/fromanc2.c b/src/mame/drivers/fromanc2.c
index e9e35ab13af..8dd8a732f75 100644
--- a/src/mame/drivers/fromanc2.c
+++ b/src/mame/drivers/fromanc2.c
@@ -22,6 +22,7 @@ Memo:
 ******************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/m68000/m68000.h"
 #include "cpu/z80/z80.h"
 #include "machine/eeprom.h"
diff --git a/src/mame/drivers/fromance.c b/src/mame/drivers/fromance.c
index 867119f50c4..e1f90f33ab6 100644
--- a/src/mame/drivers/fromance.c
+++ b/src/mame/drivers/fromance.c
@@ -40,6 +40,7 @@ Memo:
 ******************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/z80/z80.h"
 #include "fromance.h"
 #include "sound/ay8910.h"
diff --git a/src/mame/drivers/funkyjet.c b/src/mame/drivers/funkyjet.c
index 62c50e86f58..c136bc24b7a 100644
--- a/src/mame/drivers/funkyjet.c
+++ b/src/mame/drivers/funkyjet.c
@@ -88,6 +88,7 @@ Notes:
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/h6280/h6280.h"
 #include "sound/2151intf.h"
 #include "sound/okim6295.h"
diff --git a/src/mame/drivers/funybubl.c b/src/mame/drivers/funybubl.c
index 8921b615034..a47de31ac03 100644
--- a/src/mame/drivers/funybubl.c
+++ b/src/mame/drivers/funybubl.c
@@ -49,6 +49,7 @@ Note: SW2, SW3 & SW4 not populated
 
 
 #include "driver.h"
+#include "deprecat.h"
 #include "sound/okim6295.h"
 
 /* video/funybubl.c */
diff --git a/src/mame/drivers/fuukifg2.c b/src/mame/drivers/fuukifg2.c
index 946b7dce84d..65f14cf0a89 100644
--- a/src/mame/drivers/fuukifg2.c
+++ b/src/mame/drivers/fuukifg2.c
@@ -33,6 +33,7 @@ To Do:
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "sound/2203intf.h"
 #include "sound/3812intf.h"
 #include "sound/okim6295.h"
diff --git a/src/mame/drivers/fuukifg3.c b/src/mame/drivers/fuukifg3.c
index 808a84cc35b..0e5e931896c 100644
--- a/src/mame/drivers/fuukifg3.c
+++ b/src/mame/drivers/fuukifg3.c
@@ -149,6 +149,7 @@ FG-3J ROM-J 507KA0301P04       Rev:1.3
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "sound/262intf.h"
 #include "sound/ymf278b.h"
 
diff --git a/src/mame/drivers/gaelco.c b/src/mame/drivers/gaelco.c
index 58b6782a602..97890639cfa 100644
--- a/src/mame/drivers/gaelco.c
+++ b/src/mame/drivers/gaelco.c
@@ -7,6 +7,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/m6809/m6809.h"
 #include "cpu/m68000/m68000.h"
 #include "sound/okim6295.h"
diff --git a/src/mame/drivers/gaelco3d.c b/src/mame/drivers/gaelco3d.c
index 495db4d0cbc..4192d4e4019 100644
--- a/src/mame/drivers/gaelco3d.c
+++ b/src/mame/drivers/gaelco3d.c
@@ -143,6 +143,7 @@ REF. 970429
 **************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "gaelco3d.h"
 #include "cpu/tms32031/tms32031.h"
 #include "cpu/adsp2100/adsp2100.h"
diff --git a/src/mame/drivers/gaiden.c b/src/mame/drivers/gaiden.c
index 20bcb825355..efc7a18cc9e 100644
--- a/src/mame/drivers/gaiden.c
+++ b/src/mame/drivers/gaiden.c
@@ -125,6 +125,7 @@ Notes:
 
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/m68000/m68000.h"
 #include "cpu/z80/z80.h"
 #include "sound/2203intf.h"
diff --git a/src/mame/drivers/galaga.c b/src/mame/drivers/galaga.c
index 6ff43ed5b84..b1d20d78a68 100644
--- a/src/mame/drivers/galaga.c
+++ b/src/mame/drivers/galaga.c
@@ -697,6 +697,7 @@ TODO:
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "machine/atari_vg.h"
 #include "machine/namcoio.h"
 #include "machine/namco50.h"
diff --git a/src/mame/drivers/galaxian.c b/src/mame/drivers/galaxian.c
index 4d35d0e7aa6..2cc132b80e1 100644
--- a/src/mame/drivers/galaxian.c
+++ b/src/mame/drivers/galaxian.c
@@ -355,6 +355,7 @@ TO DO :
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/z80/z80.h"
 #include "cpu/s2650/s2650.h"
 #include "galaxian.h"
diff --git a/src/mame/drivers/galivan.c b/src/mame/drivers/galivan.c
index e8098fcc465..ca3ea2b89ef 100644
--- a/src/mame/drivers/galivan.c
+++ b/src/mame/drivers/galivan.c
@@ -28,6 +28,7 @@ Driver by Takahiro Nogi (nogi@kt.rim.or.jp) 1999/12/17 -
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "sound/dac.h"
 #include "sound/3812intf.h"
 
diff --git a/src/mame/drivers/galpanic.c b/src/mame/drivers/galpanic.c
index d62ef9d6b4a..40ce1170618 100644
--- a/src/mame/drivers/galpanic.c
+++ b/src/mame/drivers/galpanic.c
@@ -118,6 +118,7 @@ The current set of Super Model is an example of type C
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "includes/kaneko16.h"
 #include "sound/okim6295.h"
 #include "video/kan_pand.h"
diff --git a/src/mame/drivers/galspnbl.c b/src/mame/drivers/galspnbl.c
index ded35eb39e9..92ff4d35f52 100644
--- a/src/mame/drivers/galspnbl.c
+++ b/src/mame/drivers/galspnbl.c
@@ -19,6 +19,7 @@ TODO:
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/z80/z80.h"
 #include "sound/okim6295.h"
 #include "sound/3812intf.h"
diff --git a/src/mame/drivers/gamecstl.c b/src/mame/drivers/gamecstl.c
index 013a78c96c7..1b16acf14c8 100644
--- a/src/mame/drivers/gamecstl.c
+++ b/src/mame/drivers/gamecstl.c
@@ -40,6 +40,7 @@
 
 #include "driver.h"
 #include "memconv.h"
+#include "deprecat.h"
 #include "machine/8237dma.h"
 #include "machine/pic8259.h"
 #include "machine/pit8253.h"
diff --git a/src/mame/drivers/gameplan.c b/src/mame/drivers/gameplan.c
index 1167b060c15..9b083dce823 100644
--- a/src/mame/drivers/gameplan.c
+++ b/src/mame/drivers/gameplan.c
@@ -64,6 +64,7 @@ TODO:
 ****************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "machine/6532riot.h"
 #include "machine/6522via.h"
 #include "sound/ay8910.h"
diff --git a/src/mame/drivers/gaplus.c b/src/mame/drivers/gaplus.c
index 17cb81955e2..63b33f7ebf7 100644
--- a/src/mame/drivers/gaplus.c
+++ b/src/mame/drivers/gaplus.c
@@ -150,6 +150,7 @@ TODO:
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "machine/namcoio.h"
 #include "sound/namco.h"
 #include "sound/samples.h"
diff --git a/src/mame/drivers/gauntlet.c b/src/mame/drivers/gauntlet.c
index 113f33f8504..375a40171d1 100644
--- a/src/mame/drivers/gauntlet.c
+++ b/src/mame/drivers/gauntlet.c
@@ -119,6 +119,7 @@
 
 
 #include "driver.h"
+#include "deprecat.h"
 #include "machine/atarigen.h"
 #include "sound/5220intf.h"
 #include "sound/2151intf.h"
diff --git a/src/mame/drivers/gbusters.c b/src/mame/drivers/gbusters.c
index deb2838f9f0..259379c87e1 100644
--- a/src/mame/drivers/gbusters.c
+++ b/src/mame/drivers/gbusters.c
@@ -8,6 +8,7 @@ Preliminary driver by:
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/konami/konami.h" /* for the callback and the firq irq definition */
 #include "video/konamiic.h"
 #include "sound/2151intf.h"
diff --git a/src/mame/drivers/genesis.c b/src/mame/drivers/genesis.c
index 68856912a45..5635e225b40 100644
--- a/src/mame/drivers/genesis.c
+++ b/src/mame/drivers/genesis.c
@@ -12,6 +12,7 @@ segac2.c
 */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "genesis.h"
 
 #define MASTER_CLOCK		53693100
diff --git a/src/mame/drivers/gijoe.c b/src/mame/drivers/gijoe.c
index 4582b167b3e..0022b654876 100644
--- a/src/mame/drivers/gijoe.c
+++ b/src/mame/drivers/gijoe.c
@@ -37,6 +37,7 @@ Known Issues
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "video/konamiic.h"
 #include "cpu/z80/z80.h"
 #include "machine/eeprom.h"
diff --git a/src/mame/drivers/ginganin.c b/src/mame/drivers/ginganin.c
index 3b3fee8bada..9590402082a 100644
--- a/src/mame/drivers/ginganin.c
+++ b/src/mame/drivers/ginganin.c
@@ -49,6 +49,7 @@ f5d6    print 7 digit BCD number: d0.l to (a1)+ color $3000
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "sound/ay8910.h"
 #include "sound/3812intf.h"
 
diff --git a/src/mame/drivers/gladiatr.c b/src/mame/drivers/gladiatr.c
index c2134919d2f..e5e9c094bb5 100644
--- a/src/mame/drivers/gladiatr.c
+++ b/src/mame/drivers/gladiatr.c
@@ -182,6 +182,7 @@ TODO:
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "machine/tait8741.h"
 #include "cpu/z80/z80.h"
 #include "sound/2203intf.h"
diff --git a/src/mame/drivers/glass.c b/src/mame/drivers/glass.c
index 2dd28dc34b7..79f9f3a4801 100644
--- a/src/mame/drivers/glass.c
+++ b/src/mame/drivers/glass.c
@@ -9,6 +9,7 @@ The DS5002FP has up to 128KB undumped gameplay code making the game unplayable :
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/m68000/m68000.h"
 #include "sound/okim6295.h"
 
diff --git a/src/mame/drivers/goal92.c b/src/mame/drivers/goal92.c
index 7e1a72e8b5d..5913abe7d44 100644
--- a/src/mame/drivers/goal92.c
+++ b/src/mame/drivers/goal92.c
@@ -8,6 +8,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "sound/2203intf.h"
 #include "sound/okim6295.h"
 #include "sound/msm5205.h"
diff --git a/src/mame/drivers/gotcha.c b/src/mame/drivers/gotcha.c
index 0d020e42ea9..168efc49b6f 100644
--- a/src/mame/drivers/gotcha.c
+++ b/src/mame/drivers/gotcha.c
@@ -58,6 +58,7 @@ Notes:
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "sound/2151intf.h"
 #include "sound/okim6295.h"
 
diff --git a/src/mame/drivers/gpworld.c b/src/mame/drivers/gpworld.c
index e7693fda08c..0c5cdf8ef65 100644
--- a/src/mame/drivers/gpworld.c
+++ b/src/mame/drivers/gpworld.c
@@ -40,7 +40,7 @@ Dumping Notes:
 
 
 #include "driver.h"
-#include "render.h"
+#include "deprecat.h"
 #include "machine/laserdsc.h"
 
 /* Assumed to be the same as segald hardware */
diff --git a/src/mame/drivers/gradius3.c b/src/mame/drivers/gradius3.c
index f8f1a5be6fd..3b4bb8e1b9b 100644
--- a/src/mame/drivers/gradius3.c
+++ b/src/mame/drivers/gradius3.c
@@ -16,6 +16,7 @@ konamiic.c. They don't seem to be used by this game.
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "video/konamiic.h"
 #include "cpu/m68000/m68000.h"
 #include "cpu/z80/z80.h"
diff --git a/src/mame/drivers/grchamp.c b/src/mame/drivers/grchamp.c
index 98192f33e69..06b352af190 100644
--- a/src/mame/drivers/grchamp.c
+++ b/src/mame/drivers/grchamp.c
@@ -42,6 +42,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/z80/z80.h"
 #include "sound/ay8910.h"
 #include "grchamp.h"
diff --git a/src/mame/drivers/groundfx.c b/src/mame/drivers/groundfx.c
index fc397a47a2c..108b939c2f3 100644
--- a/src/mame/drivers/groundfx.c
+++ b/src/mame/drivers/groundfx.c
@@ -63,6 +63,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/m68000/m68000.h"
 #include "video/taitoic.h"
 #include "machine/eeprom.h"
diff --git a/src/mame/drivers/gstream.c b/src/mame/drivers/gstream.c
index cf95d635bd2..c98dc751178 100644
--- a/src/mame/drivers/gstream.c
+++ b/src/mame/drivers/gstream.c
@@ -95,6 +95,7 @@
 *********************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "sound/okim6295.h"
 
 static UINT32 *gstream_vram;
diff --git a/src/mame/drivers/gstriker.c b/src/mame/drivers/gstriker.c
index b4ad1920d77..cdaaa0fea5c 100644
--- a/src/mame/drivers/gstriker.c
+++ b/src/mame/drivers/gstriker.c
@@ -33,6 +33,7 @@ Merge with other Video System games ?
 ******************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "gstriker.h"
 #include "sound/2610intf.h"
 
diff --git a/src/mame/drivers/gsword.c b/src/mame/drivers/gsword.c
index f327aaa17a0..6422cbe4119 100644
--- a/src/mame/drivers/gsword.c
+++ b/src/mame/drivers/gsword.c
@@ -142,6 +142,7 @@ reg: 0->1 (main->2nd) /     : (1->0) 2nd->main :
 ******************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/z80/z80.h"
 #include "machine/tait8741.h"
 #include "sound/ay8910.h"
diff --git a/src/mame/drivers/gticlub.c b/src/mame/drivers/gticlub.c
index 1970e744e95..1e94642b0ef 100644
--- a/src/mame/drivers/gticlub.c
+++ b/src/mame/drivers/gticlub.c
@@ -35,6 +35,7 @@
 */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "machine/eeprom.h"
 #include "cpu/powerpc/ppc.h"
 #include "cpu/sharc/sharc.h"
diff --git a/src/mame/drivers/gtipoker.c b/src/mame/drivers/gtipoker.c
index 1436ec4bdec..0e5db9596a6 100644
--- a/src/mame/drivers/gtipoker.c
+++ b/src/mame/drivers/gtipoker.c
@@ -2,6 +2,7 @@
 /* Nothing else is known about this set / game */
 
 #include "driver.h"
+#include "deprecat.h"
 
 static VIDEO_START(gtipoker)
 {
diff --git a/src/mame/drivers/gunbustr.c b/src/mame/drivers/gunbustr.c
index d7048ee554f..20d3db16cfe 100644
--- a/src/mame/drivers/gunbustr.c
+++ b/src/mame/drivers/gunbustr.c
@@ -45,6 +45,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/m68000/m68000.h"
 #include "video/taitoic.h"
 #include "audio/taitosnd.h"
diff --git a/src/mame/drivers/gunpey.c b/src/mame/drivers/gunpey.c
index 4f7320d1e43..418fbc8c952 100644
--- a/src/mame/drivers/gunpey.c
+++ b/src/mame/drivers/gunpey.c
@@ -46,6 +46,7 @@ Notes:
 */
 
 #include "driver.h"
+#include "deprecat.h"
 
 static UINT16 *unkram;
 static UINT16 *mainram;
diff --git a/src/mame/drivers/hal21.c b/src/mame/drivers/hal21.c
index cc85377fca8..c677501b7c8 100644
--- a/src/mame/drivers/hal21.c
+++ b/src/mame/drivers/hal21.c
@@ -53,6 +53,7 @@ AT08XX03:
 */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/z80/z80.h"
 #include "snk.h"
 #include "sound/ay8910.h"
diff --git a/src/mame/drivers/halleys.c b/src/mame/drivers/halleys.c
index aaab40d5ab1..023782a4c14 100644
--- a/src/mame/drivers/halleys.c
+++ b/src/mame/drivers/halleys.c
@@ -158,6 +158,7 @@ Video sync   6 F   Video sync                 Post   6 F   Post
 // Compiler Directives
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/m6809/m6809.h"
 #include "sound/ay8910.h"
 
diff --git a/src/mame/drivers/hcastle.c b/src/mame/drivers/hcastle.c
index 85a9013b56b..709103f7c54 100644
--- a/src/mame/drivers/hcastle.c
+++ b/src/mame/drivers/hcastle.c
@@ -7,6 +7,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/konami/konami.h"
 #include "cpu/z80/z80.h"
 #include "sound/3812intf.h"
diff --git a/src/mame/drivers/hitme.c b/src/mame/drivers/hitme.c
index 4b3d442e93e..99129777bf3 100644
--- a/src/mame/drivers/hitme.c
+++ b/src/mame/drivers/hitme.c
@@ -15,6 +15,7 @@
 */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "hitme.h"
 #include "sound/discrete.h"
 
diff --git a/src/mame/drivers/hng64.c b/src/mame/drivers/hng64.c
index abb65d9e9cf..aac0451c461 100644
--- a/src/mame/drivers/hng64.c
+++ b/src/mame/drivers/hng64.c
@@ -458,6 +458,7 @@ or Fatal Fury for example).
 
 #define MASTER_CLOCK	50000000
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/mips/mips3.h"
 
 static UINT32 *rombase;
diff --git a/src/mame/drivers/homedata.c b/src/mame/drivers/homedata.c
index ae16f8f7dd4..10238feb950 100644
--- a/src/mame/drivers/homedata.c
+++ b/src/mame/drivers/homedata.c
@@ -217,6 +217,7 @@ Custom: GX61A01
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/m6809/m6809.h"
 #include "cpu/upd7810/upd7810.h"
 #include "homedata.h"
diff --git a/src/mame/drivers/hornet.c b/src/mame/drivers/hornet.c
index 98cb6b016c5..35803595738 100644
--- a/src/mame/drivers/hornet.c
+++ b/src/mame/drivers/hornet.c
@@ -212,6 +212,7 @@
 */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/powerpc/ppc.h"
 #include "cpu/sharc/sharc.h"
 #include "machine/konppc.h"
diff --git a/src/mame/drivers/hotblock.c b/src/mame/drivers/hotblock.c
index aceb7ab70bd..a7c77e65ec5 100644
--- a/src/mame/drivers/hotblock.c
+++ b/src/mame/drivers/hotblock.c
@@ -67,7 +67,7 @@ static READ8_HANDLER( hotblock_port4_r )
 {
 
 //  mame_printf_debug("port4_r\n");
-	return 0x00;//return mame_rand(Machine); // WHAT HERE?
+	return 0x00;
 }
 
 
diff --git a/src/mame/drivers/hshavoc.c b/src/mame/drivers/hshavoc.c
index 630f2990056..aa1da0ab7d7 100644
--- a/src/mame/drivers/hshavoc.c
+++ b/src/mame/drivers/hshavoc.c
@@ -35,6 +35,7 @@ Unfortunately it's read protected.
 
 
 #include "driver.h"
+#include "deprecat.h"
 #include "genesis.h"
 
 #define MASTER_CLOCK		53693100
diff --git a/src/mame/drivers/hyprduel.c b/src/mame/drivers/hyprduel.c
index d618c9c7c4a..f185c3498cf 100644
--- a/src/mame/drivers/hyprduel.c
+++ b/src/mame/drivers/hyprduel.c
@@ -27,6 +27,7 @@ fix comms so it boots, it's a bit of a hack for hyperduel at the moment ;-)
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "sound/2151intf.h"
 #include "sound/okim6295.h"
 #include "sound/2413intf.h"
diff --git a/src/mame/drivers/igs_blit.c b/src/mame/drivers/igs_blit.c
index d27bfd5c415..e55222fd588 100644
--- a/src/mame/drivers/igs_blit.c
+++ b/src/mame/drivers/igs_blit.c
@@ -35,6 +35,7 @@ To do:
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "sound/okim6295.h"
 #include "sound/2413intf.h"
 #include "sound/3812intf.h"
diff --git a/src/mame/drivers/imolagp.c b/src/mame/drivers/imolagp.c
index 8fecdcd30c3..96a37f81d49 100644
--- a/src/mame/drivers/imolagp.c
+++ b/src/mame/drivers/imolagp.c
@@ -74,6 +74,7 @@ Known issues:
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/z80/z80.h"
 #include "machine/8255ppi.h"
 #include "sound/ay8910.h"
diff --git a/src/mame/drivers/intrscti.c b/src/mame/drivers/intrscti.c
index 38cb31d343e..b7d28ad2da1 100644
--- a/src/mame/drivers/intrscti.c
+++ b/src/mame/drivers/intrscti.c
@@ -12,6 +12,7 @@ I've not had a chance to wire up the board yet, but it might be possible to writ
 */
 
 #include "driver.h"
+#include "deprecat.h"
 
 static READ8_HANDLER( unk_r )
 {
diff --git a/src/mame/drivers/inufuku.c b/src/mame/drivers/inufuku.c
index 8b15882ab22..9e99816937e 100644
--- a/src/mame/drivers/inufuku.c
+++ b/src/mame/drivers/inufuku.c
@@ -68,6 +68,7 @@ TODO:
 ******************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/m68000/m68000.h"
 #include "cpu/z80/z80.h"
 #include "machine/eeprom.h"
diff --git a/src/mame/drivers/iqblock.c b/src/mame/drivers/iqblock.c
index 8aaa83da5aa..7f46efbc60d 100644
--- a/src/mame/drivers/iqblock.c
+++ b/src/mame/drivers/iqblock.c
@@ -50,6 +50,7 @@ Grndtour:
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "machine/8255ppi.h"
 #include "iqblock.h"
 #include "sound/2413intf.h"
diff --git a/src/mame/drivers/irobot.c b/src/mame/drivers/irobot.c
index 40365e1dae5..fa6883fba45 100644
--- a/src/mame/drivers/irobot.c
+++ b/src/mame/drivers/irobot.c
@@ -75,6 +75,7 @@
 ****************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/m6809/m6809.h"
 #include "sound/pokey.h"
 #include "irobot.h"
diff --git a/src/mame/drivers/ironhors.c b/src/mame/drivers/ironhors.c
index e5bca2da36a..20cfeb052e9 100644
--- a/src/mame/drivers/ironhors.c
+++ b/src/mame/drivers/ironhors.c
@@ -7,6 +7,7 @@ driver by Mirko Buffoni
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/m6809/m6809.h"
 #include "sound/2203intf.h"
 #include "sound/flt_rc.h"
diff --git a/src/mame/drivers/istellar.c b/src/mame/drivers/istellar.c
index bdd89fec9e9..d63ca7f4ede 100644
--- a/src/mame/drivers/istellar.c
+++ b/src/mame/drivers/istellar.c
@@ -22,6 +22,7 @@ Todo:
 */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "render.h"
 #include "machine/laserdsc.h"
 
diff --git a/src/mame/drivers/itech32.c b/src/mame/drivers/itech32.c
index 36ea50e828b..629e3465935 100644
--- a/src/mame/drivers/itech32.c
+++ b/src/mame/drivers/itech32.c
@@ -211,6 +211,7 @@ Notes:
 ****************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/m6809/m6809.h"
 #include "cpu/m68000/m68000.h"
 #include "machine/6522via.h"
diff --git a/src/mame/drivers/itech8.c b/src/mame/drivers/itech8.c
index d09520c190f..f72c24cdb93 100644
--- a/src/mame/drivers/itech8.c
+++ b/src/mame/drivers/itech8.c
@@ -453,6 +453,7 @@
 
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/m6809/m6809.h"
 #include "machine/6821pia.h"
 #include "machine/6522via.h"
diff --git a/src/mame/drivers/jack.c b/src/mame/drivers/jack.c
index b8d27029946..317a24cd3b4 100644
--- a/src/mame/drivers/jack.c
+++ b/src/mame/drivers/jack.c
@@ -42,6 +42,7 @@ The 2 ay-8910 read ports are responsible for reading the sound commands.
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/z80/z80.h"
 #include "sound/ay8910.h"
 
diff --git a/src/mame/drivers/jackpool.c b/src/mame/drivers/jackpool.c
index dfaaf7fc8ae..e2152e988e8 100644
--- a/src/mame/drivers/jackpool.c
+++ b/src/mame/drivers/jackpool.c
@@ -75,7 +75,6 @@ static WRITE16_HANDLER( jackpool_layer2_videoram_w )
 
 static READ16_HANDLER( jackpool_io_r )
 {
-//  return mame_rand(Machine);
 	return 0xffff;
 }
 
diff --git a/src/mame/drivers/jchan.c b/src/mame/drivers/jchan.c
index 38a8023eebf..bde97f833f3 100644
--- a/src/mame/drivers/jchan.c
+++ b/src/mame/drivers/jchan.c
@@ -199,6 +199,7 @@ there are 9 PALS on the pcb (not dumped)
 */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "sound/ymz280b.h"
 
 extern UINT32* skns_spc_regs;
diff --git a/src/mame/drivers/jcross.c b/src/mame/drivers/jcross.c
index 39f75dd1816..b3f22f9dc77 100644
--- a/src/mame/drivers/jcross.c
+++ b/src/mame/drivers/jcross.c
@@ -17,6 +17,7 @@ Could be bad dump ('final' romset is made of two sets marked as 'bad' )
 */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/z80/z80.h"
 #include "snk.h"
 #include "sound/ay8910.h"
diff --git a/src/mame/drivers/jedi.c b/src/mame/drivers/jedi.c
index c5539f703fd..693ee013252 100644
--- a/src/mame/drivers/jedi.c
+++ b/src/mame/drivers/jedi.c
@@ -109,6 +109,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/m6502/m6502.h"
 #include "sound/5220intf.h"
 #include "sound/pokey.h"
diff --git a/src/mame/drivers/jpmimpct.c b/src/mame/drivers/jpmimpct.c
index 20405c8b339..89fc06d08b1 100644
--- a/src/mame/drivers/jpmimpct.c
+++ b/src/mame/drivers/jpmimpct.c
@@ -78,6 +78,7 @@
 ****************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/tms34010/tms34010.h"
 #include "cpu/tms34010/34010ops.h"
 #include "sound/upd7759.h"
diff --git a/src/mame/drivers/jrpacman.c b/src/mame/drivers/jrpacman.c
index 2c2cf96618d..b9aabda0bbd 100644
--- a/src/mame/drivers/jrpacman.c
+++ b/src/mame/drivers/jrpacman.c
@@ -99,6 +99,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "pacman.h"
 #include "sound/namco.h"
 
diff --git a/src/mame/drivers/junofrst.c b/src/mame/drivers/junofrst.c
index dd4aea6e2b1..664c8abe99a 100644
--- a/src/mame/drivers/junofrst.c
+++ b/src/mame/drivers/junofrst.c
@@ -78,6 +78,7 @@ Blitter source graphics
 
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/m6809/m6809.h"
 #include "cpu/i8039/i8039.h"
 #include "cpu/z80/z80.h"
diff --git a/src/mame/drivers/kaneko16.c b/src/mame/drivers/kaneko16.c
index e1aab1e9b40..8f4b0893f73 100644
--- a/src/mame/drivers/kaneko16.c
+++ b/src/mame/drivers/kaneko16.c
@@ -60,6 +60,7 @@ To Do:
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "machine/eeprom.h"
 #include "includes/kaneko16.h"
 #include "sound/2203intf.h"
diff --git a/src/mame/drivers/karnov.c b/src/mame/drivers/karnov.c
index 0908e4dc89e..23408a53605 100644
--- a/src/mame/drivers/karnov.c
+++ b/src/mame/drivers/karnov.c
@@ -38,6 +38,7 @@
 *******************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "sound/2203intf.h"
 #include "sound/3812intf.h"
 
diff --git a/src/mame/drivers/kchamp.c b/src/mame/drivers/kchamp.c
index 11e0ad26086..c0e98d324a5 100644
--- a/src/mame/drivers/kchamp.c
+++ b/src/mame/drivers/kchamp.c
@@ -62,6 +62,7 @@ IO ports and memory map changes. Dip switches differ too.
 
 ***************************************************************************/
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/z80/z80.h"
 #include "sound/ay8910.h"
 #include "sound/dac.h"
diff --git a/src/mame/drivers/kingobox.c b/src/mame/drivers/kingobox.c
index 811f09053bd..7e9e0503eca 100644
--- a/src/mame/drivers/kingobox.c
+++ b/src/mame/drivers/kingobox.c
@@ -16,6 +16,7 @@ Main CPU:
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "sound/ay8910.h"
 #include "sound/dac.h"
 
diff --git a/src/mame/drivers/kingpin.c b/src/mame/drivers/kingpin.c
index 9a70907c8af..780804bc90b 100644
--- a/src/mame/drivers/kingpin.c
+++ b/src/mame/drivers/kingpin.c
@@ -20,6 +20,7 @@ Todo:
 */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "video/tms9928a.h"
 #include "sound/ay8910.h"
 
diff --git a/src/mame/drivers/kinst.c b/src/mame/drivers/kinst.c
index 9a55b14d320..9b3e3c5deee 100644
--- a/src/mame/drivers/kinst.c
+++ b/src/mame/drivers/kinst.c
@@ -129,6 +129,7 @@ Notes:
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/mips/mips3.h"
 #include "cpu/adsp2100/adsp2100.h"
 #include "machine/idectrl.h"
diff --git a/src/mame/drivers/konamigq.c b/src/mame/drivers/konamigq.c
index 28e2edb6c28..bdbd1bd06fb 100644
--- a/src/mame/drivers/konamigq.c
+++ b/src/mame/drivers/konamigq.c
@@ -46,6 +46,7 @@
 */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/mips/psx.h"
 #include "includes/psx.h"
 #include "machine/konamigx.h"
diff --git a/src/mame/drivers/konamigx.c b/src/mame/drivers/konamigx.c
index ed051e5a8b9..7ef8adaea74 100644
--- a/src/mame/drivers/konamigx.c
+++ b/src/mame/drivers/konamigx.c
@@ -95,6 +95,7 @@
  */
 
 #include "driver.h"
+#include "deprecat.h"
 
 #include "video/konamiic.h"
 #include "cpu/m68000/m68000.h"
diff --git a/src/mame/drivers/konamim2.c b/src/mame/drivers/konamim2.c
index 210a1f3874d..fbfdd481a47 100644
--- a/src/mame/drivers/konamim2.c
+++ b/src/mame/drivers/konamim2.c
@@ -96,6 +96,7 @@ Notes:
 */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cdrom.h"
 #include "cpu/powerpc/ppc.h"
 
diff --git a/src/mame/drivers/kopunch.c b/src/mame/drivers/kopunch.c
index 09a01ab649a..2e84754d63c 100644
--- a/src/mame/drivers/kopunch.c
+++ b/src/mame/drivers/kopunch.c
@@ -1,4 +1,5 @@
 #include "driver.h"
+#include "deprecat.h"
 
 extern UINT8 *kopunch_videoram2;
 
diff --git a/src/mame/drivers/kyugo.c b/src/mame/drivers/kyugo.c
index d4d57462337..ac3500993d5 100644
--- a/src/mame/drivers/kyugo.c
+++ b/src/mame/drivers/kyugo.c
@@ -22,6 +22,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "kyugo.h"
 #include "sound/ay8910.h"
 
diff --git a/src/mame/drivers/ladyfrog.c b/src/mame/drivers/ladyfrog.c
index 07372013b5d..d8d000df35e 100644
--- a/src/mame/drivers/ladyfrog.c
+++ b/src/mame/drivers/ladyfrog.c
@@ -47,6 +47,7 @@ Notes:
 #define ladyfrog_scr_size 0
 
 #include "driver.h"
+#include "deprecat.h"
 #include "sound/ay8910.h"
 #include "sound/msm5232.h"
 
diff --git a/src/mame/drivers/laserbas.c b/src/mame/drivers/laserbas.c
index 3d64cf8525c..2e0844cb094 100644
--- a/src/mame/drivers/laserbas.c
+++ b/src/mame/drivers/laserbas.c
@@ -17,6 +17,7 @@
 ********************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 
 static UINT8 *vram1,*vram2;
 static int vrambank=0;
diff --git a/src/mame/drivers/laserbat.c b/src/mame/drivers/laserbat.c
index 63be39d450f..c985da43988 100644
--- a/src/mame/drivers/laserbat.c
+++ b/src/mame/drivers/laserbat.c
@@ -17,6 +17,7 @@ TODO:
 */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/s2650/s2650.h"
 #include "machine/6821pia.h"
 #include "video/s2636.h"
diff --git a/src/mame/drivers/lasso.c b/src/mame/drivers/lasso.c
index 87bbb6cfc87..c449cd70110 100644
--- a/src/mame/drivers/lasso.c
+++ b/src/mame/drivers/lasso.c
@@ -23,6 +23,7 @@ Notes:
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/z80/z80.h"
 #include "lasso.h"
 #include "sound/dac.h"
diff --git a/src/mame/drivers/lastduel.c b/src/mame/drivers/lastduel.c
index fc507c37843..b519bb57972 100644
--- a/src/mame/drivers/lastduel.c
+++ b/src/mame/drivers/lastduel.c
@@ -17,6 +17,7 @@ TODO:
 **************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "sound/2203intf.h"
 #include "sound/okim6295.h"
 
diff --git a/src/mame/drivers/lastfght.c b/src/mame/drivers/lastfght.c
index bd2d3d70f7d..2b6906d6398 100644
--- a/src/mame/drivers/lastfght.c
+++ b/src/mame/drivers/lastfght.c
@@ -63,6 +63,7 @@ Notes:
 *********************************************************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/h83002/h83002.h"
 
 /***************************************************************************
diff --git a/src/mame/drivers/legionna.c b/src/mame/drivers/legionna.c
index 05fea1bd8bb..5d04c26b09d 100644
--- a/src/mame/drivers/legionna.c
+++ b/src/mame/drivers/legionna.c
@@ -91,6 +91,7 @@ Preliminary COP MCU memory map
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/z80/z80.h"
 #include "audio/seibu.h"
 #include "sound/3812intf.h"
diff --git a/src/mame/drivers/lemmings.c b/src/mame/drivers/lemmings.c
index 53ac3975dde..95b92630574 100644
--- a/src/mame/drivers/lemmings.c
+++ b/src/mame/drivers/lemmings.c
@@ -16,6 +16,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "lemmings.h"
 #include "sound/2151intf.h"
 #include "sound/okim6295.h"
diff --git a/src/mame/drivers/lethal.c b/src/mame/drivers/lethal.c
index 894557d978e..de5f8a61552 100644
--- a/src/mame/drivers/lethal.c
+++ b/src/mame/drivers/lethal.c
@@ -165,6 +165,7 @@ maybe some priority issues / sprite placement issues..
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "video/konamiic.h"
 #include "cpu/m6809/m6809.h"
 #include "cpu/hd6309/hd6309.h"
diff --git a/src/mame/drivers/limenko.c b/src/mame/drivers/limenko.c
index f69ef431d28..d1d9410512c 100644
--- a/src/mame/drivers/limenko.c
+++ b/src/mame/drivers/limenko.c
@@ -24,6 +24,7 @@
 */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "sound/okim6295.h"
 #include "machine/eeprom.h"
 
diff --git a/src/mame/drivers/littlerb.c b/src/mame/drivers/littlerb.c
index e0e069ac604..9d79b5e8e31 100644
--- a/src/mame/drivers/littlerb.c
+++ b/src/mame/drivers/littlerb.c
@@ -59,6 +59,7 @@ Dip sw.2
 */
 
 #include "driver.h"
+#include "deprecat.h"
 
 static UINT16 littlerb_vdp_address_low;
 static UINT16 littlerb_vdp_address_high;
diff --git a/src/mame/drivers/lkage.c b/src/mame/drivers/lkage.c
index ccd5935f6c6..cc2b1e6c383 100644
--- a/src/mame/drivers/lkage.c
+++ b/src/mame/drivers/lkage.c
@@ -27,6 +27,7 @@ TODO:
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/z80/z80.h"
 #include "cpu/m6805/m6805.h"
 #include "sound/2203intf.h"
diff --git a/src/mame/drivers/lockon.c b/src/mame/drivers/lockon.c
index 9eb91f174a0..456d3879879 100644
--- a/src/mame/drivers/lockon.c
+++ b/src/mame/drivers/lockon.c
@@ -20,6 +20,7 @@ o Layer mixing
 =====================================================================*/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "sound/2203intf.h"
 
 static UINT16 *lockon_vram0;
diff --git a/src/mame/drivers/looping.c b/src/mame/drivers/looping.c
index 4fe70425ce2..95472246513 100644
--- a/src/mame/drivers/looping.c
+++ b/src/mame/drivers/looping.c
@@ -52,6 +52,7 @@ L056-6    9A          "      "      VLI-8-4 7A         "
 */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "sound/ay8910.h"
 #include "sound/dac.h"
 #include "sound/5220intf.h"
diff --git a/src/mame/drivers/lordgun.c b/src/mame/drivers/lordgun.c
index 40f359ad1a7..86f104101a7 100644
--- a/src/mame/drivers/lordgun.c
+++ b/src/mame/drivers/lordgun.c
@@ -26,6 +26,7 @@ To do:
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "machine/8255ppi.h"
 #include "machine/eeprom.h"
 #include "sound/3812intf.h"
diff --git a/src/mame/drivers/lsasquad.c b/src/mame/drivers/lsasquad.c
index 7127d8ee1d8..6597a977605 100644
--- a/src/mame/drivers/lsasquad.c
+++ b/src/mame/drivers/lsasquad.c
@@ -147,6 +147,7 @@ Notes:
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/m6805/m6805.h"
 #include "sound/ay8910.h"
 #include "sound/2203intf.h"
diff --git a/src/mame/drivers/m107.c b/src/mame/drivers/m107.c
index 6fb51f6a673..e0e6de5a295 100644
--- a/src/mame/drivers/m107.c
+++ b/src/mame/drivers/m107.c
@@ -14,6 +14,7 @@
 *******************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "m107.h"
 #include "machine/irem_cpu.h"
 #include "sound/2151intf.h"
diff --git a/src/mame/drivers/m92.c b/src/mame/drivers/m92.c
index b7d1ce72dea..b654f49fda2 100644
--- a/src/mame/drivers/m92.c
+++ b/src/mame/drivers/m92.c
@@ -189,6 +189,7 @@ Notes:
 *****************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "includes/m92.h"
 #include "drivers/m92.h"
 #include "machine/irem_cpu.h"
diff --git a/src/mame/drivers/macrossp.c b/src/mame/drivers/macrossp.c
index 67e1c8d63f0..d8f9b9e0e89 100644
--- a/src/mame/drivers/macrossp.c
+++ b/src/mame/drivers/macrossp.c
@@ -38,6 +38,7 @@ TODO:
 ******************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "sound/es5506.h"
 
 /*** README INFO **************************************************************
diff --git a/src/mame/drivers/madalien.c b/src/mame/drivers/madalien.c
index 28da60788f3..02ff86a258e 100644
--- a/src/mame/drivers/madalien.c
+++ b/src/mame/drivers/madalien.c
@@ -7,6 +7,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "video/crtc6845.h"
 #include "sound/ay8910.h"
 
diff --git a/src/mame/drivers/madmotor.c b/src/mame/drivers/madmotor.c
index 09bb914c285..be0590b7b48 100644
--- a/src/mame/drivers/madmotor.c
+++ b/src/mame/drivers/madmotor.c
@@ -13,6 +13,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/h6280/h6280.h"
 #include "sound/2203intf.h"
 #include "sound/2151intf.h"
diff --git a/src/mame/drivers/magic10.c b/src/mame/drivers/magic10.c
index 36983ae28e2..c908a25a619 100644
--- a/src/mame/drivers/magic10.c
+++ b/src/mame/drivers/magic10.c
@@ -18,6 +18,7 @@ Magic's 10 instruction for the 1st boot:
 */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "sound/okim6295.h"
 
 static tilemap *layer0_tilemap, *layer1_tilemap, *layer2_tilemap;
diff --git a/src/mame/drivers/magmax.c b/src/mame/drivers/magmax.c
index 2843a9ecabb..b8ceecf3989 100644
--- a/src/mame/drivers/magmax.c
+++ b/src/mame/drivers/magmax.c
@@ -9,6 +9,7 @@ Additional tweaking by Jarek Burczynski
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/m68000/m68000.h"
 #include "sound/ay8910.h"
 
diff --git a/src/mame/drivers/mainevt.c b/src/mame/drivers/mainevt.c
index 9840ee8fb65..ba6e7d80c0e 100644
--- a/src/mame/drivers/mainevt.c
+++ b/src/mame/drivers/mainevt.c
@@ -21,6 +21,7 @@ Notes:
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "video/konamiic.h"
 #include "cpu/m6809/m6809.h"
 #include "sound/2151intf.h"
diff --git a/src/mame/drivers/mainsnk.c b/src/mame/drivers/mainsnk.c
index 02ca38aaf6e..10eee96a15d 100644
--- a/src/mame/drivers/mainsnk.c
+++ b/src/mame/drivers/mainsnk.c
@@ -71,6 +71,7 @@ cc_p14.j2 8192 0xedc6a1eb M5L2764k
 */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "sound/ay8910.h"
 #include "sound/namco.h"
 
diff --git a/src/mame/drivers/mappy.c b/src/mame/drivers/mappy.c
index ed44d3b09e5..2390d253b81 100644
--- a/src/mame/drivers/mappy.c
+++ b/src/mame/drivers/mappy.c
@@ -547,6 +547,7 @@ TODO:
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "machine/namcoio.h"
 #include "sound/dac.h"
 #include "sound/namco.h"
diff --git a/src/mame/drivers/mario.c b/src/mame/drivers/mario.c
index 366e185165c..b3a08ff31fe 100644
--- a/src/mame/drivers/mario.c
+++ b/src/mame/drivers/mario.c
@@ -90,6 +90,7 @@ write:
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "machine/z80dma.h"
 
 #include "mario.h"
diff --git a/src/mame/drivers/marvins.c b/src/mame/drivers/marvins.c
index 9d8dabb81a1..acd7999a9a3 100644
--- a/src/mame/drivers/marvins.c
+++ b/src/mame/drivers/marvins.c
@@ -25,6 +25,7 @@ AT08XX03:
 */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/z80/z80.h"
 #include "snk.h"
 #include "sound/ay8910.h"
diff --git a/src/mame/drivers/mastboy.c b/src/mame/drivers/mastboy.c
index 23e91fa8b9b..5a31c524d5e 100644
--- a/src/mame/drivers/mastboy.c
+++ b/src/mame/drivers/mastboy.c
@@ -434,6 +434,7 @@
 */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "sound/saa1099.h"
 #include "sound/msm5205.h"
 
diff --git a/src/mame/drivers/matmania.c b/src/mame/drivers/matmania.c
index eacb6d8a25a..3031a7b1345 100644
--- a/src/mame/drivers/matmania.c
+++ b/src/mame/drivers/matmania.c
@@ -21,6 +21,7 @@ MAIN BOARD:
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/m6502/m6502.h"
 #include "cpu/m6809/m6809.h"
 #include "cpu/m6805/m6805.h"
diff --git a/src/mame/drivers/maxaflex.c b/src/mame/drivers/maxaflex.c
index 202e167c639..a15fe17e90c 100644
--- a/src/mame/drivers/maxaflex.c
+++ b/src/mame/drivers/maxaflex.c
@@ -13,6 +13,7 @@
 ******************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/m6502/m6502.h"
 #include "cpu/m6805/m6805.h"
 #include "includes/atari.h"
@@ -20,7 +21,6 @@
 #include "sound/pokey.h"
 #include "machine/6821pia.h"
 #include "video/gtia.h"
-#include "ui.h"
 
 #include "maxaflex.lh"
 
diff --git a/src/mame/drivers/mazerbla.c b/src/mame/drivers/mazerbla.c
index 770a54ab37b..6a85c37f54f 100644
--- a/src/mame/drivers/mazerbla.c
+++ b/src/mame/drivers/mazerbla.c
@@ -36,6 +36,7 @@ TO DO:
 ****************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "sound/ay8910.h"
 
 static UINT8 *cfb_ram;
diff --git a/src/mame/drivers/mcatadv.c b/src/mame/drivers/mcatadv.c
index 29784e73326..4ac1f99d36a 100644
--- a/src/mame/drivers/mcatadv.c
+++ b/src/mame/drivers/mcatadv.c
@@ -136,6 +136,7 @@ Stephh's notes (based on the games M68000 code and some tests) :
 ******************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "sound/2610intf.h"
 
 VIDEO_UPDATE( mcatadv );
diff --git a/src/mame/drivers/mcr3.c b/src/mame/drivers/mcr3.c
index a0834bad057..a42a4e67a46 100644
--- a/src/mame/drivers/mcr3.c
+++ b/src/mame/drivers/mcr3.c
@@ -83,6 +83,7 @@
 
 
 #include "driver.h"
+#include "deprecat.h"
 #include "machine/z80ctc.h"
 #include "audio/mcr.h"
 #include "mcr.h"
diff --git a/src/mame/drivers/mediagx.c b/src/mame/drivers/mediagx.c
index 055c316aaa9..a6ff3509edd 100644
--- a/src/mame/drivers/mediagx.c
+++ b/src/mame/drivers/mediagx.c
@@ -64,6 +64,7 @@
 */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "memconv.h"
 #include "machine/8237dma.h"
 #include "machine/pic8259.h"
diff --git a/src/mame/drivers/megadriv.c b/src/mame/drivers/megadriv.c
index 45df0396bcb..d91fcba7a5b 100644
--- a/src/mame/drivers/megadriv.c
+++ b/src/mame/drivers/megadriv.c
@@ -43,6 +43,7 @@ Known Non-Issues (confirmed on Real Genesis)
 */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "sound/sn76496.h"
 #include "sound/2612intf.h"
 #include "sound/upd7759.h"
diff --git a/src/mame/drivers/megaplay.c b/src/mame/drivers/megaplay.c
index 6e6b3cfd9f9..4f3b43335ad 100644
--- a/src/mame/drivers/megaplay.c
+++ b/src/mame/drivers/megaplay.c
@@ -40,6 +40,7 @@ Only a handful of games were released for this system.
 */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "genesis.h"
 #include "megadriv.h"
 
diff --git a/src/mame/drivers/megasys1.c b/src/mame/drivers/megasys1.c
index 2d8e1b9c692..d30a750d86b 100644
--- a/src/mame/drivers/megasys1.c
+++ b/src/mame/drivers/megasys1.c
@@ -119,6 +119,7 @@ RAM         RW      0f0000-0f3fff       0e0000-0effff?      <
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "megasys1.h"
 #include "sound/2203intf.h"
 #include "sound/2151intf.h"
diff --git a/src/mame/drivers/megatech.c b/src/mame/drivers/megatech.c
index 8a104b98659..be0df59da08 100644
--- a/src/mame/drivers/megatech.c
+++ b/src/mame/drivers/megatech.c
@@ -78,6 +78,7 @@ Sonic Hedgehog 2        171-6215A   837-6963-62       610-0239-62          MPR-1
 
 */
 #include "driver.h"
+#include "deprecat.h"
 #include "genesis.h"
 #include "rendlay.h"
 #include "megadriv.h"
@@ -306,12 +307,12 @@ static WRITE8_HANDLER( mt_sms_standard_rom_bank_w )
 #ifdef UNUSED_FUNCTION
 READ8_HANDLER( md_sms_ioport_dc_r )
 {
-	return 0xff;//mame_rand(Machine);
+	return 0xff;
 }
 
 READ8_HANDLER( md_sms_ioport_dd_r )
 {
-	return 0xff;//mame_rand(Machine);
+	return 0xff;
 }
 #endif
 
diff --git a/src/mame/drivers/megazone.c b/src/mame/drivers/megazone.c
index fdbed26214f..fe8f61f5b6e 100644
--- a/src/mame/drivers/megazone.c
+++ b/src/mame/drivers/megazone.c
@@ -7,6 +7,7 @@ To enter service mode, keep 1&2 pressed on reset
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/m6809/m6809.h"
 #include "cpu/i8039/i8039.h"
 #include "cpu/z80/z80.h"
diff --git a/src/mame/drivers/merit.c b/src/mame/drivers/merit.c
index 33bbc336f8d..f497b1a92cb 100644
--- a/src/mame/drivers/merit.c
+++ b/src/mame/drivers/merit.c
@@ -31,6 +31,7 @@ Notes: it's important that REGION_USER1 is 0xa0000 bytes with empty space filled
 */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "machine/8255ppi.h"
 #include "sound/ay8910.h"
 
diff --git a/src/mame/drivers/metlclsh.c b/src/mame/drivers/metlclsh.c
index 5f3dc9db10a..c64b08103b8 100644
--- a/src/mame/drivers/metlclsh.c
+++ b/src/mame/drivers/metlclsh.c
@@ -32,6 +32,7 @@ metlclsh:
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/m6809/m6809.h"
 #include "sound/2203intf.h"
 #include "sound/3812intf.h"
diff --git a/src/mame/drivers/metro.c b/src/mame/drivers/metro.c
index 713e0051a68..46fe729b1dc 100644
--- a/src/mame/drivers/metro.c
+++ b/src/mame/drivers/metro.c
@@ -80,6 +80,7 @@ driver modified by Eisuke Watanabe
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "video/konamiic.h"
 #include "cpu/upd7810/upd7810.h"
 #include "machine/eeprom.h"
diff --git a/src/mame/drivers/mgolf.c b/src/mame/drivers/mgolf.c
index 6a95df3f6ba..5f5663cc076 100644
--- a/src/mame/drivers/mgolf.c
+++ b/src/mame/drivers/mgolf.c
@@ -5,6 +5,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 
 static UINT8* mgolf_video_ram;
 
diff --git a/src/mame/drivers/micro3d.c b/src/mame/drivers/micro3d.c
index abf42a2c518..95321d071d1 100644
--- a/src/mame/drivers/micro3d.c
+++ b/src/mame/drivers/micro3d.c
@@ -22,7 +22,7 @@
 /*====================================================================*/
 
 #include "driver.h"
-//#include "machine/ds1215.h"
+#include "deprecat.h"
 #include "cpu/tms34010/tms34010.h"
 #include "cpu/tms34010/34010ops.h"
 #include "cpu/i8051/i8051.h"
diff --git a/src/mame/drivers/midvunit.c b/src/mame/drivers/midvunit.c
index 066e9d8bd11..dde086020da 100644
--- a/src/mame/drivers/midvunit.c
+++ b/src/mame/drivers/midvunit.c
@@ -19,6 +19,7 @@
 **************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/tms32031/tms32031.h"
 #include "cpu/adsp2100/adsp2100.h"
 #include "audio/dcs.h"
diff --git a/src/mame/drivers/midzeus.c b/src/mame/drivers/midzeus.c
index 6674318a269..b86f67bea1e 100644
--- a/src/mame/drivers/midzeus.c
+++ b/src/mame/drivers/midzeus.c
@@ -25,7 +25,7 @@ The Grid         v1.2   10/18/2000
 **************************************************************************/
 
 #include "driver.h"
-#include "debugger.h"
+#include "deprecat.h"
 #include "cpu/tms34010/tms34010.h"
 #include "cpu/adsp2100/adsp2100.h"
 #include "includes/midzeus.h"
diff --git a/src/mame/drivers/mikie.c b/src/mame/drivers/mikie.c
index 81f48a1a234..47c6129605c 100644
--- a/src/mame/drivers/mikie.c
+++ b/src/mame/drivers/mikie.c
@@ -17,6 +17,7 @@ MAIN BOARD:
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/m6809/m6809.h"
 #include "sound/sn76496.h"
 
diff --git a/src/mame/drivers/miniboy7.c b/src/mame/drivers/miniboy7.c
index 800e0be48bc..11d3326b449 100644
--- a/src/mame/drivers/miniboy7.c
+++ b/src/mame/drivers/miniboy7.c
@@ -125,7 +125,6 @@
 
 #include "driver.h"
 #include "video/crtc6845.h"
-//#include "machine/6821pia.h"
 
 
 /*************************
diff --git a/src/mame/drivers/mirage.c b/src/mame/drivers/mirage.c
index 29b0ad541e8..9d0ff48e761 100644
--- a/src/mame/drivers/mirage.c
+++ b/src/mame/drivers/mirage.c
@@ -31,6 +31,7 @@ MR_01-.3A    [a0b758aa]
 */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "decocrpt.h"
 #include "decoprot.h"
 #include "deco16ic.h"
diff --git a/src/mame/drivers/missb2.c b/src/mame/drivers/missb2.c
index 77a3a1ee863..ce623803bbe 100644
--- a/src/mame/drivers/missb2.c
+++ b/src/mame/drivers/missb2.c
@@ -14,6 +14,7 @@ OKI M6295 sound ROM dump is bad.
 */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "sound/okim6295.h"
 #include "sound/3812intf.h"
 
diff --git a/src/mame/drivers/missile.c b/src/mame/drivers/missile.c
index 8964510cd99..2a4989c24df 100644
--- a/src/mame/drivers/missile.c
+++ b/src/mame/drivers/missile.c
@@ -239,6 +239,7 @@
 ******************************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "sound/pokey.h"
 
 
diff --git a/src/mame/drivers/mitchell.c b/src/mame/drivers/mitchell.c
index d723014fd7a..4f2644ff23d 100644
--- a/src/mame/drivers/mitchell.c
+++ b/src/mame/drivers/mitchell.c
@@ -78,6 +78,7 @@ mw-9.rom = ST M27C1001 / GFX
 
 
 #include "driver.h"
+#include "deprecat.h"
 #include "machine/eeprom.h"
 #include "sound/okim6295.h"
 #include "sound/3812intf.h"
diff --git a/src/mame/drivers/mlanding.c b/src/mame/drivers/mlanding.c
index f093b34a595..7f517f66890 100644
--- a/src/mame/drivers/mlanding.c
+++ b/src/mame/drivers/mlanding.c
@@ -4,6 +4,7 @@
 */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "audio/taitosnd.h"
 #include "sound/2151intf.h"
 #include "sound/msm5205.h"
diff --git a/src/mame/drivers/model1.c b/src/mame/drivers/model1.c
index 4e5cd9f7867..8c566e4f955 100644
--- a/src/mame/drivers/model1.c
+++ b/src/mame/drivers/model1.c
@@ -625,6 +625,7 @@ Notes:
 */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "machine/eeprom.h"
 #include "system16.h"
 #include "video/segaic24.h"
diff --git a/src/mame/drivers/model2.c b/src/mame/drivers/model2.c
index 718bb980b4c..0006e381974 100644
--- a/src/mame/drivers/model2.c
+++ b/src/mame/drivers/model2.c
@@ -49,6 +49,7 @@
 */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "machine/eeprom.h"
 #include "video/segaic24.h"
 #include "cpu/i960/i960.h"
diff --git a/src/mame/drivers/model3.c b/src/mame/drivers/model3.c
index eb2c41f401d..776fb498fb2 100644
--- a/src/mame/drivers/model3.c
+++ b/src/mame/drivers/model3.c
@@ -359,6 +359,7 @@ ALL VROM ROMs are 16M MASK
 */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/powerpc/ppc.h"
 #include "machine/eeprom.h"
 #include "machine/53c810.h"
diff --git a/src/mame/drivers/mogura.c b/src/mame/drivers/mogura.c
index d3054ecf2fe..6d9278c8af8 100644
--- a/src/mame/drivers/mogura.c
+++ b/src/mame/drivers/mogura.c
@@ -1,6 +1,7 @@
 /* Mogura Desse */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "sound/dac.h"
 
 static UINT8 *mogura_tileram;
diff --git a/src/mame/drivers/moo.c b/src/mame/drivers/moo.c
index 2b2fd456ab4..81638c1cd59 100644
--- a/src/mame/drivers/moo.c
+++ b/src/mame/drivers/moo.c
@@ -42,6 +42,7 @@ Bucky:
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "video/konamiic.h"
 #include "cpu/m68000/m68000.h"
 #include "cpu/z80/z80.h"
diff --git a/src/mame/drivers/mouser.c b/src/mame/drivers/mouser.c
index dd75bc2b8ae..00983c9fc02 100644
--- a/src/mame/drivers/mouser.c
+++ b/src/mame/drivers/mouser.c
@@ -13,6 +13,7 @@
 *******************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "sound/ay8910.h"
 
 static UINT8 mouser_sound_byte;
diff --git a/src/mame/drivers/mpu4.c b/src/mame/drivers/mpu4.c
index cbb12a227e2..a0b8370ebec 100644
--- a/src/mame/drivers/mpu4.c
+++ b/src/mame/drivers/mpu4.c
@@ -246,7 +246,7 @@ TODO: - Fix lamp timing, MAME doesn't update fast enough to see everything
 #include "machine/6840ptm.h"
 
 // MPU4
-#include "ui.h"
+#include "deprecat.h"
 #include "timer.h"
 #include "cpu/m6809/m6809.h"
 #include "sound/ay8910.h"
diff --git a/src/mame/drivers/mrflea.c b/src/mame/drivers/mrflea.c
index 700bed229bf..73aeabc1da2 100644
--- a/src/mame/drivers/mrflea.c
+++ b/src/mame/drivers/mrflea.c
@@ -40,6 +40,7 @@ Video Board
 ******************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/z80/z80.h"
 #include "sound/ay8910.h"
 
diff --git a/src/mame/drivers/ms32.c b/src/mame/drivers/ms32.c
index fc913365083..04141ba6eee 100644
--- a/src/mame/drivers/ms32.c
+++ b/src/mame/drivers/ms32.c
@@ -165,6 +165,7 @@ Games marked * need dumping / redumping
 /********** BITS & PIECES **********/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "sound/ymf271.h"
 
 extern UINT32 *ms32_fce00000;
diff --git a/src/mame/drivers/msisaac.c b/src/mame/drivers/msisaac.c
index cd8f6a78065..fcda2424556 100644
--- a/src/mame/drivers/msisaac.c
+++ b/src/mame/drivers/msisaac.c
@@ -6,8 +6,8 @@
 
 ****************************************************************************/
 
-#include <math.h>
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/z80/z80.h"
 #include "cpu/m6805/m6805.h"
 #include "sound/ay8910.h"
diff --git a/src/mame/drivers/mugsmash.c b/src/mame/drivers/mugsmash.c
index 48204eb47c7..62a0d8955c2 100644
--- a/src/mame/drivers/mugsmash.c
+++ b/src/mame/drivers/mugsmash.c
@@ -40,6 +40,7 @@ behavior we use .
 */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "sound/2151intf.h"
 #include "sound/okim6295.h"
 
diff --git a/src/mame/drivers/multigam.c b/src/mame/drivers/multigam.c
index b389baceec9..4369ca535e3 100644
--- a/src/mame/drivers/multigam.c
+++ b/src/mame/drivers/multigam.c
@@ -38,6 +38,7 @@
 */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "video/ppu2c0x.h"
 #include "sound/nes_apu.h"
 #include "cpu/m6502/m6502.h"
diff --git a/src/mame/drivers/munchmo.c b/src/mame/drivers/munchmo.c
index 355d071f5d2..aff21cb5916 100644
--- a/src/mame/drivers/munchmo.c
+++ b/src/mame/drivers/munchmo.c
@@ -15,6 +15,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/z80/z80.h"
 #include "sound/ay8910.h"
 
diff --git a/src/mame/drivers/mwarr.c b/src/mame/drivers/mwarr.c
index 1b687bdaca3..bf62c596250 100644
--- a/src/mame/drivers/mwarr.c
+++ b/src/mame/drivers/mwarr.c
@@ -39,6 +39,7 @@ Notes:
 */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "sound/okim6295.h"
 
 static tilemap *bg_tilemap, *mlow_tilemap, *mhigh_tilemap, *tx_tilemap;
diff --git a/src/mame/drivers/mystston.c b/src/mame/drivers/mystston.c
index 33d7084f1bc..2f7dc56b390 100644
--- a/src/mame/drivers/mystston.c
+++ b/src/mame/drivers/mystston.c
@@ -14,6 +14,7 @@ Notes:
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "sound/ay8910.h"
 
 
diff --git a/src/mame/drivers/mystwarr.c b/src/mame/drivers/mystwarr.c
index cda687e0491..bbda52cfaba 100644
--- a/src/mame/drivers/mystwarr.c
+++ b/src/mame/drivers/mystwarr.c
@@ -22,6 +22,7 @@
  */
 
 #include "driver.h"
+#include "deprecat.h"
 
 #include "video/konamiic.h"
 #include "machine/konamigx.h"
diff --git a/src/mame/drivers/namcona1.c b/src/mame/drivers/namcona1.c
index b245ce159b2..ed266acde00 100644
--- a/src/mame/drivers/namcona1.c
+++ b/src/mame/drivers/namcona1.c
@@ -173,6 +173,7 @@ Notes:
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "namcona1.h"
 #include "sound/c140.h"
 #include "sound/namcona.h"
diff --git a/src/mame/drivers/namconb1.c b/src/mame/drivers/namconb1.c
index aa208934593..74b36b4153a 100644
--- a/src/mame/drivers/namconb1.c
+++ b/src/mame/drivers/namconb1.c
@@ -270,6 +270,7 @@ GFX:                Custom 145     ( 80 pin PQFP)
                     Custom 169     (120 pin PQFP)
 */
 #include "driver.h"
+#include "deprecat.h"
 #include "namconb1.h"
 #include "namcos2.h"
 #include "namcoic.h"
diff --git a/src/mame/drivers/namcos1.c b/src/mame/drivers/namcos1.c
index 8a9e1b622ea..d9f3ba8d306 100644
--- a/src/mame/drivers/namcos1.c
+++ b/src/mame/drivers/namcos1.c
@@ -339,6 +339,7 @@ C - uses sub board with support for player 3 and 4 controls
 ***********************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/m6809/m6809.h"
 #include "cpu/m6800/m6800.h"
 #include "sound/2151intf.h"
diff --git a/src/mame/drivers/namcos12.c b/src/mame/drivers/namcos12.c
index 9824ece1d07..49870148b3c 100644
--- a/src/mame/drivers/namcos12.c
+++ b/src/mame/drivers/namcos12.c
@@ -921,8 +921,8 @@ Notes:
       Point Blank 2 (GNB5/VER.A)
 */
 
-#include <stdarg.h>
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/mips/psx.h"
 #include "cpu/h83002/h83002.h"
 #include "includes/psx.h"
diff --git a/src/mame/drivers/namcos21.c b/src/mame/drivers/namcos21.c
index 9c3d7b4c8bc..7da9a0f6c65 100644
--- a/src/mame/drivers/namcos21.c
+++ b/src/mame/drivers/namcos21.c
@@ -271,6 +271,7 @@ CPU68 PCB:
   JP3
 */
 #include "driver.h"
+#include "deprecat.h"
 #include "namcos2.h"
 #include "cpu/m6809/m6809.h"
 #include "cpu/tms32025/tms32025.h"
diff --git a/src/mame/drivers/namcos22.c b/src/mame/drivers/namcos22.c
index bcfd7532dfb..b1aaa5621d5 100644
--- a/src/mame/drivers/namcos22.c
+++ b/src/mame/drivers/namcos22.c
@@ -144,6 +144,7 @@
  */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "namcos22.h"
 #include "cpu/tms32025/tms32025.h"
 #include "cpu/m37710/m37710.h"
diff --git a/src/mame/drivers/namcos23.c b/src/mame/drivers/namcos23.c
index cec5b10db59..f4d7f909c66 100644
--- a/src/mame/drivers/namcos23.c
+++ b/src/mame/drivers/namcos23.c
@@ -324,6 +324,7 @@ Notes:
 
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/mips/mips3.h"
 #include "cpu/h83002/h83002.h"
 #include "sound/c352.h"
diff --git a/src/mame/drivers/namcos86.c b/src/mame/drivers/namcos86.c
index af945d965d8..5a58ec18a29 100644
--- a/src/mame/drivers/namcos86.c
+++ b/src/mame/drivers/namcos86.c
@@ -175,6 +175,7 @@ TODO:
 *******************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/m6800/m6800.h"
 #include "sound/2151intf.h"
 #include "sound/namco.h"
diff --git a/src/mame/drivers/nbmj9195.c b/src/mame/drivers/nbmj9195.c
index f5979e54c84..496395732e2 100644
--- a/src/mame/drivers/nbmj9195.c
+++ b/src/mame/drivers/nbmj9195.c
@@ -20,6 +20,7 @@ Notes:
 ******************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "machine/z80ctc.h"
 #include "sound/3812intf.h"
 #include "sound/dac.h"
diff --git a/src/mame/drivers/nemesis.c b/src/mame/drivers/nemesis.c
index 63c15df708a..2736664bc41 100644
--- a/src/mame/drivers/nemesis.c
+++ b/src/mame/drivers/nemesis.c
@@ -37,6 +37,7 @@ So this is the correct behavior of real hardware, not an emulation bug.
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/z80/z80.h"
 #include "sound/ay8910.h"
 #include "sound/2151intf.h"
diff --git a/src/mame/drivers/neogeo.c b/src/mame/drivers/neogeo.c
index 5b575a35a6f..0f5a4fdd483 100644
--- a/src/mame/drivers/neogeo.c
+++ b/src/mame/drivers/neogeo.c
@@ -80,6 +80,7 @@
 ****************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "neogeo.h"
 #include "machine/pd4990a.h"
 #include "cpu/z80/z80.h"
diff --git a/src/mame/drivers/ninjakd2.c b/src/mame/drivers/ninjakd2.c
index 01e4b73c243..27e15d9251b 100644
--- a/src/mame/drivers/ninjakd2.c
+++ b/src/mame/drivers/ninjakd2.c
@@ -122,6 +122,7 @@ TODO:
 ******************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "sound/2203intf.h"
 #include "sound/samples.h"
 #include "machine/mc8123.h"
diff --git a/src/mame/drivers/ninjaw.c b/src/mame/drivers/ninjaw.c
index 442b8962d82..3c5999ce128 100644
--- a/src/mame/drivers/ninjaw.c
+++ b/src/mame/drivers/ninjaw.c
@@ -190,6 +190,7 @@ rumbling on a subwoofer in the cabinet.)
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "taitoipt.h"
 #include "cpu/m68000/m68000.h"
 #include "video/taitoic.h"
diff --git a/src/mame/drivers/niyanpai.c b/src/mame/drivers/niyanpai.c
index d8cab0e2cc4..f67b48774fa 100644
--- a/src/mame/drivers/niyanpai.c
+++ b/src/mame/drivers/niyanpai.c
@@ -33,6 +33,7 @@ Memo:
 ******************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "machine/m68kfmly.h"
 #include "machine/z80ctc.h"
 #include "nb1413m3.h"
diff --git a/src/mame/drivers/nmg5.c b/src/mame/drivers/nmg5.c
index 1856f42dc8a..3150b663493 100644
--- a/src/mame/drivers/nmg5.c
+++ b/src/mame/drivers/nmg5.c
@@ -220,6 +220,7 @@ Stephh's notes (based on the games M68000 code and some tests) :
 */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "sound/okim6295.h"
 #include "sound/3812intf.h"
 
diff --git a/src/mame/drivers/nmk16.c b/src/mame/drivers/nmk16.c
index 89a9498d1c9..9371a30ac9c 100644
--- a/src/mame/drivers/nmk16.c
+++ b/src/mame/drivers/nmk16.c
@@ -145,6 +145,7 @@ Afega Games
 ********************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "audio/seibu.h"
 #include "sound/2203intf.h"
 #include "sound/okim6295.h"
diff --git a/src/mame/drivers/nwk-tr.c b/src/mame/drivers/nwk-tr.c
index 095713998e7..5147bf2dd35 100644
--- a/src/mame/drivers/nwk-tr.c
+++ b/src/mame/drivers/nwk-tr.c
@@ -30,6 +30,7 @@
 */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/powerpc/ppc.h"
 #include "cpu/sharc/sharc.h"
 #include "machine/konppc.h"
diff --git a/src/mame/drivers/nycaptor.c b/src/mame/drivers/nycaptor.c
index 2401b3fd0a9..c28416aee3d 100644
--- a/src/mame/drivers/nycaptor.c
+++ b/src/mame/drivers/nycaptor.c
@@ -146,8 +146,8 @@ Stephh's additional notes (based on the game Z80 code and some tests) :
 //#define USE_MCU
 
 
-#include <math.h>
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/z80/z80.h"
 #include "cpu/m6805/m6805.h"
 #include "sound/ay8910.h"
diff --git a/src/mame/drivers/nyny.c b/src/mame/drivers/nyny.c
index 2c4fbf9c1b5..467c6cf1723 100644
--- a/src/mame/drivers/nyny.c
+++ b/src/mame/drivers/nyny.c
@@ -63,6 +63,7 @@
 
 #include "driver.h"
 #include "rescap.h"
+#include "deprecat.h"
 #include "machine/6821pia.h"
 #include "machine/74123.h"
 #include "video/crtc6845.h"
diff --git a/src/mame/drivers/offtwall.c b/src/mame/drivers/offtwall.c
index 819669673ad..b4e3f1151b3 100644
--- a/src/mame/drivers/offtwall.c
+++ b/src/mame/drivers/offtwall.c
@@ -18,6 +18,7 @@
 
 
 #include "driver.h"
+#include "deprecat.h"
 #include "machine/atarigen.h"
 #include "audio/atarijsa.h"
 #include "offtwall.h"
diff --git a/src/mame/drivers/ojankohs.c b/src/mame/drivers/ojankohs.c
index f38afc01f20..8b91f90c04f 100644
--- a/src/mame/drivers/ojankohs.c
+++ b/src/mame/drivers/ojankohs.c
@@ -32,6 +32,7 @@ Memo:
 ******************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/z80/z80.h"
 #include "sound/ay8910.h"
 #include "sound/msm5205.h"
diff --git a/src/mame/drivers/omegrace.c b/src/mame/drivers/omegrace.c
index 6ab5872187e..ffd8a5aeadd 100644
--- a/src/mame/drivers/omegrace.c
+++ b/src/mame/drivers/omegrace.c
@@ -217,6 +217,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "video/vector.h"
 #include "video/avgdvg.h"
 #include "sound/ay8910.h"
diff --git a/src/mame/drivers/oneshot.c b/src/mame/drivers/oneshot.c
index e8eaeaf9723..072ec11fbd2 100644
--- a/src/mame/drivers/oneshot.c
+++ b/src/mame/drivers/oneshot.c
@@ -30,6 +30,7 @@ TO DO :
 */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "sound/okim6295.h"
 #include "sound/3812intf.h"
 
diff --git a/src/mame/drivers/onetwo.c b/src/mame/drivers/onetwo.c
index 050e6056346..07902d4c8cc 100644
--- a/src/mame/drivers/onetwo.c
+++ b/src/mame/drivers/onetwo.c
@@ -36,6 +36,7 @@ COR_x are LN60G resitor packs
 */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "sound/okim6295.h"
 #include "sound/3812intf.h"
 
diff --git a/src/mame/drivers/opwolf.c b/src/mame/drivers/opwolf.c
index 2dc687cd79a..00afad02c94 100644
--- a/src/mame/drivers/opwolf.c
+++ b/src/mame/drivers/opwolf.c
@@ -94,6 +94,7 @@ register. So what is controlling priority.
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "taitoipt.h"
 #include "video/taitoic.h"
 #include "audio/taitosnd.h"
diff --git a/src/mame/drivers/othldrby.c b/src/mame/drivers/othldrby.c
index 8484035524a..cfb28671b41 100644
--- a/src/mame/drivers/othldrby.c
+++ b/src/mame/drivers/othldrby.c
@@ -15,6 +15,7 @@ Notes:
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "sound/okim6295.h"
 
 
diff --git a/src/mame/drivers/othunder.c b/src/mame/drivers/othunder.c
index 4840f6f84e3..5dd8e1362bb 100644
--- a/src/mame/drivers/othunder.c
+++ b/src/mame/drivers/othunder.c
@@ -231,6 +231,7 @@ TODO:
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "taitoipt.h"
 #include "cpu/m68000/m68000.h"
 #include "machine/eeprom.h"
diff --git a/src/mame/drivers/overdriv.c b/src/mame/drivers/overdriv.c
index 25ca69e402f..a040668736f 100644
--- a/src/mame/drivers/overdriv.c
+++ b/src/mame/drivers/overdriv.c
@@ -19,6 +19,7 @@ Notes:
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "video/konamiic.h"
 #include "machine/eeprom.h"
 #include "cpu/m6809/m6809.h"
diff --git a/src/mame/drivers/pacland.c b/src/mame/drivers/pacland.c
index 30df6259f1d..72196173c74 100644
--- a/src/mame/drivers/pacland.c
+++ b/src/mame/drivers/pacland.c
@@ -173,6 +173,7 @@ Notes:
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/m6800/m6800.h"
 #include "sound/namco.h"
 
diff --git a/src/mame/drivers/pacman.c b/src/mame/drivers/pacman.c
index d2dfbd485af..24527b1e191 100644
--- a/src/mame/drivers/pacman.c
+++ b/src/mame/drivers/pacman.c
@@ -328,6 +328,7 @@ Boards:
 ****************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "pacman.h"
 #include "cpu/s2650/s2650.h"
 #include "sound/namco.h"
diff --git a/src/mame/drivers/pandoras.c b/src/mame/drivers/pandoras.c
index 9f9484611be..af7c7b6ccad 100644
--- a/src/mame/drivers/pandoras.c
+++ b/src/mame/drivers/pandoras.c
@@ -14,6 +14,7 @@ TODO:
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/m6809/m6809.h"
 #include "cpu/z80/z80.h"
 #include "cpu/i8039/i8039.h"
diff --git a/src/mame/drivers/parodius.c b/src/mame/drivers/parodius.c
index 6b3c6b07179..1804083c711 100644
--- a/src/mame/drivers/parodius.c
+++ b/src/mame/drivers/parodius.c
@@ -7,6 +7,7 @@ driver by Nicola Salmoria
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/konami/konami.h" /* for the callback and the firq irq definition */
 #include "video/konamiic.h"
 #include "sound/2151intf.h"
diff --git a/src/mame/drivers/pasha2.c b/src/mame/drivers/pasha2.c
index 5ec60396c0a..c5804bb78cf 100644
--- a/src/mame/drivers/pasha2.c
+++ b/src/mame/drivers/pasha2.c
@@ -72,6 +72,7 @@ Notes:
 *********************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "machine/eeprom.h"
 #include "sound/okim6295.h"
 
diff --git a/src/mame/drivers/pbaction.c b/src/mame/drivers/pbaction.c
index eecae521a6e..c914f4a28f9 100644
--- a/src/mame/drivers/pbaction.c
+++ b/src/mame/drivers/pbaction.c
@@ -34,6 +34,7 @@ Notes:
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "sound/ay8910.h"
 #include "machine/segacrpt.h"
 
diff --git a/src/mame/drivers/pcktgal.c b/src/mame/drivers/pcktgal.c
index 558f6a2793a..54c4ab1b1e8 100644
--- a/src/mame/drivers/pcktgal.c
+++ b/src/mame/drivers/pcktgal.c
@@ -13,6 +13,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/m6502/m6502.h"
 #include "sound/2203intf.h"
 #include "sound/3812intf.h"
diff --git a/src/mame/drivers/peplus.c b/src/mame/drivers/peplus.c
index cc9ffea94f3..6fc68f96b75 100644
--- a/src/mame/drivers/peplus.c
+++ b/src/mame/drivers/peplus.c
@@ -151,6 +151,7 @@ Stephh's log (2007.11.28) :
 ***********************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "sound/ay8910.h"
 #include "cpu/i8051/i8051.h"
 #include "machine/i2cmem.h"
diff --git a/src/mame/drivers/pgm.c b/src/mame/drivers/pgm.c
index f3796d66c9e..3dd10220e51 100644
--- a/src/mame/drivers/pgm.c
+++ b/src/mame/drivers/pgm.c
@@ -281,6 +281,7 @@ Notes:
 #define PGMARM7SPEEDHACK 1
 
 #include "driver.h"
+#include "deprecat.h"
 #include "sound/ics2115.h"
 #include "cpu/arm7/arm7core.h"
 
diff --git a/src/mame/drivers/pipedrm.c b/src/mame/drivers/pipedrm.c
index d17442c883d..5d2dbf3eb06 100644
--- a/src/mame/drivers/pipedrm.c
+++ b/src/mame/drivers/pipedrm.c
@@ -104,11 +104,11 @@
 
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/z80/z80.h"
 #include "fromance.h"
 #include "sound/2608intf.h"
 #include "sound/2610intf.h"
-#include <math.h>
 
 
 static UINT8 pending_command;
diff --git a/src/mame/drivers/pipeline.c b/src/mame/drivers/pipeline.c
index 4675235a5d3..f65c954b70b 100644
--- a/src/mame/drivers/pipeline.c
+++ b/src/mame/drivers/pipeline.c
@@ -48,6 +48,7 @@ Notes:
 */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "machine/z80ctc.h"
 #include "sound/2203intf.h"
 #include "machine/8255ppi.h"
diff --git a/src/mame/drivers/pkscram.c b/src/mame/drivers/pkscram.c
index a9b49c0d238..ea10bee1a46 100644
--- a/src/mame/drivers/pkscram.c
+++ b/src/mame/drivers/pkscram.c
@@ -12,7 +12,7 @@ driver by David Haywood and few bits by Pierpaolo Prazzoli
 */
 
 #include "driver.h"
-#include "timer.h"
+#include "deprecat.h"
 #include "sound/2203intf.h"
 
 static int interrupt_scanline=192;
diff --git a/src/mame/drivers/pktgaldx.c b/src/mame/drivers/pktgaldx.c
index 2dd1e8fd6b5..d05aadaf060 100644
--- a/src/mame/drivers/pktgaldx.c
+++ b/src/mame/drivers/pktgaldx.c
@@ -54,6 +54,7 @@ bootleg todo:
 */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "decocrpt.h"
 #include "decoprot.h"
 #include "deco16ic.h"
diff --git a/src/mame/drivers/plygonet.c b/src/mame/drivers/plygonet.c
index 865da720fcd..71f5dda7bca 100644
--- a/src/mame/drivers/plygonet.c
+++ b/src/mame/drivers/plygonet.c
@@ -44,7 +44,7 @@ Notes:
 */
 
 #include "driver.h"
-
+#include "deprecat.h"
 #include "video/konamiic.h"
 #include "cpu/m68000/m68000.h"
 #include "cpu/z80/z80.h"
diff --git a/src/mame/drivers/pntnpuzl.c b/src/mame/drivers/pntnpuzl.c
index 0ac79a1850a..7133ec165f8 100644
--- a/src/mame/drivers/pntnpuzl.c
+++ b/src/mame/drivers/pntnpuzl.c
@@ -121,6 +121,7 @@ CN1 standard DB15 VGA connector (15KHz)
 */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "machine/eeprom.h"
 
 
diff --git a/src/mame/drivers/pokechmp.c b/src/mame/drivers/pokechmp.c
index b940bea677f..6b08c76b183 100644
--- a/src/mame/drivers/pokechmp.c
+++ b/src/mame/drivers/pokechmp.c
@@ -45,10 +45,10 @@ ClawGrip, Jul 2006
 */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/m6502/m6502.h"
 #include "sound/2203intf.h"
 #include "sound/3812intf.h"
-//#include "sound/msm5205.h"
 #include "sound/okim6295.h"
 
 extern WRITE8_HANDLER( pokechmp_videoram_w );
diff --git a/src/mame/drivers/polepos.c b/src/mame/drivers/polepos.c
index 85f912561e6..77f507921da 100644
--- a/src/mame/drivers/polepos.c
+++ b/src/mame/drivers/polepos.c
@@ -211,6 +211,7 @@ Notes:
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "machine/namcoio.h"
 #include "sound/namco.h"
 #include "sound/namco52.h"
diff --git a/src/mame/drivers/polyplay.c b/src/mame/drivers/polyplay.c
index d910a44a772..ee4eb84300e 100644
--- a/src/mame/drivers/polyplay.c
+++ b/src/mame/drivers/polyplay.c
@@ -79,6 +79,7 @@ emulated now. ;)
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/z80/z80.h"
 #include "sound/samples.h"
 
diff --git a/src/mame/drivers/poolshrk.c b/src/mame/drivers/poolshrk.c
index a9702f0b2d5..3e7d035391b 100644
--- a/src/mame/drivers/poolshrk.c
+++ b/src/mame/drivers/poolshrk.c
@@ -5,6 +5,7 @@ Atari Poolshark Driver
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "poolshrk.h"
 #include "sound/discrete.h"
 
diff --git a/src/mame/drivers/popper.c b/src/mame/drivers/popper.c
index 093f406f477..8e7db31e906 100644
--- a/src/mame/drivers/popper.c
+++ b/src/mame/drivers/popper.c
@@ -79,6 +79,7 @@ Notes:
 */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "sound/ay8910.h"
 
 extern UINT8 *popper_videoram, *popper_attribram, *popper_ol_videoram, *popper_ol_attribram, *popper_spriteram;
diff --git a/src/mame/drivers/powerins.c b/src/mame/drivers/powerins.c
index 134fdb3aeb7..ea67bdc2971 100644
--- a/src/mame/drivers/powerins.c
+++ b/src/mame/drivers/powerins.c
@@ -25,6 +25,7 @@ TODO:
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "machine/nmk112.h"
 #include "sound/okim6295.h"
 #include "sound/2203intf.h"
diff --git a/src/mame/drivers/prehisle.c b/src/mame/drivers/prehisle.c
index 88b89667efe..8c0729c6a23 100644
--- a/src/mame/drivers/prehisle.c
+++ b/src/mame/drivers/prehisle.c
@@ -9,6 +9,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "sound/upd7759.h"
 #include "sound/3812intf.h"
 
diff --git a/src/mame/drivers/psikyo.c b/src/mame/drivers/psikyo.c
index 8e9fecffc38..090dbf186d4 100644
--- a/src/mame/drivers/psikyo.c
+++ b/src/mame/drivers/psikyo.c
@@ -61,6 +61,7 @@ This was pointed out by Bart Puype
 *****/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "sound/2610intf.h"
 #include "sound/ymf278b.h"
 
diff --git a/src/mame/drivers/psikyo4.c b/src/mame/drivers/psikyo4.c
index 709d45115d7..f964d393313 100644
--- a/src/mame/drivers/psikyo4.c
+++ b/src/mame/drivers/psikyo4.c
@@ -127,6 +127,7 @@ ROMs -
 ----------------------------------------------------------------*/
 
 #include "driver.h"
+#include "deprecat.h"
 
 #include "cpu/sh2/sh2.h"
 #include "machine/eeprom.h"
diff --git a/src/mame/drivers/psikyosh.c b/src/mame/drivers/psikyosh.c
index 819eb653713..79d0b84a4ce 100644
--- a/src/mame/drivers/psikyosh.c
+++ b/src/mame/drivers/psikyosh.c
@@ -270,6 +270,7 @@ Notes:
 */
 
 #include "driver.h"
+#include "deprecat.h"
 
 #include "cpu/sh2/sh2.h"
 #include "machine/eeprom.h"
diff --git a/src/mame/drivers/psychic5.c b/src/mame/drivers/psychic5.c
index c1101cd6f5e..8c096a8fe75 100644
--- a/src/mame/drivers/psychic5.c
+++ b/src/mame/drivers/psychic5.c
@@ -310,6 +310,7 @@ The first sprite data is located at f20b,then f21b and so on.
 */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "sound/2203intf.h"
 
 
diff --git a/src/mame/drivers/punchout.c b/src/mame/drivers/punchout.c
index b6986d25138..627b88b77ab 100644
--- a/src/mame/drivers/punchout.c
+++ b/src/mame/drivers/punchout.c
@@ -98,6 +98,7 @@ write:
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/m6502/m6502.h"
 #include "sound/vlm5030.h"
 #include "sound/nes_apu.h"
diff --git a/src/mame/drivers/pushman.c b/src/mame/drivers/pushman.c
index 3a128fdd2b7..4b39f4bfe34 100644
--- a/src/mame/drivers/pushman.c
+++ b/src/mame/drivers/pushman.c
@@ -22,6 +22,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/z80/z80.h"
 #include "cpu/m6805/m6805.h"
 #include "sound/2203intf.h"
diff --git a/src/mame/drivers/qdrmfgp.c b/src/mame/drivers/qdrmfgp.c
index 4723b89b732..632b3bcae20 100644
--- a/src/mame/drivers/qdrmfgp.c
+++ b/src/mame/drivers/qdrmfgp.c
@@ -20,6 +20,7 @@ GP1 HDD data contents:
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/m68000/m68000.h"
 #include "machine/idectrl.h"
 #include "sound/k054539.h"
diff --git a/src/mame/drivers/r2dtank.c b/src/mame/drivers/r2dtank.c
index e8a96e4d212..3df17aae648 100644
--- a/src/mame/drivers/r2dtank.c
+++ b/src/mame/drivers/r2dtank.c
@@ -31,6 +31,7 @@ RAM = 4116 (x11)
 ********************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "rescap.h"
 #include "machine/6821pia.h"
 #include "machine/74123.h"
diff --git a/src/mame/drivers/rabbit.c b/src/mame/drivers/rabbit.c
index fb2b661a838..ed316d083bb 100644
--- a/src/mame/drivers/rabbit.c
+++ b/src/mame/drivers/rabbit.c
@@ -80,6 +80,7 @@ Custom: Imagetek 15000 (2ch video & 2ch sound)
 */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "machine/eeprom.h"
 
 #define VERBOSE_AUDIO_LOG (0)	// enable to show audio writes (very noisy when music is playing)
diff --git a/src/mame/drivers/rainbow.c b/src/mame/drivers/rainbow.c
index 364b2d058d4..eb098bf6562 100644
--- a/src/mame/drivers/rainbow.c
+++ b/src/mame/drivers/rainbow.c
@@ -237,6 +237,7 @@ Stephh's notes (based on the game M68000 code and some tests) :
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "taitoipt.h"
 #include "video/taitoic.h"
 #include "audio/taitosnd.h"
diff --git a/src/mame/drivers/rallyx.c b/src/mame/drivers/rallyx.c
index 277059051c5..e69c901f3a8 100644
--- a/src/mame/drivers/rallyx.c
+++ b/src/mame/drivers/rallyx.c
@@ -180,6 +180,7 @@ TODO:
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "audio/timeplt.h"
 #include "sound/namco.h"
 #include "sound/samples.h"
diff --git a/src/mame/drivers/rampart.c b/src/mame/drivers/rampart.c
index 0a231c01fb6..76953823a67 100644
--- a/src/mame/drivers/rampart.c
+++ b/src/mame/drivers/rampart.c
@@ -23,6 +23,7 @@
 
 
 #include "driver.h"
+#include "deprecat.h"
 #include "machine/atarigen.h"
 #include "rampart.h"
 #include "sound/okim6295.h"
diff --git a/src/mame/drivers/rastan.c b/src/mame/drivers/rastan.c
index 541fd3e2b95..0138e793412 100644
--- a/src/mame/drivers/rastan.c
+++ b/src/mame/drivers/rastan.c
@@ -159,6 +159,7 @@ Stephh's notes (based on the game M68000 code and some tests) :
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "taitoipt.h"
 #include "video/taitoic.h"
 #include "audio/taitosnd.h"
diff --git a/src/mame/drivers/rbmk.c b/src/mame/drivers/rbmk.c
index 4918536ec64..43ae719609e 100644
--- a/src/mame/drivers/rbmk.c
+++ b/src/mame/drivers/rbmk.c
@@ -56,6 +56,7 @@ PIC16F84
 */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "sound/okim6295.h"
 #include "machine/eeprom.h"
 
diff --git a/src/mame/drivers/redalert.c b/src/mame/drivers/redalert.c
index 2d94d3c2137..2ed65c98dc7 100644
--- a/src/mame/drivers/redalert.c
+++ b/src/mame/drivers/redalert.c
@@ -68,6 +68,7 @@
 ****************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/m6502/m6502.h"
 #include "redalert.h"
 
diff --git a/src/mame/drivers/redclash.c b/src/mame/drivers/redclash.c
index ab8b38b0de7..c6478ebeeaa 100644
--- a/src/mame/drivers/redclash.c
+++ b/src/mame/drivers/redclash.c
@@ -21,6 +21,7 @@ TODO:
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 
 
 extern WRITE8_HANDLER( redclash_videoram_w );
diff --git a/src/mame/drivers/relief.c b/src/mame/drivers/relief.c
index 96b30772716..44ce37a6602 100644
--- a/src/mame/drivers/relief.c
+++ b/src/mame/drivers/relief.c
@@ -18,6 +18,7 @@
 
 
 #include "driver.h"
+#include "deprecat.h"
 #include "machine/atarigen.h"
 #include "relief.h"
 #include "sound/okim6295.h"
diff --git a/src/mame/drivers/renegade.c b/src/mame/drivers/renegade.c
index d87ac9beab4..ddc6480c7a9 100644
--- a/src/mame/drivers/renegade.c
+++ b/src/mame/drivers/renegade.c
@@ -101,6 +101,7 @@ $8000 - $ffff   ROM
 
 #include "driver.h"
 #include "streams.h"
+#include "deprecat.h"
 #include "cpu/m6502/m6502.h"
 #include "cpu/m6809/m6809.h"
 #include "sound/3812intf.h"
diff --git a/src/mame/drivers/retofinv.c b/src/mame/drivers/retofinv.c
index 78237e567d6..fce00eb8c70 100644
--- a/src/mame/drivers/retofinv.c
+++ b/src/mame/drivers/retofinv.c
@@ -29,6 +29,7 @@ Notes:
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/m6805/m6805.h"
 #include "sound/sn76496.h"
 
diff --git a/src/mame/drivers/rockola.c b/src/mame/drivers/rockola.c
index 8c98a0e1253..bacc6c421a3 100644
--- a/src/mame/drivers/rockola.c
+++ b/src/mame/drivers/rockola.c
@@ -121,6 +121,7 @@ Interrupts: VBlank causes an IRQ. Coin insertion causes a NMI.
 */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/m6502/m6502.h"
 #include "video/crtc6845.h"
 #include "sound/sn76477.h"
diff --git a/src/mame/drivers/rockrage.c b/src/mame/drivers/rockrage.c
index 3be5cec5422..520d16da655 100644
--- a/src/mame/drivers/rockrage.c
+++ b/src/mame/drivers/rockrage.c
@@ -48,6 +48,7 @@ Notes:
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/m6809/m6809.h"
 #include "cpu/hd6309/hd6309.h"
 #include "video/konamiic.h"
diff --git a/src/mame/drivers/rohga.c b/src/mame/drivers/rohga.c
index 7126ec982ce..fcd025db7f1 100644
--- a/src/mame/drivers/rohga.c
+++ b/src/mame/drivers/rohga.c
@@ -108,6 +108,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/h6280/h6280.h"
 #include "decocrpt.h"
 #include "decoprot.h"
diff --git a/src/mame/drivers/rollerg.c b/src/mame/drivers/rollerg.c
index 74fd4d57eeb..530fc337925 100644
--- a/src/mame/drivers/rollerg.c
+++ b/src/mame/drivers/rollerg.c
@@ -7,6 +7,7 @@ driver by Nicola Salmoria
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "video/konamiic.h"
 #include "cpu/konami/konami.h" /* for the callback and the firq irq definition */
 #include "machine/eeprom.h"
diff --git a/src/mame/drivers/rpunch.c b/src/mame/drivers/rpunch.c
index 46e96addff7..cf23d25cb64 100644
--- a/src/mame/drivers/rpunch.c
+++ b/src/mame/drivers/rpunch.c
@@ -105,10 +105,10 @@
 
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/m6809/m6809.h"
 #include "sound/2151intf.h"
 #include "sound/upd7759.h"
-#include <math.h>
 
 
 
diff --git a/src/mame/drivers/runaway.c b/src/mame/drivers/runaway.c
index f8e47752471..90f7852730e 100644
--- a/src/mame/drivers/runaway.c
+++ b/src/mame/drivers/runaway.c
@@ -11,6 +11,7 @@
 ****************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "machine/atari_vg.h"
 #include "sound/pokey.h"
 
diff --git a/src/mame/drivers/rungun.c b/src/mame/drivers/rungun.c
index cd9bc032c85..ed054d5437d 100644
--- a/src/mame/drivers/rungun.c
+++ b/src/mame/drivers/rungun.c
@@ -36,6 +36,7 @@
 */
 
 #include "driver.h"
+#include "deprecat.h"
 
 #include "video/konamiic.h"
 #include "cpu/m68000/m68000.h"
diff --git a/src/mame/drivers/sandscrp.c b/src/mame/drivers/sandscrp.c
index 4466d3999a6..14791baab47 100644
--- a/src/mame/drivers/sandscrp.c
+++ b/src/mame/drivers/sandscrp.c
@@ -5,6 +5,7 @@
 */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "machine/eeprom.h"
 #include "includes/kaneko16.h"
 #include "sound/2203intf.h"
diff --git a/src/mame/drivers/sangho.c b/src/mame/drivers/sangho.c
index d5ad0c2d983..9eb27155a73 100644
--- a/src/mame/drivers/sangho.c
+++ b/src/mame/drivers/sangho.c
@@ -47,6 +47,7 @@ is a YM2413 compatible chip.
 */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/z80/z80.h"
 #include "video/v9938.h"
 #include "sound/2413intf.h"
diff --git a/src/mame/drivers/sauro.c b/src/mame/drivers/sauro.c
index bc40898836f..e1c8136e9e1 100644
--- a/src/mame/drivers/sauro.c
+++ b/src/mame/drivers/sauro.c
@@ -74,6 +74,7 @@ Addition by Reip
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/z80/z80.h"
 #include "sound/3812intf.h"
 #include "sound/sp0256.h"
diff --git a/src/mame/drivers/sbasketb.c b/src/mame/drivers/sbasketb.c
index 6234d109c57..33815909841 100644
--- a/src/mame/drivers/sbasketb.c
+++ b/src/mame/drivers/sbasketb.c
@@ -16,6 +16,7 @@ MAIN BOARD:
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/m6809/m6809.h"
 #include "sound/vlm5030.h"
 #include "sound/dac.h"
diff --git a/src/mame/drivers/sbowling.c b/src/mame/drivers/sbowling.c
index 60356c372e3..3ee3abb9488 100644
--- a/src/mame/drivers/sbowling.c
+++ b/src/mame/drivers/sbowling.c
@@ -38,6 +38,7 @@ PROMs : NEC B406 (1kx4) x2
 ***********************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/i8039/i8039.h"
 #include "video/resnet.h"
 #include "sound/ay8910.h"
diff --git a/src/mame/drivers/sbrkout.c b/src/mame/drivers/sbrkout.c
index b5c5c7bb5a7..4bec29d690f 100644
--- a/src/mame/drivers/sbrkout.c
+++ b/src/mame/drivers/sbrkout.c
@@ -31,6 +31,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "sound/dac.h"
 
 #include "sbrkout.lh"
diff --git a/src/mame/drivers/scotrsht.c b/src/mame/drivers/scotrsht.c
index 0ea76a8cb27..37884d9a9ce 100644
--- a/src/mame/drivers/scotrsht.c
+++ b/src/mame/drivers/scotrsht.c
@@ -7,6 +7,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "sound/2203intf.h"
 
 extern UINT8 *scotrsht_scroll;
diff --git a/src/mame/drivers/seattle.c b/src/mame/drivers/seattle.c
index f39ec029ce5..3edcbc985fb 100644
--- a/src/mame/drivers/seattle.c
+++ b/src/mame/drivers/seattle.c
@@ -183,6 +183,7 @@
 **************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/adsp2100/adsp2100.h"
 #include "cpu/mips/mips3.h"
 #include "audio/dcs.h"
diff --git a/src/mame/drivers/segac2.c b/src/mame/drivers/segac2.c
index 2a79472f20c..d4bb185c8f0 100644
--- a/src/mame/drivers/segac2.c
+++ b/src/mame/drivers/segac2.c
@@ -78,6 +78,7 @@
 
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/m68000/m68000.h"
 #include "genesis.h"
 
diff --git a/src/mame/drivers/segae.c b/src/mame/drivers/segae.c
index d9d6dd45c64..8a8af133ea0 100644
--- a/src/mame/drivers/segae.c
+++ b/src/mame/drivers/segae.c
@@ -296,6 +296,7 @@ covert megatech / megaplay drivers to use new code etc. etc.
 */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "sound/sn76496.h"
 #include "machine/mc8123.h"
 #include "machine/segacrpt.h"
diff --git a/src/mame/drivers/segag80r.c b/src/mame/drivers/segag80r.c
index e05dea4dbe5..90704311e37 100644
--- a/src/mame/drivers/segag80r.c
+++ b/src/mame/drivers/segag80r.c
@@ -104,6 +104,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/z80/z80.h"
 #include "machine/8255ppi.h"
 #include "machine/segacrpt.h"
diff --git a/src/mame/drivers/segag80v.c b/src/mame/drivers/segag80v.c
index dd7b6a9cac3..911dcb59171 100644
--- a/src/mame/drivers/segag80v.c
+++ b/src/mame/drivers/segag80v.c
@@ -133,6 +133,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "sound/ay8910.h"
 #include "sound/samples.h"
 #include "audio/segasnd.h"
diff --git a/src/mame/drivers/segahang.c b/src/mame/drivers/segahang.c
index 506c653306f..992eb874ddc 100644
--- a/src/mame/drivers/segahang.c
+++ b/src/mame/drivers/segahang.c
@@ -14,6 +14,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "system16.h"
 #include "machine/segaic16.h"
 #include "machine/8255ppi.h"
diff --git a/src/mame/drivers/segaorun.c b/src/mame/drivers/segaorun.c
index 526da5a6b7d..1ed900b1193 100644
--- a/src/mame/drivers/segaorun.c
+++ b/src/mame/drivers/segaorun.c
@@ -14,6 +14,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "system16.h"
 #include "machine/segaic16.h"
 #include "machine/8255ppi.h"
diff --git a/src/mame/drivers/segas16a.c b/src/mame/drivers/segas16a.c
index 4b580b376e3..43c2eb20f5e 100644
--- a/src/mame/drivers/segas16a.c
+++ b/src/mame/drivers/segas16a.c
@@ -132,6 +132,7 @@ Tetris         -         -         -         -         EPR12169  EPR12170  -
 */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "system16.h"
 #include "machine/8255ppi.h"
 #include "cpu/i8039/i8039.h"
diff --git a/src/mame/drivers/segas16b.c b/src/mame/drivers/segas16b.c
index 577094df948..116b31b3fdc 100644
--- a/src/mame/drivers/segas16b.c
+++ b/src/mame/drivers/segas16b.c
@@ -829,6 +829,7 @@ WW.B11    Object 5 - Even
 */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "system16.h"
 #include "machine/segaic16.h"
 #include "machine/fd1094.h"
diff --git a/src/mame/drivers/segas18.c b/src/mame/drivers/segas18.c
index e9447087a52..96cde5fbc0a 100644
--- a/src/mame/drivers/segas18.c
+++ b/src/mame/drivers/segas18.c
@@ -28,6 +28,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "machine/segaic16.h"
 #include "system16.h"
 #include "genesis.h"
diff --git a/src/mame/drivers/segas24.c b/src/mame/drivers/segas24.c
index 383d750237f..15264dd8bce 100644
--- a/src/mame/drivers/segas24.c
+++ b/src/mame/drivers/segas24.c
@@ -332,6 +332,7 @@ Notes:
 */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/m68000/m68k.h"
 #include "segas24.h"
 #include "system16.h"
diff --git a/src/mame/drivers/segas32.c b/src/mame/drivers/segas32.c
index 0be6ad06bca..a55e958cd4e 100644
--- a/src/mame/drivers/segas32.c
+++ b/src/mame/drivers/segas32.c
@@ -292,6 +292,7 @@ Stadium Cross EPR15093  EPR15094  EPR15018  EPR15019  EPR15192  EPR15020  EPR150
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "rendlay.h"
 #include "segas32.h"
 #include "machine/eeprom.h"
diff --git a/src/mame/drivers/segaxbd.c b/src/mame/drivers/segaxbd.c
index dfc46d79481..024aa56a0e8 100644
--- a/src/mame/drivers/segaxbd.c
+++ b/src/mame/drivers/segaxbd.c
@@ -20,6 +20,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "system16.h"
 #include "cpu/m68000/m68000.h"
 #include "machine/segaic16.h"
diff --git a/src/mame/drivers/segaybd.c b/src/mame/drivers/segaybd.c
index 9bc737aabe0..b85cabb65ae 100644
--- a/src/mame/drivers/segaybd.c
+++ b/src/mame/drivers/segaybd.c
@@ -10,6 +10,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "system16.h"
 #include "cpu/m68000/m68000.h"
 #include "machine/segaic16.h"
diff --git a/src/mame/drivers/seibuspi.c b/src/mame/drivers/seibuspi.c
index 367d5ff3c6e..4203b2ec349 100644
--- a/src/mame/drivers/seibuspi.c
+++ b/src/mame/drivers/seibuspi.c
@@ -669,6 +669,7 @@ Notes:
 */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "machine/ds2404.h"
 #include "machine/eeprom.h"
 #include "machine/intelfsh.h"
diff --git a/src/mame/drivers/seicross.c b/src/mame/drivers/seicross.c
index 561c87dbe6e..ad5291c065d 100644
--- a/src/mame/drivers/seicross.c
+++ b/src/mame/drivers/seicross.c
@@ -43,6 +43,7 @@ This info came from http://www.ne.jp/asahi/cc-sakura/akkun/old/fryski.html
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "sound/ay8910.h"
 #include "sound/dac.h"
 
diff --git a/src/mame/drivers/senjyo.c b/src/mame/drivers/senjyo.c
index 53180b93ce4..b555b89024b 100644
--- a/src/mame/drivers/senjyo.c
+++ b/src/mame/drivers/senjyo.c
@@ -69,6 +69,7 @@ I/O read/write
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "machine/z80ctc.h"
 #include "machine/z80pio.h"
 #include "sound/sn76496.h"
diff --git a/src/mame/drivers/seta.c b/src/mame/drivers/seta.c
index 2987170b3f7..86ce56f1d65 100644
--- a/src/mame/drivers/seta.c
+++ b/src/mame/drivers/seta.c
@@ -1283,6 +1283,7 @@ Note: on screen copyright is (c)1998 Coinmaster.
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "seta.h"
 #include "machine/6821pia.h"
 #include "machine/6850acia.h"
diff --git a/src/mame/drivers/seta2.c b/src/mame/drivers/seta2.c
index a40dcb6fca2..630b05e92d9 100644
--- a/src/mame/drivers/seta2.c
+++ b/src/mame/drivers/seta2.c
@@ -291,6 +291,7 @@ U38 - U40 Mask roms (Graphics 23c64020 64Mbit) - 23C64020 read as 27C322 with pi
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "machine/tmp68301.h"
 #include "machine/eeprom.h"
 #include "sound/x1_010.h"
diff --git a/src/mame/drivers/sf.c b/src/mame/drivers/sf.c
index 5c3854e9ae8..90872ba6120 100644
--- a/src/mame/drivers/sf.c
+++ b/src/mame/drivers/sf.c
@@ -10,6 +10,7 @@ TODO:
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/z80/z80.h"
 #include "cpu/m68000/m68000.h"
 #include "sound/2151intf.h"
diff --git a/src/mame/drivers/sg1000a.c b/src/mame/drivers/sg1000a.c
index d4127b6a769..2990af2dc37 100644
--- a/src/mame/drivers/sg1000a.c
+++ b/src/mame/drivers/sg1000a.c
@@ -112,6 +112,7 @@ CN4               CN5
 ******************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "sound/sn76496.h"
 #include "video/tms9928a.h"
 #include "machine/segacrpt.h"
diff --git a/src/mame/drivers/sgladiat.c b/src/mame/drivers/sgladiat.c
index 66e08693d11..9206880d57b 100644
--- a/src/mame/drivers/sgladiat.c
+++ b/src/mame/drivers/sgladiat.c
@@ -20,6 +20,7 @@ AT08XX03:
 */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/z80/z80.h"
 #include "snk.h"
 #include "sound/ay8910.h"
diff --git a/src/mame/drivers/shadfrce.c b/src/mame/drivers/shadfrce.c
index 835edc981f5..8fa79ecdbac 100644
--- a/src/mame/drivers/shadfrce.c
+++ b/src/mame/drivers/shadfrce.c
@@ -77,6 +77,7 @@ lev 7 : 0x7c : 0000 11d0 - just rte
 */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "sound/2151intf.h"
 #include "sound/okim6295.h"
 
diff --git a/src/mame/drivers/shangha3.c b/src/mame/drivers/shangha3.c
index 9ac79036e10..f14387e6076 100644
--- a/src/mame/drivers/shangha3.c
+++ b/src/mame/drivers/shangha3.c
@@ -20,6 +20,7 @@ blocken:
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/z80/z80.h"
 #include "sound/ay8910.h"
 #include "sound/okim6295.h"
diff --git a/src/mame/drivers/shanghai.c b/src/mame/drivers/shanghai.c
index 99ae7c1274f..64e25775820 100644
--- a/src/mame/drivers/shanghai.c
+++ b/src/mame/drivers/shanghai.c
@@ -20,6 +20,7 @@ TS 20050212:
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "audio/seibu.h"
 
 /* the on-chip FIFO is 16 bytes long, but we use a larger one to simplify */
diff --git a/src/mame/drivers/shangkid.c b/src/mame/drivers/shangkid.c
index 02d6cee01e7..f56644041f8 100644
--- a/src/mame/drivers/shangkid.c
+++ b/src/mame/drivers/shangkid.c
@@ -49,6 +49,7 @@ Games by Nihon Game/Culture Brain:
 */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/z80/z80.h"
 #include "sound/ay8910.h"
 #include "sound/dac.h"
diff --git a/src/mame/drivers/shootout.c b/src/mame/drivers/shootout.c
index 182e8bd1c80..eb179cb6b7d 100644
--- a/src/mame/drivers/shootout.c
+++ b/src/mame/drivers/shootout.c
@@ -38,6 +38,7 @@
 */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/m6502/m6502.h"
 #include "sound/2203intf.h"
 
diff --git a/src/mame/drivers/shougi.c b/src/mame/drivers/shougi.c
index 8d666e4e81b..57c1104fbe6 100644
--- a/src/mame/drivers/shougi.c
+++ b/src/mame/drivers/shougi.c
@@ -87,8 +87,8 @@ PROM  : Type MB7051
 
 
 
-#include <math.h>
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/z80/z80.h"
 #include "sound/ay8910.h"
 #include "video/resnet.h"
diff --git a/src/mame/drivers/shuuz.c b/src/mame/drivers/shuuz.c
index 41370c91063..b094c30aca4 100644
--- a/src/mame/drivers/shuuz.c
+++ b/src/mame/drivers/shuuz.c
@@ -18,6 +18,7 @@
 
 
 #include "driver.h"
+#include "deprecat.h"
 #include "machine/atarigen.h"
 #include "shuuz.h"
 #include "sound/okim6295.h"
diff --git a/src/mame/drivers/sidearms.c b/src/mame/drivers/sidearms.c
index 41393f5eba5..09967748360 100644
--- a/src/mame/drivers/sidearms.c
+++ b/src/mame/drivers/sidearms.c
@@ -36,6 +36,7 @@ Notes:
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "sound/2203intf.h"
 #include "sound/2151intf.h"
 
diff --git a/src/mame/drivers/sidepckt.c b/src/mame/drivers/sidepckt.c
index 0b37e106439..6f923d5a67a 100644
--- a/src/mame/drivers/sidepckt.c
+++ b/src/mame/drivers/sidepckt.c
@@ -14,6 +14,7 @@ i8751 protection simluation and other fixes by Bryan McPhail, 15/10/00.
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/m6809/m6809.h"
 #include "cpu/m6502/m6502.h"
 #include "sound/2203intf.h"
diff --git a/src/mame/drivers/silkroad.c b/src/mame/drivers/silkroad.c
index d46a163cd23..909b5a669aa 100644
--- a/src/mame/drivers/silkroad.c
+++ b/src/mame/drivers/silkroad.c
@@ -1,4 +1,5 @@
 #include "driver.h"
+#include "deprecat.h"
 #include "sound/2151intf.h"
 #include "sound/okim6295.h"
 
diff --git a/src/mame/drivers/simpl156.c b/src/mame/drivers/simpl156.c
index b6847e1395c..3a6134ccdc5 100644
--- a/src/mame/drivers/simpl156.c
+++ b/src/mame/drivers/simpl156.c
@@ -91,6 +91,7 @@ Are the OKI M6295 clocks from Heavy Smash are correct at least for the Mitchell
 extern void decrypt156(void);
 
 #include "driver.h"
+#include "deprecat.h"
 #include "decocrpt.h"
 #include "deco32.h"
 #include "cpu/arm/arm.h"
diff --git a/src/mame/drivers/simpsons.c b/src/mame/drivers/simpsons.c
index f85a9c647bd..abbed04fdc9 100644
--- a/src/mame/drivers/simpsons.c
+++ b/src/mame/drivers/simpsons.c
@@ -9,6 +9,7 @@ someone@secureshell.com
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/konami/konami.h" /* for the callback and the firq irq definition */
 #include "cpu/z80/z80.h"
 #include "video/konamiic.h"
diff --git a/src/mame/drivers/skullxbo.c b/src/mame/drivers/skullxbo.c
index f11a641c3b0..72622021b39 100644
--- a/src/mame/drivers/skullxbo.c
+++ b/src/mame/drivers/skullxbo.c
@@ -18,6 +18,7 @@
 
 
 #include "driver.h"
+#include "deprecat.h"
 #include "machine/atarigen.h"
 #include "audio/atarijsa.h"
 #include "skullxbo.h"
diff --git a/src/mame/drivers/skychut.c b/src/mame/drivers/skychut.c
index bed517a5560..56a5ba55312 100644
--- a/src/mame/drivers/skychut.c
+++ b/src/mame/drivers/skychut.c
@@ -102,6 +102,7 @@ Notes (couriersud)
 
 ***************************************************************************/
 #include "driver.h"
+#include "deprecat.h"
 #include "sound/samples.h"
 
 #include "skychut.h"
diff --git a/src/mame/drivers/skykid.c b/src/mame/drivers/skykid.c
index f534eea8b89..ecb6bbf89ee 100644
--- a/src/mame/drivers/skykid.c
+++ b/src/mame/drivers/skykid.c
@@ -14,6 +14,7 @@ Notes:
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/m6800/m6800.h"
 #include "sound/namco.h"
 
diff --git a/src/mame/drivers/skylncr.c b/src/mame/drivers/skylncr.c
index 191301c7134..9ac1ab2d5a9 100644
--- a/src/mame/drivers/skylncr.c
+++ b/src/mame/drivers/skylncr.c
@@ -9,6 +9,7 @@
 *************************************************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "sound/ay8910.h"
 
 static tilemap *tmap, *tmap2;
diff --git a/src/mame/drivers/slapshot.c b/src/mame/drivers/slapshot.c
index 5342c771b69..9764ba83329 100644
--- a/src/mame/drivers/slapshot.c
+++ b/src/mame/drivers/slapshot.c
@@ -132,6 +132,7 @@ Region byte at offset 0x031:
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/m68000/m68000.h"
 #include "video/taitoic.h"
 #include "audio/taitosnd.h"
diff --git a/src/mame/drivers/sliver.c b/src/mame/drivers/sliver.c
index f33c051691a..a75d15d5293 100644
--- a/src/mame/drivers/sliver.c
+++ b/src/mame/drivers/sliver.c
@@ -65,6 +65,7 @@ Notes:
 */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "sound/okim6295.h"
 #include "cpu/i8051/i8051.h"
 
diff --git a/src/mame/drivers/smstrv.c b/src/mame/drivers/smstrv.c
index 15b1b4d3de0..8ef72972aad 100644
--- a/src/mame/drivers/smstrv.c
+++ b/src/mame/drivers/smstrv.c
@@ -86,6 +86,7 @@ ROM text showed...
 */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "sound/ay8910.h"
 #include "machine/8255ppi.h"
 
diff --git a/src/mame/drivers/snk.c b/src/mame/drivers/snk.c
index aa01a97d19d..ad10d6dcd04 100644
--- a/src/mame/drivers/snk.c
+++ b/src/mame/drivers/snk.c
@@ -216,6 +216,7 @@ Credits (in alphabetical order)
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/z80/z80.h"
 #include "snk.h"
 #include "sound/3812intf.h"
diff --git a/src/mame/drivers/snk68.c b/src/mame/drivers/snk68.c
index 824122b22d0..c72485310c7 100644
--- a/src/mame/drivers/snk68.c
+++ b/src/mame/drivers/snk68.c
@@ -34,6 +34,7 @@ Notes:
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/z80/z80.h"
 #include "sound/3812intf.h"
 #include "sound/upd7759.h"
diff --git a/src/mame/drivers/snowbros.c b/src/mame/drivers/snowbros.c
index 009d7cdd4bf..c9cac2266bd 100644
--- a/src/mame/drivers/snowbros.c
+++ b/src/mame/drivers/snowbros.c
@@ -63,6 +63,7 @@ out of the sprite list at that point.. (verify on real hw)
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/m68000/m68000.h"
 #include "cpu/z80/z80.h"
 #include "sound/2151intf.h"
diff --git a/src/mame/drivers/solomon.c b/src/mame/drivers/solomon.c
index d8e1aca3e23..8e259b3ffa6 100644
--- a/src/mame/drivers/solomon.c
+++ b/src/mame/drivers/solomon.c
@@ -6,6 +6,7 @@ driver by Mirko Buffoni
 
 ***************************************************************************/
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/z80/z80.h"
 #include "sound/ay8910.h"
 
diff --git a/src/mame/drivers/sonson.c b/src/mame/drivers/sonson.c
index a67029cc001..a1b1c12cd18 100644
--- a/src/mame/drivers/sonson.c
+++ b/src/mame/drivers/sonson.c
@@ -48,6 +48,7 @@ TODO:
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/m6809/m6809.h"
 #include "sound/ay8910.h"
 
diff --git a/src/mame/drivers/spaceg.c b/src/mame/drivers/spaceg.c
index 63fac3e170d..819c0f68474 100644
--- a/src/mame/drivers/spaceg.c
+++ b/src/mame/drivers/spaceg.c
@@ -1,4 +1,5 @@
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/z80/z80.h"
 #include "sound/dac.h"
 #include "sound/sn76496.h"
diff --git a/src/mame/drivers/spbactn.c b/src/mame/drivers/spbactn.c
index dddf24da581..0805c3a2816 100644
--- a/src/mame/drivers/spbactn.c
+++ b/src/mame/drivers/spbactn.c
@@ -126,6 +126,7 @@ cpu #0 (PC=00001A1A): unmapped memory word write to 00090030 = 00F7 & 00FF
 *******************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "sound/okim6295.h"
 #include "sound/3812intf.h"
 
diff --git a/src/mame/drivers/spcforce.c b/src/mame/drivers/spcforce.c
index 5ed0b14724f..2512bfcac36 100644
--- a/src/mame/drivers/spcforce.c
+++ b/src/mame/drivers/spcforce.c
@@ -32,6 +32,7 @@ a000-a3ff   R/W X/Y scroll position of each character (can be scrolled up
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/i8085/i8085.h"
 #include "cpu/i8039/i8039.h"
 #include "sound/sn76496.h"
diff --git a/src/mame/drivers/spdodgeb.c b/src/mame/drivers/spdodgeb.c
index d922d4a7cef..efc3db486bc 100644
--- a/src/mame/drivers/spdodgeb.c
+++ b/src/mame/drivers/spdodgeb.c
@@ -22,6 +22,7 @@ Notes:
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/m6809/m6809.h"
 #include "sound/3812intf.h"
 #include "sound/msm5205.h"
diff --git a/src/mame/drivers/speedspn.c b/src/mame/drivers/speedspn.c
index c80879a234e..982e80fc204 100644
--- a/src/mame/drivers/speedspn.c
+++ b/src/mame/drivers/speedspn.c
@@ -21,6 +21,7 @@ TODO:
 ******************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "sound/okim6295.h"
 
 /*** README INFO **************************************************************
diff --git a/src/mame/drivers/spiders.c b/src/mame/drivers/spiders.c
index 3b8ac0fb1e2..5d9cfb242d7 100644
--- a/src/mame/drivers/spiders.c
+++ b/src/mame/drivers/spiders.c
@@ -189,6 +189,7 @@
 
 #include "driver.h"
 #include "rescap.h"
+#include "deprecat.h"
 #include "cpu/m6800/m6800.h"
 #include "cpu/m6809/m6809.h"
 #include "video/crtc6845.h"
diff --git a/src/mame/drivers/splash.c b/src/mame/drivers/splash.c
index 2f9e5cdf797..4d0b5eb220e 100644
--- a/src/mame/drivers/splash.c
+++ b/src/mame/drivers/splash.c
@@ -42,6 +42,7 @@ TS 2006.12.22:
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/z80/z80.h"
 #include "cpu/m68000/m68000.h"
 #include "sound/2203intf.h"
diff --git a/src/mame/drivers/sprint8.c b/src/mame/drivers/sprint8.c
index fec52b8e971..937ed9659d1 100644
--- a/src/mame/drivers/sprint8.c
+++ b/src/mame/drivers/sprint8.c
@@ -5,6 +5,7 @@ Atari Sprint 8 driver
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "includes/sprint8.h"
 
 static int steer_dir[8];
diff --git a/src/mame/drivers/spy.c b/src/mame/drivers/spy.c
index 9c4cbc04bc9..a91aedd960c 100644
--- a/src/mame/drivers/spy.c
+++ b/src/mame/drivers/spy.c
@@ -18,6 +18,7 @@ Revisions:
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/m6809/m6809.h"
 #include "video/konamiic.h"
 #include "sound/3812intf.h"
diff --git a/src/mame/drivers/srmp6.c b/src/mame/drivers/srmp6.c
index fe962f703dc..51afacf4f0e 100644
--- a/src/mame/drivers/srmp6.c
+++ b/src/mame/drivers/srmp6.c
@@ -67,6 +67,7 @@ Dumped 06/15/2000
 
 
 #include "driver.h"
+#include "deprecat.h"
 
 static UINT16* tileram;
 static UINT8* dirty_tileram;
diff --git a/src/mame/drivers/ssfindo.c b/src/mame/drivers/ssfindo.c
index 1009e6a7b35..fd8bf6b9b4f 100644
--- a/src/mame/drivers/ssfindo.c
+++ b/src/mame/drivers/ssfindo.c
@@ -121,6 +121,7 @@ Notes:
 */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/arm7/arm7core.h"
 
 enum
diff --git a/src/mame/drivers/sshangha.c b/src/mame/drivers/sshangha.c
index 22039ec1b2e..f85c5eef407 100644
--- a/src/mame/drivers/sshangha.c
+++ b/src/mame/drivers/sshangha.c
@@ -52,6 +52,7 @@ Stephh's notes (based on the games M68000 code and some tests) :
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "sound/2203intf.h"
 #include "sound/okim6295.h"
 
diff --git a/src/mame/drivers/sslam.c b/src/mame/drivers/sslam.c
index 1e584ddd8cc..a2201bd32bc 100644
--- a/src/mame/drivers/sslam.c
+++ b/src/mame/drivers/sslam.c
@@ -81,6 +81,7 @@ Notes:
 
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/i8051/i8051.h"
 #include "sound/okim6295.h"
 
diff --git a/src/mame/drivers/ssozumo.c b/src/mame/drivers/ssozumo.c
index 8d37cf0ca4f..187d38f1e3f 100644
--- a/src/mame/drivers/ssozumo.c
+++ b/src/mame/drivers/ssozumo.c
@@ -8,6 +8,7 @@ Driver by Takahiro Nogi (nogi@kt.rim.or.jp) 1999/10/04
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/m6502/m6502.h"
 #include "cpu/m6809/m6809.h"
 #include "sound/ay8910.h"
diff --git a/src/mame/drivers/sspeedr.c b/src/mame/drivers/sspeedr.c
index 087df371608..ff3a4b40234 100644
--- a/src/mame/drivers/sspeedr.c
+++ b/src/mame/drivers/sspeedr.c
@@ -5,6 +5,7 @@ Taito Super Speed Race driver
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 
 #include "sspeedr.lh"
 
diff --git a/src/mame/drivers/ssv.c b/src/mame/drivers/ssv.c
index 4d99933f4a3..c820068c10a 100644
--- a/src/mame/drivers/ssv.c
+++ b/src/mame/drivers/ssv.c
@@ -180,12 +180,11 @@ Notes:
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "machine/eeprom.h"
 #include "sound/es5506.h"
 #include "seta.h"
 
-#include <math.h>
-
 /***************************************************************************
 
 
diff --git a/src/mame/drivers/stadhero.c b/src/mame/drivers/stadhero.c
index e4f0a9ad1fb..7f400e37a7f 100644
--- a/src/mame/drivers/stadhero.c
+++ b/src/mame/drivers/stadhero.c
@@ -7,6 +7,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/m6502/m6502.h"
 #include "sound/2203intf.h"
 #include "sound/3812intf.h"
diff --git a/src/mame/drivers/starshp1.c b/src/mame/drivers/starshp1.c
index 07b9bc6e30a..e246df59485 100644
--- a/src/mame/drivers/starshp1.c
+++ b/src/mame/drivers/starshp1.c
@@ -8,6 +8,7 @@ Atari Starship 1 driver
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "includes/starshp1.h"
 
 int starshp1_attract;
diff --git a/src/mame/drivers/starwars.c b/src/mame/drivers/starwars.c
index 11bcc7c5363..eccd20881cf 100644
--- a/src/mame/drivers/starwars.c
+++ b/src/mame/drivers/starwars.c
@@ -23,6 +23,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/m6809/m6809.h"
 #include "video/vector.h"
 #include "video/avgdvg.h"
diff --git a/src/mame/drivers/steaser.c b/src/mame/drivers/steaser.c
index 012215c5256..9b01fa17549 100644
--- a/src/mame/drivers/steaser.c
+++ b/src/mame/drivers/steaser.c
@@ -35,6 +35,7 @@ ROMs
 
 
 #include "driver.h"
+#include "deprecat.h"
 
 static VIDEO_START(steaser)
 {
diff --git a/src/mame/drivers/stepstag.c b/src/mame/drivers/stepstag.c
index 17980de20e4..9d182df2e9f 100644
--- a/src/mame/drivers/stepstag.c
+++ b/src/mame/drivers/stepstag.c
@@ -8,7 +8,7 @@
  */
 
 #include "driver.h"
-//#include "random.h"
+#include "deprecat.h"
 
 static READ16_HANDLER( unknown_read_0xc00000 )
 {
diff --git a/src/mame/drivers/strnskil.c b/src/mame/drivers/strnskil.c
index a2a550cd8a1..f95d41279d9 100644
--- a/src/mame/drivers/strnskil.c
+++ b/src/mame/drivers/strnskil.c
@@ -15,6 +15,7 @@ Notes:
 *****************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "sound/sn76496.h"
 
 static UINT8 *strnskil_sharedram;
diff --git a/src/mame/drivers/stv.c b/src/mame/drivers/stv.c
index c7c4a9e576a..ae8fb3736c7 100644
--- a/src/mame/drivers/stv.c
+++ b/src/mame/drivers/stv.c
@@ -166,6 +166,7 @@ cpu #0 (PC=0601023A): unmapped program memory dword write to 02000000 = 00000000
 */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "machine/eeprom.h"
 #include "cpu/sh2/sh2.h"
 #include "machine/stvcd.h"
diff --git a/src/mame/drivers/stvinit.c b/src/mame/drivers/stvinit.c
index f3d39018636..3bb7a64c91d 100644
--- a/src/mame/drivers/stvinit.c
+++ b/src/mame/drivers/stvinit.c
@@ -6,6 +6,7 @@ to be honest i think some of these cause more problems than they're worth ...
 */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "machine/eeprom.h"
 #include "cpu/sh2/sh2.h"
 #include "machine/stvprot.h"
diff --git a/src/mame/drivers/suna16.c b/src/mame/drivers/suna16.c
index 711dfdcb500..9d58c00c2e8 100644
--- a/src/mame/drivers/suna16.c
+++ b/src/mame/drivers/suna16.c
@@ -22,6 +22,7 @@ Year + Game                 By      Board      Hardware
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "sound/dac.h"
 #include "sound/2151intf.h"
 #include "sound/ay8910.h"
diff --git a/src/mame/drivers/suna8.c b/src/mame/drivers/suna8.c
index aed0c963b44..a5fa9e0b92f 100644
--- a/src/mame/drivers/suna8.c
+++ b/src/mame/drivers/suna8.c
@@ -36,6 +36,7 @@ Notes:
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/z80/z80.h"
 #include "sound/ay8910.h"
 #include "sound/2203intf.h"
diff --git a/src/mame/drivers/supbtime.c b/src/mame/drivers/supbtime.c
index 3a985d1a2ff..b7ca669b416 100644
--- a/src/mame/drivers/supbtime.c
+++ b/src/mame/drivers/supbtime.c
@@ -21,6 +21,7 @@ down hardware (it doesn't write any good sound data btw, mostly zeros).
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/h6280/h6280.h"
 #include "sound/2151intf.h"
 #include "sound/okim6295.h"
diff --git a/src/mame/drivers/superchs.c b/src/mame/drivers/superchs.c
index a3c8d97c760..defb7f71b7a 100644
--- a/src/mame/drivers/superchs.c
+++ b/src/mame/drivers/superchs.c
@@ -34,6 +34,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/m68000/m68000.h"
 #include "video/taitoic.h"
 #include "audio/taitosnd.h"
diff --git a/src/mame/drivers/superdq.c b/src/mame/drivers/superdq.c
index 6a66eca992c..e2a0090e9ec 100644
--- a/src/mame/drivers/superdq.c
+++ b/src/mame/drivers/superdq.c
@@ -22,6 +22,7 @@
 
 #include "driver.h"
 #include "render.h"
+#include "deprecat.h"
 #include "sound/sn76496.h"
 #include "sound/custom.h"
 #include "machine/laserdsc.h"
diff --git a/src/mame/drivers/superqix.c b/src/mame/drivers/superqix.c
index 224d17ac4e0..e043b199ccf 100644
--- a/src/mame/drivers/superqix.c
+++ b/src/mame/drivers/superqix.c
@@ -107,6 +107,7 @@ DSW2 stored @ $f237
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/m6805/m6805.h"
 #include "sound/ay8910.h"
 #include "sound/samples.h"
diff --git a/src/mame/drivers/supertnk.c b/src/mame/drivers/supertnk.c
index 3114bbf34e3..b7879a6d97f 100644
--- a/src/mame/drivers/supertnk.c
+++ b/src/mame/drivers/supertnk.c
@@ -96,6 +96,7 @@ CRU lines:
 
 
 #include "driver.h"
+#include "deprecat.h"
 #include "sound/ay8910.h"
 
 
diff --git a/src/mame/drivers/suprgolf.c b/src/mame/drivers/suprgolf.c
index 00a5b011b95..cb53f80892e 100644
--- a/src/mame/drivers/suprgolf.c
+++ b/src/mame/drivers/suprgolf.c
@@ -15,6 +15,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "sound/2203intf.h"
 
 static tilemap *suprgolf_tilemap;
diff --git a/src/mame/drivers/suprloco.c b/src/mame/drivers/suprloco.c
index e352de2797f..71efa40836e 100644
--- a/src/mame/drivers/suprloco.c
+++ b/src/mame/drivers/suprloco.c
@@ -12,6 +12,7 @@ TODO:
 ******************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "video/system1.h"
 #include "cpu/z80/z80.h"
 #include "machine/segacrpt.h"
diff --git a/src/mame/drivers/suprnova.c b/src/mame/drivers/suprnova.c
index a7eb1224043..db3c83e35d7 100644
--- a/src/mame/drivers/suprnova.c
+++ b/src/mame/drivers/suprnova.c
@@ -174,6 +174,7 @@ NEP-16
 */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "sound/ymz280b.h"
 
 #define BIOS_SKIP 1 // Skip Bios as it takes too long and doesn't complete atm.
diff --git a/src/mame/drivers/suprridr.c b/src/mame/drivers/suprridr.c
index 378ae48b555..2bc1b8cd619 100644
--- a/src/mame/drivers/suprridr.c
+++ b/src/mame/drivers/suprridr.c
@@ -80,6 +80,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "suprridr.h"
 #include "sound/ay8910.h"
 
diff --git a/src/mame/drivers/suprslam.c b/src/mame/drivers/suprslam.c
index e5274defcda..fb7288196a1 100644
--- a/src/mame/drivers/suprslam.c
+++ b/src/mame/drivers/suprslam.c
@@ -81,6 +81,7 @@ EB26IC73.BIN    27C240      /  Main Program
 ******************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "video/konamiic.h"
 #include "sound/2610intf.h"
 
diff --git a/src/mame/drivers/surpratk.c b/src/mame/drivers/surpratk.c
index 9e0e7d564fe..250ac3ebc66 100644
--- a/src/mame/drivers/surpratk.c
+++ b/src/mame/drivers/surpratk.c
@@ -9,6 +9,7 @@ driver by Nicola Salmoria
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/konami/konami.h" /* for the callback and the firq irq definition */
 #include "video/konamiic.h"
 #include "sound/2151intf.h"
diff --git a/src/mame/drivers/system1.c b/src/mame/drivers/system1.c
index a319bb6c13d..cf5b36fde97 100644
--- a/src/mame/drivers/system1.c
+++ b/src/mame/drivers/system1.c
@@ -17,6 +17,7 @@ TODO: - background is misplaced in wbmlju
 ******************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "video/system1.h"
 #include "cpu/z80/z80.h"
 #include "machine/segacrpt.h"
diff --git a/src/mame/drivers/system16.c b/src/mame/drivers/system16.c
index 2464566a426..efc66ae7c6e 100644
--- a/src/mame/drivers/system16.c
+++ b/src/mame/drivers/system16.c
@@ -147,6 +147,7 @@ Notes:
 */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/z80/z80.h"
 #include "cpu/i8039/i8039.h"
 #include "system16.h"
diff --git a/src/mame/drivers/system18.c b/src/mame/drivers/system18.c
index deedbc82137..e4858c58930 100644
--- a/src/mame/drivers/system18.c
+++ b/src/mame/drivers/system18.c
@@ -62,6 +62,7 @@ Other notes:
 */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/z80/z80.h"
 #include "system16.h"
 #include "cpu/m68000/m68000.h"
diff --git a/src/mame/drivers/tagteam.c b/src/mame/drivers/tagteam.c
index 6d45c6cce6e..cf7c436391f 100644
--- a/src/mame/drivers/tagteam.c
+++ b/src/mame/drivers/tagteam.c
@@ -25,6 +25,7 @@ TODO:
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/m6502/m6502.h"
 #include "sound/ay8910.h"
 #include "sound/dac.h"
diff --git a/src/mame/drivers/tail2nos.c b/src/mame/drivers/tail2nos.c
index a8cee7e3fdb..9e4597f7a96 100644
--- a/src/mame/drivers/tail2nos.c
+++ b/src/mame/drivers/tail2nos.c
@@ -10,6 +10,7 @@ press F1+F3 to see ROM/RAM tests and the final animation
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "video/konamiic.h"
 #include "cpu/z80/z80.h"
 #include "sound/2608intf.h"
diff --git a/src/mame/drivers/taito_b.c b/src/mame/drivers/taito_b.c
index 5bb57f6a1a7..03e16ae3738 100644
--- a/src/mame/drivers/taito_b.c
+++ b/src/mame/drivers/taito_b.c
@@ -168,6 +168,7 @@ Notes:
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/m68000/m68000.h"
 #include "video/taitoic.h"
 #include "machine/eeprom.h"
diff --git a/src/mame/drivers/taito_f2.c b/src/mame/drivers/taito_f2.c
index c04ff702b49..6788a56c0ff 100644
--- a/src/mame/drivers/taito_f2.c
+++ b/src/mame/drivers/taito_f2.c
@@ -289,6 +289,7 @@ Notes:
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/m68000/m68000.h"
 #include "video/taitoic.h"
 #include "audio/taitosnd.h"
diff --git a/src/mame/drivers/taito_f3.c b/src/mame/drivers/taito_f3.c
index 928a0a213b4..a755b045b9c 100644
--- a/src/mame/drivers/taito_f3.c
+++ b/src/mame/drivers/taito_f3.c
@@ -36,6 +36,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "machine/eeprom.h"
 #include "taito_f3.h"
 #include "sound/es5506.h"
diff --git a/src/mame/drivers/taito_h.c b/src/mame/drivers/taito_h.c
index 8108b4821b7..28d5a3601bc 100644
--- a/src/mame/drivers/taito_h.c
+++ b/src/mame/drivers/taito_h.c
@@ -128,6 +128,7 @@ Recordbr: loads of unmapped IOC reads and writes.
 
 
 #include "driver.h"
+#include "deprecat.h"
 #include "taitoipt.h"
 #include "audio/taitosnd.h"
 #include "video/taitoic.h"
diff --git a/src/mame/drivers/taito_l.c b/src/mame/drivers/taito_l.c
index 37bac651202..9004b21ed33 100644
--- a/src/mame/drivers/taito_l.c
+++ b/src/mame/drivers/taito_l.c
@@ -44,6 +44,7 @@ TODO:
 
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/z80/z80.h"
 #include "audio/taitosnd.h"
 #include "sound/2203intf.h"
diff --git a/src/mame/drivers/taito_x.c b/src/mame/drivers/taito_x.c
index a7aaa1c2447..831a591d2a0 100644
--- a/src/mame/drivers/taito_x.c
+++ b/src/mame/drivers/taito_x.c
@@ -311,6 +311,7 @@ Stephh's notes (based on the game M68000 code and some tests) :
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "taitoipt.h"
 #include "audio/taitosnd.h"
 #include "seta.h"
diff --git a/src/mame/drivers/taito_z.c b/src/mame/drivers/taito_z.c
index d78ffe5d243..e6796752dd1 100644
--- a/src/mame/drivers/taito_z.c
+++ b/src/mame/drivers/taito_z.c
@@ -771,6 +771,7 @@ J1100256A VIDEO PCB
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/m68000/m68000.h"
 #include "machine/eeprom.h"
 #include "video/taitoic.h"
diff --git a/src/mame/drivers/taitoair.c b/src/mame/drivers/taitoair.c
index ec9aa08a652..5efb14d8bde 100644
--- a/src/mame/drivers/taitoair.c
+++ b/src/mame/drivers/taitoair.c
@@ -216,6 +216,7 @@ cpu #2 (PC=0000060E): unmapped memory word read from 0000683A & FFFF
 ****************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "taitoipt.h"
 #include "audio/taitosnd.h"
 #include "video/taitoic.h"
diff --git a/src/mame/drivers/taitojc.c b/src/mame/drivers/taitojc.c
index 05fad67a483..33f58727855 100644
--- a/src/mame/drivers/taitojc.c
+++ b/src/mame/drivers/taitojc.c
@@ -350,6 +350,7 @@ Notes:
 */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "taito_f3.h"
 #include "cpu/mc68hc11/mc68hc11.h"
 #include "sound/es5506.h"
diff --git a/src/mame/drivers/taitosj.c b/src/mame/drivers/taitosj.c
index c7d9893747c..c8325a08a79 100644
--- a/src/mame/drivers/taitosj.c
+++ b/src/mame/drivers/taitosj.c
@@ -164,6 +164,7 @@ TODO:
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/z80/z80.h"
 #include "cpu/m6805/m6805.h"
 #include "sound/ay8910.h"
diff --git a/src/mame/drivers/taitowlf.c b/src/mame/drivers/taitowlf.c
index 316c0d0f43b..1a931490664 100644
--- a/src/mame/drivers/taitowlf.c
+++ b/src/mame/drivers/taitowlf.c
@@ -5,6 +5,7 @@
 
 #include "driver.h"
 #include "memconv.h"
+#include "deprecat.h"
 #include "machine/8237dma.h"
 #include "machine/pic8259.h"
 #include "machine/pit8253.h"
diff --git a/src/mame/drivers/talbot.c b/src/mame/drivers/talbot.c
index 9265bffb22f..b41e5453330 100644
--- a/src/mame/drivers/talbot.c
+++ b/src/mame/drivers/talbot.c
@@ -8,6 +8,7 @@ ALPHA 8201 MCU handling by Tatsuyuki satoh
 */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "sound/ay8910.h"
 
 static tilemap *bg_tilemap;
diff --git a/src/mame/drivers/tank8.c b/src/mame/drivers/tank8.c
index 88e834ac7d7..116423253e4 100644
--- a/src/mame/drivers/tank8.c
+++ b/src/mame/drivers/tank8.c
@@ -5,6 +5,7 @@ Atari Tank 8 driver
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "tank8.h"
 #include "sound/discrete.h"
 
diff --git a/src/mame/drivers/tankbatt.c b/src/mame/drivers/tankbatt.c
index f6fb46e28e9..c21e15333d4 100644
--- a/src/mame/drivers/tankbatt.c
+++ b/src/mame/drivers/tankbatt.c
@@ -56,6 +56,7 @@ Known issues:
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/m6502/m6502.h"
 #include "sound/samples.h"
 
diff --git a/src/mame/drivers/taotaido.c b/src/mame/drivers/taotaido.c
index a0a66df9f59..4dc639c34d1 100644
--- a/src/mame/drivers/taotaido.c
+++ b/src/mame/drivers/taotaido.c
@@ -64,6 +64,7 @@ zooming might be wrong
 
 
 #include "driver.h"
+#include "deprecat.h"
 #include "sound/2610intf.h"
 
 #define TAOTAIDO_SHOW_ALL_INPUTS	0
diff --git a/src/mame/drivers/tatsumi.c b/src/mame/drivers/tatsumi.c
index 7d15d6ba6f9..ef3179e5f3b 100644
--- a/src/mame/drivers/tatsumi.c
+++ b/src/mame/drivers/tatsumi.c
@@ -138,6 +138,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "tatsumi.h"
 #include "sound/2151intf.h"
 #include "sound/okim6295.h"
diff --git a/src/mame/drivers/tbowl.c b/src/mame/drivers/tbowl.c
index 9c442d15069..eb8e0e0712a 100644
--- a/src/mame/drivers/tbowl.c
+++ b/src/mame/drivers/tbowl.c
@@ -13,6 +13,7 @@ Might be some priority glitches
 ***/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/z80/z80.h"
 #include "sound/3812intf.h"
 #include "sound/msm5205.h"
diff --git a/src/mame/drivers/tecmo.c b/src/mame/drivers/tecmo.c
index 16af575b47d..b50f22ae8f2 100644
--- a/src/mame/drivers/tecmo.c
+++ b/src/mame/drivers/tecmo.c
@@ -46,6 +46,7 @@ f80b      ????
 
 ***************************************************************************/
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/z80/z80.h"
 #include "sound/3812intf.h"
 #include "sound/msm5205.h"
diff --git a/src/mame/drivers/tecmo16.c b/src/mame/drivers/tecmo16.c
index bc062d85cbb..deafeaa0eea 100644
--- a/src/mame/drivers/tecmo16.c
+++ b/src/mame/drivers/tecmo16.c
@@ -24,6 +24,7 @@ Notes:
 ******************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/m68000/m68000.h"
 #include "cpu/z80/z80.h"
 #include "sound/2151intf.h"
diff --git a/src/mame/drivers/tecmosys.c b/src/mame/drivers/tecmosys.c
index 6b7b0a1a6fe..5179507e189 100644
--- a/src/mame/drivers/tecmosys.c
+++ b/src/mame/drivers/tecmosys.c
@@ -102,6 +102,7 @@ ae500w07.ad1 - M6295 Samples (23c4001)
 */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "machine/eeprom.h"
 #include "cpu/m68000/m68k.h"
 #include "sound/okim6295.h"
diff --git a/src/mame/drivers/tehkanwc.c b/src/mame/drivers/tehkanwc.c
index 3a208100646..ffd746f817a 100644
--- a/src/mame/drivers/tehkanwc.c
+++ b/src/mame/drivers/tehkanwc.c
@@ -95,6 +95,7 @@ TO DO :
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/z80/z80.h"
 #include "sound/ay8910.h"
 #include "sound/msm5205.h"
diff --git a/src/mame/drivers/tempest.c b/src/mame/drivers/tempest.c
index 5ccd39aa2dc..911aeedd8b6 100644
--- a/src/mame/drivers/tempest.c
+++ b/src/mame/drivers/tempest.c
@@ -278,6 +278,7 @@ Version 1 for Tempest Analog Vector-Generator PCB Assembly A037383-01 or A037383
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "machine/mathbox.h"
 #include "video/avgdvg.h"
 #include "video/vector.h"
diff --git a/src/mame/drivers/tetrisp2.c b/src/mame/drivers/tetrisp2.c
index 95ead03b894..f1e84fc5ad2 100644
--- a/src/mame/drivers/tetrisp2.c
+++ b/src/mame/drivers/tetrisp2.c
@@ -34,6 +34,7 @@ Notes:
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "sound/ymz280b.h"
 #include "rocknms.lh"
 
diff --git a/src/mame/drivers/tetriunk.c b/src/mame/drivers/tetriunk.c
index d830c0c18ae..c0cd450b35e 100644
--- a/src/mame/drivers/tetriunk.c
+++ b/src/mame/drivers/tetriunk.c
@@ -9,6 +9,7 @@
 */
 
 #include "driver.h"
+#include "deprecat.h"
 
 static int crtindex;
 static int crtdata[256];
diff --git a/src/mame/drivers/thayers.c b/src/mame/drivers/thayers.c
index b3fcdf23377..e5e90407af5 100644
--- a/src/mame/drivers/thayers.c
+++ b/src/mame/drivers/thayers.c
@@ -15,6 +15,7 @@ Todo:
 
 #include "driver.h"
 #include "render.h"
+#include "deprecat.h"
 #include "machine/laserdsc.h"
 #include "cpu/cop400/cop400.h"
 
diff --git a/src/mame/drivers/thedeep.c b/src/mame/drivers/thedeep.c
index cad6228a24e..9050645acd6 100644
--- a/src/mame/drivers/thedeep.c
+++ b/src/mame/drivers/thedeep.c
@@ -25,6 +25,7 @@ Notes:
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "thedeep.h"
 #include "sound/2203intf.h"
 
diff --git a/src/mame/drivers/thunderj.c b/src/mame/drivers/thunderj.c
index 55e6044334e..45c6833e3b7 100644
--- a/src/mame/drivers/thunderj.c
+++ b/src/mame/drivers/thunderj.c
@@ -18,6 +18,7 @@
 
 
 #include "driver.h"
+#include "deprecat.h"
 #include "machine/atarigen.h"
 #include "audio/atarijsa.h"
 #include "thunderj.h"
diff --git a/src/mame/drivers/thunderx.c b/src/mame/drivers/thunderx.c
index dfcf66fa559..34feb4f5009 100644
--- a/src/mame/drivers/thunderx.c
+++ b/src/mame/drivers/thunderx.c
@@ -9,6 +9,7 @@ K052591 emulation by Eddie Edwards
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/konami/konami.h" /* for the callback and the firq irq definition */
 #include "video/konamiic.h"
 #include "sound/2151intf.h"
diff --git a/src/mame/drivers/tigeroad.c b/src/mame/drivers/tigeroad.c
index bf4d485a842..3fc1263ef34 100644
--- a/src/mame/drivers/tigeroad.c
+++ b/src/mame/drivers/tigeroad.c
@@ -20,6 +20,7 @@ Memory Overview:
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/z80/z80.h"
 #include "sound/2203intf.h"
 #include "sound/msm5205.h"
diff --git a/src/mame/drivers/timelimt.c b/src/mame/drivers/timelimt.c
index 38593cc45d8..0eaacb3a03f 100644
--- a/src/mame/drivers/timelimt.c
+++ b/src/mame/drivers/timelimt.c
@@ -11,6 +11,7 @@ Notes:
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "sound/ay8910.h"
 
 /* from video */
diff --git a/src/mame/drivers/tmaster.c b/src/mame/drivers/tmaster.c
index bef7cf1dede..61ae933863d 100644
--- a/src/mame/drivers/tmaster.c
+++ b/src/mame/drivers/tmaster.c
@@ -25,6 +25,7 @@ To Do:
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "sound/okim6295.h"
 
 /***************************************************************************
diff --git a/src/mame/drivers/tmnt.c b/src/mame/drivers/tmnt.c
index 8841e4717ea..3a61143cdf5 100644
--- a/src/mame/drivers/tmnt.c
+++ b/src/mame/drivers/tmnt.c
@@ -64,8 +64,8 @@ Updates:
 
 ***************************************************************************/
 
-#include <math.h>
 #include "driver.h"
+#include "deprecat.h"
 #include "video/konamiic.h"
 #include "machine/eeprom.h"
 #include "cpu/m68000/m68000.h"
diff --git a/src/mame/drivers/tnzs.c b/src/mame/drivers/tnzs.c
index 6b8e61d4fe0..b1264174c88 100644
--- a/src/mame/drivers/tnzs.c
+++ b/src/mame/drivers/tnzs.c
@@ -218,6 +218,7 @@ Driver by Takahiro Nogi (nogi@kt.rim.or.jp) 1999/11/06
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/i8x41/i8x41.h"
 #include "sound/2203intf.h"
 #include "sound/dac.h"
diff --git a/src/mame/drivers/toaplan1.c b/src/mame/drivers/toaplan1.c
index a9e51a1c3ec..f46c0e47ae4 100644
--- a/src/mame/drivers/toaplan1.c
+++ b/src/mame/drivers/toaplan1.c
@@ -59,6 +59,7 @@ To Do:
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/tms32010/tms32010.h"
 #include "toaplan1.h"
 #include "sound/3812intf.h"
diff --git a/src/mame/drivers/toaplan2.c b/src/mame/drivers/toaplan2.c
index 8f21e80b9cd..4bddae5487d 100644
--- a/src/mame/drivers/toaplan2.c
+++ b/src/mame/drivers/toaplan2.c
@@ -276,6 +276,7 @@ To Do / Unknowns:
 
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/m68000/m68000.h"
 #include "cpu/z80/z80.h"
 #include "machine/eeprom.h"
diff --git a/src/mame/drivers/toki.c b/src/mame/drivers/toki.c
index 91555fb6eb6..5c36c1eeaef 100644
--- a/src/mame/drivers/toki.c
+++ b/src/mame/drivers/toki.c
@@ -35,6 +35,7 @@ for now. Even at 12 this slowdown still happens a little.
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/z80/z80.h"
 #include "audio/seibu.h"
 #include "sound/3812intf.h"
diff --git a/src/mame/drivers/toobin.c b/src/mame/drivers/toobin.c
index 696c3732c18..fd0e6150959 100644
--- a/src/mame/drivers/toobin.c
+++ b/src/mame/drivers/toobin.c
@@ -18,6 +18,7 @@
 
 
 #include "driver.h"
+#include "deprecat.h"
 #include "machine/atarigen.h"
 #include "audio/atarijsa.h"
 #include "toobin.h"
diff --git a/src/mame/drivers/topshoot.c b/src/mame/drivers/topshoot.c
index c0ecca6f487..981f1daf904 100644
--- a/src/mame/drivers/topshoot.c
+++ b/src/mame/drivers/topshoot.c
@@ -134,6 +134,7 @@ connector, but of course, I can be wrong.
 */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "genesis.h"
 
 
diff --git a/src/mame/drivers/topspeed.c b/src/mame/drivers/topspeed.c
index d9237736abb..9d5afd00a72 100644
--- a/src/mame/drivers/topspeed.c
+++ b/src/mame/drivers/topspeed.c
@@ -230,6 +230,7 @@ Stephh's notes (based on the game M68000 code and some tests) :
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "taitoipt.h"
 #include "cpu/m68000/m68000.h"
 #include "video/taitoic.h"
diff --git a/src/mame/drivers/toratora.c b/src/mame/drivers/toratora.c
index 61869838881..1597fbe55b4 100644
--- a/src/mame/drivers/toratora.c
+++ b/src/mame/drivers/toratora.c
@@ -18,6 +18,7 @@ TODO:
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "machine/6821pia.h"
 #include "sound/sn76477.h"
 
diff --git a/src/mame/drivers/toypop.c b/src/mame/drivers/toypop.c
index a96e8b9afc3..1703f24a3ce 100644
--- a/src/mame/drivers/toypop.c
+++ b/src/mame/drivers/toypop.c
@@ -30,6 +30,7 @@ TODO:
 ****************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "machine/namcoio.h"
 #include "sound/namco.h"
 
diff --git a/src/mame/drivers/tp84.c b/src/mame/drivers/tp84.c
index c197e6cb800..55d5b2b8ae5 100644
--- a/src/mame/drivers/tp84.c
+++ b/src/mame/drivers/tp84.c
@@ -82,6 +82,7 @@ C004      76489 #4 trigger
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "sound/sn76496.h"
 #include "sound/flt_rc.h"
 
diff --git a/src/mame/drivers/triplhnt.c b/src/mame/drivers/triplhnt.c
index 5cb73f012fd..d468f3f499a 100644
--- a/src/mame/drivers/triplhnt.c
+++ b/src/mame/drivers/triplhnt.c
@@ -11,6 +11,7 @@ To Do:
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "triplhnt.h"
 
 static UINT8 triplhnt_cmos[16];
diff --git a/src/mame/drivers/trvmadns.c b/src/mame/drivers/trvmadns.c
index 54f028b6b44..076af7a3a11 100644
--- a/src/mame/drivers/trvmadns.c
+++ b/src/mame/drivers/trvmadns.c
@@ -61,6 +61,7 @@ Technology = NMOS
 */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "sound/ay8910.h"
 
 static tilemap *bg_tilemap;
diff --git a/src/mame/drivers/trvquest.c b/src/mame/drivers/trvquest.c
index f5ade262c85..93e57ab3c5a 100644
--- a/src/mame/drivers/trvquest.c
+++ b/src/mame/drivers/trvquest.c
@@ -35,6 +35,7 @@ Notes:
 */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "machine/6522via.h"
 #include "sound/ay8910.h"
 
diff --git a/src/mame/drivers/tryout.c b/src/mame/drivers/tryout.c
index b163b609e79..f9a2d1dd57d 100644
--- a/src/mame/drivers/tryout.c
+++ b/src/mame/drivers/tryout.c
@@ -13,6 +13,7 @@
 ****************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "sound/2203intf.h"
 
 extern UINT8 *tryout_gfx_control;
diff --git a/src/mame/drivers/tsamurai.c b/src/mame/drivers/tsamurai.c
index d59bb5db6da..6cff97d804d 100644
--- a/src/mame/drivers/tsamurai.c
+++ b/src/mame/drivers/tsamurai.c
@@ -42,6 +42,7 @@ TODO:
 ****************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/z80/z80.h"
 #include "sound/ay8910.h"
 #include "sound/dac.h"
diff --git a/src/mame/drivers/ttchamp.c b/src/mame/drivers/ttchamp.c
index dd25610597a..ccebe725abd 100644
--- a/src/mame/drivers/ttchamp.c
+++ b/src/mame/drivers/ttchamp.c
@@ -42,6 +42,8 @@ The PCB is Spanish and manufacured by Gamart.
 */
 
 #include "driver.h"
+#include "deprecat.h"
+
 static UINT16 *peno_vram;
 
 
diff --git a/src/mame/drivers/tubep.c b/src/mame/drivers/tubep.c
index 9c7f0d187c9..de193803b15 100644
--- a/src/mame/drivers/tubep.c
+++ b/src/mame/drivers/tubep.c
@@ -99,6 +99,7 @@ TP-S.1 TP-S.2 TP-S.3 TP-B.1  8212 TP-B.2 TP-B.3          TP-B.4
 
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/z80/z80.h"
 #include "cpu/m6805/m6805.h"
 #include "sound/ay8910.h"
diff --git a/src/mame/drivers/tumbleb.c b/src/mame/drivers/tumbleb.c
index 0ea8487db32..28232fc849d 100644
--- a/src/mame/drivers/tumbleb.c
+++ b/src/mame/drivers/tumbleb.c
@@ -262,6 +262,7 @@ Stephh's notes (based on the games M68000 code and some tests) :
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/h6280/h6280.h"
 #include "decocrpt.h"
 #include "sound/2151intf.h"
diff --git a/src/mame/drivers/tumblep.c b/src/mame/drivers/tumblep.c
index 2eec953ce17..36328e4de17 100644
--- a/src/mame/drivers/tumblep.c
+++ b/src/mame/drivers/tumblep.c
@@ -40,6 +40,7 @@ Stephh's notes (based on the games M68000 code and some tests) :
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/h6280/h6280.h"
 #include "decocrpt.h"
 #include "sound/2151intf.h"
diff --git a/src/mame/drivers/turbo.c b/src/mame/drivers/turbo.c
index 4d402382401..fcfe73657ce 100644
--- a/src/mame/drivers/turbo.c
+++ b/src/mame/drivers/turbo.c
@@ -145,6 +145,7 @@
 **************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "machine/8255ppi.h"
 #include "turbo.h"
 #include "machine/segacrpt.h"
diff --git a/src/mame/drivers/turbosub.c b/src/mame/drivers/turbosub.c
index b25a79b50f6..765fb290c96 100644
--- a/src/mame/drivers/turbosub.c
+++ b/src/mame/drivers/turbosub.c
@@ -45,6 +45,7 @@ and hardware.
 ***********************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/m6809/m6809.h"
 
 /* Set to 1 to display test results and skip on errors */
diff --git a/src/mame/drivers/twin16.c b/src/mame/drivers/twin16.c
index 4abed3a9c36..855b7b07943 100644
--- a/src/mame/drivers/twin16.c
+++ b/src/mame/drivers/twin16.c
@@ -53,6 +53,7 @@ Known Issues:
 */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/m68000/m68000.h"
 #include "cpu/z80/z80.h"
 #include "sound/2151intf.h"
diff --git a/src/mame/drivers/twincobr.c b/src/mame/drivers/twincobr.c
index 07efef29bbf..d0481cf7bd9 100644
--- a/src/mame/drivers/twincobr.c
+++ b/src/mame/drivers/twincobr.c
@@ -188,6 +188,7 @@ Shark   Zame
 
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/m68000/m68000.h"
 #include "cpu/tms32010/tms32010.h"
 #include "twincobr.h"
diff --git a/src/mame/drivers/tx1.c b/src/mame/drivers/tx1.c
index 5aa870e8ad0..2fc238c6310 100644
--- a/src/mame/drivers/tx1.c
+++ b/src/mame/drivers/tx1.c
@@ -41,6 +41,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "sound/ay8910.h"
 #include "sound/custom.h"
 #include "cpu/i86/i86.h"
diff --git a/src/mame/drivers/uapce.c b/src/mame/drivers/uapce.c
index 9a0467b30a4..8ede94af288 100644
--- a/src/mame/drivers/uapce.c
+++ b/src/mame/drivers/uapce.c
@@ -24,6 +24,7 @@
 */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "machine/pcecommn.h"
 #include "video/vdc.h"
 #include "cpu/h6280/h6280.h"
diff --git a/src/mame/drivers/ultraman.c b/src/mame/drivers/ultraman.c
index e6984decc17..656524caed4 100644
--- a/src/mame/drivers/ultraman.c
+++ b/src/mame/drivers/ultraman.c
@@ -7,6 +7,7 @@ Driver by Manuel Abadia <manu@teleline.es>
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/z80/z80.h"
 #include "cpu/m68000/m68000.h"
 #include "video/konamiic.h"
diff --git a/src/mame/drivers/ultrsprt.c b/src/mame/drivers/ultrsprt.c
index 2ec29c76599..0a81dae3717 100644
--- a/src/mame/drivers/ultrsprt.c
+++ b/src/mame/drivers/ultrsprt.c
@@ -5,6 +5,7 @@
 */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/powerpc/ppc.h"
 #include "sound/k054539.h"
 #include "machine/eeprom.h"
diff --git a/src/mame/drivers/undrfire.c b/src/mame/drivers/undrfire.c
index 7d7c1d50198..ff7234c1fca 100644
--- a/src/mame/drivers/undrfire.c
+++ b/src/mame/drivers/undrfire.c
@@ -118,6 +118,7 @@ need to reproduce the $18141a calculations.
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/m68000/m68000.h"
 #include "video/taitoic.h"
 #include "audio/taitosnd.h"
diff --git a/src/mame/drivers/unico.c b/src/mame/drivers/unico.c
index 4d9c974925e..023e95d96f2 100644
--- a/src/mame/drivers/unico.c
+++ b/src/mame/drivers/unico.c
@@ -23,6 +23,7 @@ Year + Game         PCB             Notes
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "machine/eeprom.h"
 #include "unico.h"
 #include "sound/2151intf.h"
diff --git a/src/mame/drivers/vamphalf.c b/src/mame/drivers/vamphalf.c
index 094a523f634..91cfa02bb82 100644
--- a/src/mame/drivers/vamphalf.c
+++ b/src/mame/drivers/vamphalf.c
@@ -28,6 +28,7 @@
 *********************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "machine/eeprom.h"
 #include "sound/2151intf.h"
 #include "sound/okim6295.h"
diff --git a/src/mame/drivers/vaportra.c b/src/mame/drivers/vaportra.c
index fc3d71b804d..bfec3b5791f 100644
--- a/src/mame/drivers/vaportra.c
+++ b/src/mame/drivers/vaportra.c
@@ -9,6 +9,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/h6280/h6280.h"
 #include "sound/2203intf.h"
 #include "sound/2151intf.h"
diff --git a/src/mame/drivers/vastar.c b/src/mame/drivers/vastar.c
index ededd76f2a6..8fb2551fa01 100644
--- a/src/mame/drivers/vastar.c
+++ b/src/mame/drivers/vastar.c
@@ -62,6 +62,7 @@ write:
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "sound/ay8910.h"
 
 
diff --git a/src/mame/drivers/vball.c b/src/mame/drivers/vball.c
index 1b73a35c90c..312e6196785 100644
--- a/src/mame/drivers/vball.c
+++ b/src/mame/drivers/vball.c
@@ -88,6 +88,7 @@ VBlank = 58Hz
   *********************************************************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/m6502/m6502.h"
 #include "cpu/z80/z80.h"
 #include "sound/2151intf.h"
diff --git a/src/mame/drivers/vegaeo.c b/src/mame/drivers/vegaeo.c
index 642e4362977..1d40fcf7916 100644
--- a/src/mame/drivers/vegaeo.c
+++ b/src/mame/drivers/vegaeo.c
@@ -13,6 +13,7 @@
  *********************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "machine/at28c16.h"
 #include "eolithsp.h"
 
diff --git a/src/mame/drivers/vegas.c b/src/mame/drivers/vegas.c
index 467d84b0011..8e91cced032 100644
--- a/src/mame/drivers/vegas.c
+++ b/src/mame/drivers/vegas.c
@@ -273,6 +273,7 @@
 **************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/adsp2100/adsp2100.h"
 #include "cpu/mips/mips3.h"
 #include "audio/dcs.h"
diff --git a/src/mame/drivers/vendetta.c b/src/mame/drivers/vendetta.c
index e456786d7ab..977f970ea14 100644
--- a/src/mame/drivers/vendetta.c
+++ b/src/mame/drivers/vendetta.c
@@ -87,6 +87,7 @@ Notes:
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "video/konamiic.h"
 #include "cpu/konami/konami.h" /* for the callback and the firq irq definition */
 #include "machine/eeprom.h"
diff --git a/src/mame/drivers/vicdual.c b/src/mame/drivers/vicdual.c
index 0c48287387f..fe68db8a498 100644
--- a/src/mame/drivers/vicdual.c
+++ b/src/mame/drivers/vicdual.c
@@ -52,6 +52,7 @@
 ****************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "vicdual.h"
 
 
diff --git a/src/mame/drivers/videopin.c b/src/mame/drivers/videopin.c
index 0c0feff385f..813d8f81cac 100644
--- a/src/mame/drivers/videopin.c
+++ b/src/mame/drivers/videopin.c
@@ -11,6 +11,7 @@
 *************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "videopin.h"
 #include "videopin.lh"
 #include "sound/discrete.h"
diff --git a/src/mame/drivers/vmetal.c b/src/mame/drivers/vmetal.c
index 2c69fe5aa11..02dd1809d73 100644
--- a/src/mame/drivers/vmetal.c
+++ b/src/mame/drivers/vmetal.c
@@ -112,7 +112,6 @@ static READ16_HANDLER ( varia_crom_read )
 
 static READ16_HANDLER ( varia_random )
 {
-//  return mame_rand(Machine);  // dips etc.. weird
 	return 0xffff;
 }
 
diff --git a/src/mame/drivers/volfied.c b/src/mame/drivers/volfied.c
index c49c71908cd..2b0cc8b5816 100644
--- a/src/mame/drivers/volfied.c
+++ b/src/mame/drivers/volfied.c
@@ -40,6 +40,7 @@ Stephh's notes (based on the game M68000 code and some tests) :
 ********************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "taitoipt.h"
 #include "video/taitoic.h"
 #include "audio/taitosnd.h"
diff --git a/src/mame/drivers/vroulet.c b/src/mame/drivers/vroulet.c
index 3039ffffce1..f0304b23890 100644
--- a/src/mame/drivers/vroulet.c
+++ b/src/mame/drivers/vroulet.c
@@ -35,6 +35,7 @@ Tomasz Slanina 20050225
 */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "machine/8255ppi.h"
 #include "sound/ay8910.h"
 
diff --git a/src/mame/drivers/wardner.c b/src/mame/drivers/wardner.c
index 0bcc4c33dcd..0e2b6e9df9d 100644
--- a/src/mame/drivers/wardner.c
+++ b/src/mame/drivers/wardner.c
@@ -124,6 +124,7 @@ out:
 
 
 #include "driver.h"
+#include "deprecat.h"
 #include "video/crtc6845.h"
 #include "cpu/tms32010/tms32010.h"
 #include "twincobr.h"
diff --git a/src/mame/drivers/warpwarp.c b/src/mame/drivers/warpwarp.c
index b3c20c9a37e..93cbe32720c 100644
--- a/src/mame/drivers/warpwarp.c
+++ b/src/mame/drivers/warpwarp.c
@@ -127,6 +127,7 @@ TODO:
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "sound/custom.h"
 #include "includes/warpwarp.h"
 #include "geebee.lh"
diff --git a/src/mame/drivers/warriorb.c b/src/mame/drivers/warriorb.c
index 9bd3abb59a6..e2646452154 100644
--- a/src/mame/drivers/warriorb.c
+++ b/src/mame/drivers/warriorb.c
@@ -144,6 +144,7 @@ Colscroll effects?
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "taitoipt.h"
 #include "rendlay.h"
 #include "cpu/m68000/m68000.h"
diff --git a/src/mame/drivers/wc90.c b/src/mame/drivers/wc90.c
index 3120fbd0182..c7f06ac3a55 100644
--- a/src/mame/drivers/wc90.c
+++ b/src/mame/drivers/wc90.c
@@ -52,6 +52,7 @@ Press one of the start buttons to exit.
 */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/z80/z80.h"
 #include "sound/2608intf.h"
 
diff --git a/src/mame/drivers/wc90b.c b/src/mame/drivers/wc90b.c
index cafb87f1d14..33334802e50 100644
--- a/src/mame/drivers/wc90b.c
+++ b/src/mame/drivers/wc90b.c
@@ -71,6 +71,7 @@ World Cup 90 bootleg.
 */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/z80/z80.h"
 #include "sound/2203intf.h"
 #include "sound/msm5205.h"
diff --git a/src/mame/drivers/wecleman.c b/src/mame/drivers/wecleman.c
index a9be2e92dc6..83cc77c5ab0 100644
--- a/src/mame/drivers/wecleman.c
+++ b/src/mame/drivers/wecleman.c
@@ -270,6 +270,7 @@ TODO:
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "video/konamiic.h"
 #include "cpu/m6809/m6809.h"
 #include "sound/2151intf.h"
diff --git a/src/mame/drivers/welltris.c b/src/mame/drivers/welltris.c
index a46b26875dc..b16934cb79b 100644
--- a/src/mame/drivers/welltris.c
+++ b/src/mame/drivers/welltris.c
@@ -313,6 +313,7 @@ TODO:
 #define WELLTRIS_4P_HACK 0
 
 #include "driver.h"
+#include "deprecat.h"
 #include "sound/2610intf.h"
 
 UINT16 *welltris_spriteram;
diff --git a/src/mame/drivers/wgp.c b/src/mame/drivers/wgp.c
index c396abb1bb5..f7573a3fe92 100644
--- a/src/mame/drivers/wgp.c
+++ b/src/mame/drivers/wgp.c
@@ -394,6 +394,7 @@ Stephh's notes (based on the game M68000 code and some tests) :
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "taitoipt.h"
 #include "cpu/m68000/m68000.h"
 #include "video/taitoic.h"
diff --git a/src/mame/drivers/wheelfir.c b/src/mame/drivers/wheelfir.c
index 940554fed39..b395bf4d033 100644
--- a/src/mame/drivers/wheelfir.c
+++ b/src/mame/drivers/wheelfir.c
@@ -49,6 +49,8 @@ something is missing, currently needs a hack to boot
 
 
 #include "driver.h"
+#include "deprecat.h"
+
 static int toggle_bit;
 
 static READ16_HANDLER( wheelfir_rand1 )
diff --git a/src/mame/drivers/wilytowr.c b/src/mame/drivers/wilytowr.c
index 81db2cbf5e5..a9abf7ae4a2 100644
--- a/src/mame/drivers/wilytowr.c
+++ b/src/mame/drivers/wilytowr.c
@@ -22,6 +22,7 @@ TODO:
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/i8039/i8039.h"
 #include "sound/ay8910.h"
 #include "sound/samples.h"
diff --git a/src/mame/drivers/wink.c b/src/mame/drivers/wink.c
index d996d92197f..69dd1be9fae 100644
--- a/src/mame/drivers/wink.c
+++ b/src/mame/drivers/wink.c
@@ -12,6 +12,7 @@
 */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "sound/ay8910.h"
 
 static tilemap *bg_tilemap;
diff --git a/src/mame/drivers/wiping.c b/src/mame/drivers/wiping.c
index 7241353b442..605a3b8c9ed 100644
--- a/src/mame/drivers/wiping.c
+++ b/src/mame/drivers/wiping.c
@@ -34,6 +34,7 @@ dip: 6.7 7.7
 
 ***************************************************************************/
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/z80/z80.h"
 #include "sound/custom.h"
 
diff --git a/src/mame/drivers/witch.c b/src/mame/drivers/witch.c
index d40739494c1..327802582eb 100644
--- a/src/mame/drivers/witch.c
+++ b/src/mame/drivers/witch.c
@@ -190,6 +190,7 @@ TODO :
 */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "sound/es8712.h"
 #include "sound/2203intf.h"
 
diff --git a/src/mame/drivers/wwfsstar.c b/src/mame/drivers/wwfsstar.c
index 05acc68356e..f1c2bf3c962 100644
--- a/src/mame/drivers/wwfsstar.c
+++ b/src/mame/drivers/wwfsstar.c
@@ -50,6 +50,7 @@
 *******************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/m68000/m68000.h"
 #include "cpu/z80/z80.h"
 #include "sound/2151intf.h"
diff --git a/src/mame/drivers/wwfwfest.c b/src/mame/drivers/wwfwfest.c
index b5f246e4b78..4517b91b60a 100644
--- a/src/mame/drivers/wwfwfest.c
+++ b/src/mame/drivers/wwfwfest.c
@@ -38,6 +38,7 @@
 *******************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/m68000/m68000.h"
 #include "cpu/z80/z80.h"
 #include "wwfwfest.h"
diff --git a/src/mame/drivers/xain.c b/src/mame/drivers/xain.c
index ac1b2f19aee..94afe1f737f 100644
--- a/src/mame/drivers/xain.c
+++ b/src/mame/drivers/xain.c
@@ -142,6 +142,7 @@ TODO:
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/m6809/m6809.h"
 #include "cpu/m6805/m6805.h"
 #include "sound/2203intf.h"
diff --git a/src/mame/drivers/xexex.c b/src/mame/drivers/xexex.c
index 6411f6af712..c4b5265da95 100644
--- a/src/mame/drivers/xexex.c
+++ b/src/mame/drivers/xexex.c
@@ -62,7 +62,7 @@ Unresolved Issues:
 ***************************************************************************/
 
 #include "driver.h"
-
+#include "deprecat.h"
 #include "video/konamiic.h"
 #include "cpu/z80/z80.h"
 #include "machine/eeprom.h"
diff --git a/src/mame/drivers/xmen.c b/src/mame/drivers/xmen.c
index 7f4023d211f..93047fb0b9f 100644
--- a/src/mame/drivers/xmen.c
+++ b/src/mame/drivers/xmen.c
@@ -14,6 +14,7 @@ likewise be a 2 screen game
 
 ***************************************************************************/
 #include "driver.h"
+#include "deprecat.h"
 #include "video/konamiic.h"
 #include "machine/eeprom.h"
 #include "cpu/z80/z80.h"
diff --git a/src/mame/drivers/xxmissio.c b/src/mame/drivers/xxmissio.c
index c08cc27ae59..175c652ddc7 100644
--- a/src/mame/drivers/xxmissio.c
+++ b/src/mame/drivers/xxmissio.c
@@ -9,6 +9,7 @@ XX Mission (c) 1986 UPL
 *****************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "sound/2203intf.h"
 
 VIDEO_UPDATE( xxmissio );
diff --git a/src/mame/drivers/xyonix.c b/src/mame/drivers/xyonix.c
index c551ef4f230..a86079ad02d 100644
--- a/src/mame/drivers/xyonix.c
+++ b/src/mame/drivers/xyonix.c
@@ -20,6 +20,7 @@ TODO:
 ******************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/z80/z80.h"
 #include "sound/sn76496.h"
 
diff --git a/src/mame/drivers/yunsun16.c b/src/mame/drivers/yunsun16.c
index 0e03d58cd5c..0fada97561c 100644
--- a/src/mame/drivers/yunsun16.c
+++ b/src/mame/drivers/yunsun16.c
@@ -85,6 +85,7 @@ Stephh's notes (based on the games M68000 code and some tests) :
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "sound/okim6295.h"
 #include "sound/3812intf.h"
 
diff --git a/src/mame/drivers/yunsung8.c b/src/mame/drivers/yunsung8.c
index f87a83e75ca..96d776b7cdd 100644
--- a/src/mame/drivers/yunsung8.c
+++ b/src/mame/drivers/yunsung8.c
@@ -30,6 +30,7 @@ To Do:
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/z80/z80.h"
 #include "sound/3812intf.h"
 #include "sound/msm5205.h"
diff --git a/src/mame/drivers/zaccaria.c b/src/mame/drivers/zaccaria.c
index e51f1c3e2a3..65e05a6d0dc 100644
--- a/src/mame/drivers/zaccaria.c
+++ b/src/mame/drivers/zaccaria.c
@@ -34,6 +34,7 @@ Notes:
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "machine/6821pia.h"
 #include "machine/8255ppi.h"
 #include "sound/ay8910.h"
diff --git a/src/mame/drivers/zaxxon.c b/src/mame/drivers/zaxxon.c
index 33dc088d584..0f1c6012d2e 100644
--- a/src/mame/drivers/zaxxon.c
+++ b/src/mame/drivers/zaxxon.c
@@ -301,6 +301,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "machine/segacrpt.h"
 #include "machine/8255ppi.h"
 #include "audio/segasnd.h"
diff --git a/src/mame/drivers/zerozone.c b/src/mame/drivers/zerozone.c
index cab8839250b..8409debbaf4 100644
--- a/src/mame/drivers/zerozone.c
+++ b/src/mame/drivers/zerozone.c
@@ -27,6 +27,7 @@ TODO:
 
 ***************************************************************************/
 #include "driver.h"
+#include "deprecat.h"
 #include "sound/okim6295.h"
 
 VIDEO_START( zerozone );
diff --git a/src/mame/drivers/zn.c b/src/mame/drivers/zn.c
index 9672d4b6de8..5af47050025 100644
--- a/src/mame/drivers/zn.c
+++ b/src/mame/drivers/zn.c
@@ -8,8 +8,8 @@
 
 ***************************************************************************/
 
-#include <stdarg.h>
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/mips/psx.h"
 #include "cpu/z80/z80.h"
 #include "includes/psx.h"
diff --git a/src/mame/drivers/zr107.c b/src/mame/drivers/zr107.c
index 19bd8871efe..22178e0cce0 100644
--- a/src/mame/drivers/zr107.c
+++ b/src/mame/drivers/zr107.c
@@ -40,6 +40,7 @@
 */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/powerpc/ppc.h"
 #include "cpu/sharc/sharc.h"
 #include "sound/k054539.h"
diff --git a/src/mame/machine/ajax.c b/src/mame/machine/ajax.c
index fcd1c0d8411..676a2e6dfa8 100644
--- a/src/mame/machine/ajax.c
+++ b/src/mame/machine/ajax.c
@@ -8,6 +8,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/m6809/m6809.h"
 #include "cpu/z80/z80.h"
 #include "cpu/konami/konami.h"
diff --git a/src/mame/machine/amiga.c b/src/mame/machine/amiga.c
index 538f289f898..40b38ded05e 100644
--- a/src/mame/machine/amiga.c
+++ b/src/mame/machine/amiga.c
@@ -9,6 +9,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "includes/amiga.h"
 #include "cpu/m68000/m68000.h"
 #include "machine/6526cia.h"
diff --git a/src/mame/machine/asic65.c b/src/mame/machine/asic65.c
index 4fcb31ecea2..01a3033c36f 100644
--- a/src/mame/machine/asic65.c
+++ b/src/mame/machine/asic65.c
@@ -5,10 +5,10 @@
  *************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "includes/atarig42.h"
 #include "cpu/tms32010/tms32010.h"
 #include "asic65.h"
-#include <math.h>
 
 
 #define LOG_ASIC		0
diff --git a/src/mame/machine/atari.c b/src/mame/machine/atari.c
index 27588a0d4af..4af7b5caa47 100644
--- a/src/mame/machine/atari.c
+++ b/src/mame/machine/atari.c
@@ -9,6 +9,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/m6502/m6502.h"
 #include "includes/atari.h"
 #include "sound/pokey.h"
diff --git a/src/mame/machine/atarifb.c b/src/mame/machine/atarifb.c
index ecb0b2493aa..33608b951cb 100644
--- a/src/mame/machine/atarifb.c
+++ b/src/mame/machine/atarifb.c
@@ -5,6 +5,7 @@
 *************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "atarifb.h"
 #include "sound/discrete.h"
 
diff --git a/src/mame/machine/atarigen.c b/src/mame/machine/atarigen.c
index b15dfbf76ee..94328252ce2 100644
--- a/src/mame/machine/atarigen.c
+++ b/src/mame/machine/atarigen.c
@@ -8,6 +8,7 @@
 
 
 #include "driver.h"
+#include "deprecat.h"
 #include "atarigen.h"
 #include "slapstic.h"
 #include "cpu/m6502/m6502.h"
diff --git a/src/mame/machine/balsente.c b/src/mame/machine/balsente.c
index 99f153c2ddf..6f5fb26da4c 100644
--- a/src/mame/machine/balsente.c
+++ b/src/mame/machine/balsente.c
@@ -7,10 +7,10 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/m6809/m6809.h"
 #include "balsente.h"
 #include "sound/cem3394.h"
-#include <math.h>
 
 
 #define LOG_CEM_WRITES		0
diff --git a/src/mame/machine/beezer.c b/src/mame/machine/beezer.c
index f877df66047..8d98210f0bc 100644
--- a/src/mame/machine/beezer.c
+++ b/src/mame/machine/beezer.c
@@ -1,4 +1,5 @@
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/m6809/m6809.h"
 #include "machine/6522via.h"
 
diff --git a/src/mame/machine/bigevglf.c b/src/mame/machine/bigevglf.c
index df1c707f829..f650ba15e08 100644
--- a/src/mame/machine/bigevglf.c
+++ b/src/mame/machine/bigevglf.c
@@ -8,6 +8,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 
 
 static UINT8 from_mcu;
diff --git a/src/mame/machine/bublbobl.c b/src/mame/machine/bublbobl.c
index 52db2dd37f9..31fa62fcb9a 100644
--- a/src/mame/machine/bublbobl.c
+++ b/src/mame/machine/bublbobl.c
@@ -8,6 +8,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/z80/z80.h"
 
 
diff --git a/src/mame/machine/buggychl.c b/src/mame/machine/buggychl.c
index 08d368afab8..4e84b52006e 100644
--- a/src/mame/machine/buggychl.c
+++ b/src/mame/machine/buggychl.c
@@ -1,4 +1,5 @@
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/z80/z80.h"
 
 
diff --git a/src/mame/machine/carpolo.c b/src/mame/machine/carpolo.c
index 886ff694b1a..c9c658ee58b 100644
--- a/src/mame/machine/carpolo.c
+++ b/src/mame/machine/carpolo.c
@@ -7,6 +7,7 @@
 ****************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/m6502/m6502.h"
 #include "machine/6821pia.h"
 #include "machine/7474.h"
diff --git a/src/mame/machine/cps2crpt.c b/src/mame/machine/cps2crpt.c
index 06769610c26..7232d45031d 100644
--- a/src/mame/machine/cps2crpt.c
+++ b/src/mame/machine/cps2crpt.c
@@ -111,6 +111,7 @@ the decryption keys.
 *******************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/m68000/m68kmame.h"
 #include "ui.h"
 #include "includes/cps1.h"
diff --git a/src/mame/machine/daikaiju.c b/src/mame/machine/daikaiju.c
index ccd7fcbeca8..5bb35d82f27 100644
--- a/src/mame/machine/daikaiju.c
+++ b/src/mame/machine/daikaiju.c
@@ -98,6 +98,7 @@ displayed (game) or not (attract mode). Due to above bug message is always displ
 
 ***************************************************************************/
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/z80/z80.h"
 
 #define ID_DAIKAIJU 0x5a
diff --git a/src/mame/machine/dc.c b/src/mame/machine/dc.c
index d0074a62b3f..6acb7ec7bf8 100644
--- a/src/mame/machine/dc.c
+++ b/src/mame/machine/dc.c
@@ -4,8 +4,8 @@
 
 */
 
-#include "mamecore.h"
 #include "driver.h"
+#include "deprecat.h"
 #include "dc.h"
 #include "cpu/sh4/sh4.h"
 
diff --git a/src/mame/machine/dec0.c b/src/mame/machine/dec0.c
index 3fb3e52d423..08d5dd0baf5 100644
--- a/src/mame/machine/dec0.c
+++ b/src/mame/machine/dec0.c
@@ -7,6 +7,7 @@ Data East machine functions - Bryan McPhail, mish@tendril.co.uk
 *******************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "dec0.h"
 #include "cpu/h6280/h6280.h"
 
diff --git a/src/mame/machine/decocass.c b/src/mame/machine/decocass.c
index e0878895b0d..67d5f71c6c3 100644
--- a/src/mame/machine/decocass.c
+++ b/src/mame/machine/decocass.c
@@ -5,6 +5,7 @@
  ***********************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/m6502/m6502.h"
 #include "cpu/i8x41/i8x41.h"
 #include "machine/decocass.h"
diff --git a/src/mame/machine/decoprot.c b/src/mame/machine/decoprot.c
index 308a41a27bb..376b0281519 100644
--- a/src/mame/machine/decoprot.c
+++ b/src/mame/machine/decoprot.c
@@ -71,6 +71,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "machine/eeprom.h"
 #include "decoprot.h"
 
diff --git a/src/mame/machine/docastle.c b/src/mame/machine/docastle.c
index 31f897e727d..1d3b08a9bee 100644
--- a/src/mame/machine/docastle.c
+++ b/src/mame/machine/docastle.c
@@ -8,6 +8,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/z80/z80.h"
 #include "includes/docastle.h"
 
diff --git a/src/mame/machine/equites.c b/src/mame/machine/equites.c
index d94e89d05b3..ff06aaf74df 100644
--- a/src/mame/machine/equites.c
+++ b/src/mame/machine/equites.c
@@ -12,6 +12,7 @@ drivers by Acho A. Tang
 // Directives
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/i8085/i8085.h"
 #include "sound/ay8910.h"
 #include "sound/msm5232.h"
diff --git a/src/mame/machine/fddebug.c b/src/mame/machine/fddebug.c
index c1b4af94cca..9637672cfbb 100644
--- a/src/mame/machine/fddebug.c
+++ b/src/mame/machine/fddebug.c
@@ -108,6 +108,7 @@
 #ifdef MAME_DEBUG
 
 #include "driver.h"
+#include "deprecat.h"
 #include "machine/fd1094.h"
 #include "cpu/m68000/m68k.h"
 
diff --git a/src/mame/machine/flstory.c b/src/mame/machine/flstory.c
index 5fd81842934..0c17198e5d8 100644
--- a/src/mame/machine/flstory.c
+++ b/src/mame/machine/flstory.c
@@ -8,6 +8,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 
 extern UINT8 *onna34ro_workram;
 extern UINT8 *victnine_workram;
diff --git a/src/mame/machine/galaxian.c b/src/mame/machine/galaxian.c
index 8655829edf3..d4dfc7ec29d 100644
--- a/src/mame/machine/galaxian.c
+++ b/src/mame/machine/galaxian.c
@@ -8,6 +8,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "machine/7474.h"
 #include "includes/galaxian.h"
 
diff --git a/src/mame/machine/harddriv.c b/src/mame/machine/harddriv.c
index d950ea69d9c..2e635e7f739 100644
--- a/src/mame/machine/harddriv.c
+++ b/src/mame/machine/harddriv.c
@@ -5,6 +5,7 @@
 ****************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/tms34010/tms34010.h"
 #include "cpu/tms34010/34010ops.h"
 #include "cpu/adsp2100/adsp2100.h"
diff --git a/src/mame/machine/irobot.c b/src/mame/machine/irobot.c
index f3486cf8683..61405015e75 100644
--- a/src/mame/machine/irobot.c
+++ b/src/mame/machine/irobot.c
@@ -6,6 +6,7 @@
 
 #include "driver.h"
 #include "profiler.h"
+#include "deprecat.h"
 #include "cpu/m6809/m6809.h"
 #include "irobot.h"
 
diff --git a/src/mame/machine/kaneko16.c b/src/mame/machine/kaneko16.c
index 76abb8920ee..934f60e8829 100644
--- a/src/mame/machine/kaneko16.c
+++ b/src/mame/machine/kaneko16.c
@@ -13,6 +13,7 @@ Currently none of the MCUs' internal roms are dumped so simulation is used
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "includes/kaneko16.h"
 
 #include "kanekotb.h"	// TOYBOX MCU trojaning results
diff --git a/src/mame/machine/konamigx.c b/src/mame/machine/konamigx.c
index bd97ede682c..bbd08007853 100644
--- a/src/mame/machine/konamigx.c
+++ b/src/mame/machine/konamigx.c
@@ -7,9 +7,9 @@
  */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "video/konamiic.h"
 #include "machine/konamigx.h"
-#include <math.h>
 
 #define GX_DEBUG 0
 
diff --git a/src/mame/machine/konppc.c b/src/mame/machine/konppc.c
index 8853699b61e..e540fe0be6f 100644
--- a/src/mame/machine/konppc.c
+++ b/src/mame/machine/konppc.c
@@ -1,6 +1,7 @@
 /* Konami PowerPC-based 3D games common functions */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/sharc/sharc.h"
 #include "video/voodoo.h"
 #include "konppc.h"
diff --git a/src/mame/machine/leland.c b/src/mame/machine/leland.c
index f41dc9eed44..a8efced4161 100644
--- a/src/mame/machine/leland.c
+++ b/src/mame/machine/leland.c
@@ -7,6 +7,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "machine/eeprom.h"
 #include "cpu/z80/z80.h"
 #include "leland.h"
diff --git a/src/mame/machine/lkage.c b/src/mame/machine/lkage.c
index a428fbcb309..a5f237742c0 100644
--- a/src/mame/machine/lkage.c
+++ b/src/mame/machine/lkage.c
@@ -8,6 +8,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 
 
 static UINT8 from_main,from_mcu;
diff --git a/src/mame/machine/lsasquad.c b/src/mame/machine/lsasquad.c
index 6579eb53959..e36e6a5d2cc 100644
--- a/src/mame/machine/lsasquad.c
+++ b/src/mame/machine/lsasquad.c
@@ -1,4 +1,5 @@
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/z80/z80.h"
 
 
diff --git a/src/mame/machine/mcr.c b/src/mame/machine/mcr.c
index 18d65b2e495..45b293d1d6e 100644
--- a/src/mame/machine/mcr.c
+++ b/src/mame/machine/mcr.c
@@ -5,6 +5,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "machine/z80ctc.h"
 #include "machine/z80pio.h"
 #include "machine/z80sio.h"
diff --git a/src/mame/machine/mexico86.c b/src/mame/machine/mexico86.c
index bbe94648e54..6132251f2f5 100644
--- a/src/mame/machine/mexico86.c
+++ b/src/mame/machine/mexico86.c
@@ -1,4 +1,5 @@
 #include "driver.h"
+#include "deprecat.h"
 
 
 UINT8 *mexico86_protection_ram;
diff --git a/src/mame/machine/mhavoc.c b/src/mame/machine/mhavoc.c
index 8b19c3d179e..3da1dff83c6 100644
--- a/src/mame/machine/mhavoc.c
+++ b/src/mame/machine/mhavoc.c
@@ -5,6 +5,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "video/avgdvg.h"
 #include "sound/5220intf.h"
 #include "cpu/m6502/m6502.h"
diff --git a/src/mame/machine/midwayic.c b/src/mame/machine/midwayic.c
index 23bb83edf03..2f503ca1da1 100644
--- a/src/mame/machine/midwayic.c
+++ b/src/mame/machine/midwayic.c
@@ -5,6 +5,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "debugger.h"
 #include "midwayic.h"
 #include "machine/idectrl.h"
diff --git a/src/mame/machine/midwunit.c b/src/mame/machine/midwunit.c
index e250bbcb29e..ca8882533eb 100644
--- a/src/mame/machine/midwunit.c
+++ b/src/mame/machine/midwunit.c
@@ -5,6 +5,7 @@
 **************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/tms34010/tms34010.h"
 #include "cpu/m6809/m6809.h"
 #include "audio/dcs.h"
diff --git a/src/mame/machine/midyunit.c b/src/mame/machine/midyunit.c
index 21369b1aec6..ff18d428564 100644
--- a/src/mame/machine/midyunit.c
+++ b/src/mame/machine/midyunit.c
@@ -5,6 +5,7 @@
 **************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/tms34010/tms34010.h"
 #include "cpu/m6809/m6809.h"
 #include "machine/6821pia.h"
diff --git a/src/mame/machine/model1.c b/src/mame/machine/model1.c
index fefae8c9e34..b47f9a01cd8 100644
--- a/src/mame/machine/model1.c
+++ b/src/mame/machine/model1.c
@@ -3,8 +3,8 @@
 */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "debugger.h"
-#include <math.h>
 #include "cpu/mb86233/mb86233.h"
 
 enum {FIFO_SIZE = 256};
diff --git a/src/mame/machine/model3.c b/src/mame/machine/model3.c
index 58e1dde4d6a..4e3c407deea 100644
--- a/src/mame/machine/model3.c
+++ b/src/mame/machine/model3.c
@@ -5,6 +5,7 @@
 */
 
 #include "driver.h"
+#include "deprecat.h"
 
 static int m3_step;
 
diff --git a/src/mame/machine/n64.c b/src/mame/machine/n64.c
index 2770aab3860..df92a198e1d 100644
--- a/src/mame/machine/n64.c
+++ b/src/mame/machine/n64.c
@@ -1,6 +1,7 @@
 /* machine/n64.c - contains N64 hardware emulation shared between MAME and MESS */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/mips/mips3.h"
 #include "sound/custom.h"
 #include "streams.h"
diff --git a/src/mame/machine/namco50.c b/src/mame/machine/namco50.c
index ec41d0b18de..ea26ca5ae94 100644
--- a/src/mame/machine/namco50.c
+++ b/src/mame/machine/namco50.c
@@ -130,6 +130,7 @@ Flags: 80=high score, 40=first bonus, 20=interval bonus, 10=?
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "namco50.h"
 #include "cpu/mb88xx/mb88xx.h"
 
diff --git a/src/mame/machine/namcoio.c b/src/mame/machine/namcoio.c
index 875b8214e7f..17ee8364d56 100644
--- a/src/mame/machine/namcoio.c
+++ b/src/mame/machine/namcoio.c
@@ -133,6 +133,7 @@ TODO:
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "machine/namcoio.h"
 #include "machine/namco50.h"
 #include "sound/namco52.h"
diff --git a/src/mame/machine/namcond1.c b/src/mame/machine/namcond1.c
index c5633bee6b4..3c7a94be10a 100644
--- a/src/mame/machine/namcond1.c
+++ b/src/mame/machine/namcond1.c
@@ -10,6 +10,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/m6809/m6809.h"
 #include "namcond1.h"
 
diff --git a/src/mame/machine/namcos1.c b/src/mame/machine/namcos1.c
index 8ca6026c1bd..340e1821e1d 100644
--- a/src/mame/machine/namcos1.c
+++ b/src/mame/machine/namcos1.c
@@ -1,4 +1,5 @@
 #include "driver.h"
+#include "deprecat.h"
 #include "sound/ym2151.h"
 #include "sound/namco.h"
 
diff --git a/src/mame/machine/namcos2.c b/src/mame/machine/namcos2.c
index 13fc9ff43e7..37e2c2a3cb0 100644
--- a/src/mame/machine/namcos2.c
+++ b/src/mame/machine/namcos2.c
@@ -10,6 +10,7 @@ Namco System II
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/m6809/m6809.h"
 #include "cpu/m6805/m6805.h"
 #include "namcos2.h"
diff --git a/src/mame/machine/nitedrvr.c b/src/mame/machine/nitedrvr.c
index e83aba85afa..a4b0f28d273 100644
--- a/src/mame/machine/nitedrvr.c
+++ b/src/mame/machine/nitedrvr.c
@@ -5,6 +5,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "nitedrvr.h"
 #include "sound/discrete.h"
 
diff --git a/src/mame/machine/nycaptor.c b/src/mame/machine/nycaptor.c
index f03a96aa20a..989e59b46d9 100644
--- a/src/mame/machine/nycaptor.c
+++ b/src/mame/machine/nycaptor.c
@@ -8,6 +8,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 
 static UINT8 from_main,from_mcu;
 static int mcu_sent = 0,main_sent = 0;
diff --git a/src/mame/machine/pcshare.c b/src/mame/machine/pcshare.c
index 2e18b1737bf..4283ae90317 100644
--- a/src/mame/machine/pcshare.c
+++ b/src/mame/machine/pcshare.c
@@ -21,6 +21,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "memconv.h"
 #include "machine/8255ppi.h"
 
diff --git a/src/mame/machine/pitnrun.c b/src/mame/machine/pitnrun.c
index 42e6c3da477..30143edcaf2 100644
--- a/src/mame/machine/pitnrun.c
+++ b/src/mame/machine/pitnrun.c
@@ -8,6 +8,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/m6805/m6805.h"
 
 
diff --git a/src/mame/machine/playch10.c b/src/mame/machine/playch10.c
index 63c0c0a0e84..7bde122a19d 100644
--- a/src/mame/machine/playch10.c
+++ b/src/mame/machine/playch10.c
@@ -1,4 +1,5 @@
 #include "driver.h"
+#include "deprecat.h"
 #include "video/ppu2c0x.h"
 #include "machine/rp5h01.h"
 
diff --git a/src/mame/machine/psx.c b/src/mame/machine/psx.c
index a9d1ed08d64..56935c2ed89 100644
--- a/src/mame/machine/psx.c
+++ b/src/mame/machine/psx.c
@@ -6,8 +6,8 @@
 
 ***************************************************************************/
 
-#include <stdarg.h>
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/mips/psx.h"
 #include "includes/psx.h"
 
diff --git a/src/mame/machine/qix.c b/src/mame/machine/qix.c
index 786dc0f8d6a..7bc73755c6c 100644
--- a/src/mame/machine/qix.c
+++ b/src/mame/machine/qix.c
@@ -7,6 +7,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "qix.h"
 #include "machine/6821pia.h"
 #include "cpu/m6800/m6800.h"
diff --git a/src/mame/machine/rainbow.c b/src/mame/machine/rainbow.c
index aa580b52736..ed1b37d0687 100644
--- a/src/mame/machine/rainbow.c
+++ b/src/mame/machine/rainbow.c
@@ -48,6 +48,7 @@
 *************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 
 static UINT8* CRAM[8];
 
diff --git a/src/mame/machine/retofinv.c b/src/mame/machine/retofinv.c
index 05740c1014f..e0107e6d7e6 100644
--- a/src/mame/machine/retofinv.c
+++ b/src/mame/machine/retofinv.c
@@ -1,4 +1,5 @@
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/z80/z80.h"
 
 
diff --git a/src/mame/machine/s16fd.c b/src/mame/machine/s16fd.c
index f74faa9a8d2..f8291cbad6c 100644
--- a/src/mame/machine/s16fd.c
+++ b/src/mame/machine/s16fd.c
@@ -9,6 +9,7 @@ make more configurable (select caches per game?)
 */
 
 #include "driver.h"
+#include "deprecat.h"
 
 #include "cpu/m68000/m68000.h"
 #include "machine/fd1094.h"
diff --git a/src/mame/machine/scudsp.c b/src/mame/machine/scudsp.c
index c5387883a36..27c9c408b3c 100644
--- a/src/mame/machine/scudsp.c
+++ b/src/mame/machine/scudsp.c
@@ -50,6 +50,7 @@ Changelog:
 
 ******************************************************************************************/
 #include "driver.h"
+#include "deprecat.h"
 #include "machine/scudsp.h"
 #include "osd_cpu.h"
 
diff --git a/src/mame/machine/segaic16.c b/src/mame/machine/segaic16.c
index 9c3adfabf96..715f5d56ef2 100644
--- a/src/mame/machine/segaic16.c
+++ b/src/mame/machine/segaic16.c
@@ -5,6 +5,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "segaic16.h"
 #include "video/resnet.h"
 
diff --git a/src/mame/machine/simpsons.c b/src/mame/machine/simpsons.c
index 187c5eb0871..eb7d3eeacd3 100644
--- a/src/mame/machine/simpsons.c
+++ b/src/mame/machine/simpsons.c
@@ -1,4 +1,5 @@
 #include "driver.h"
+#include "deprecat.h"
 #include "video/konamiic.h"
 #include "cpu/konami/konami.h"
 #include "machine/eeprom.h"
diff --git a/src/mame/machine/slapfght.c b/src/mame/machine/slapfght.c
index d712f39d3bd..1ce47ee93df 100644
--- a/src/mame/machine/slapfght.c
+++ b/src/mame/machine/slapfght.c
@@ -8,6 +8,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 
 
 UINT8 *slapfight_dpram;
diff --git a/src/mame/machine/slapstic.c b/src/mame/machine/slapstic.c
index c035ccaaf2a..39009cc9ad0 100644
--- a/src/mame/machine/slapstic.c
+++ b/src/mame/machine/slapstic.c
@@ -179,6 +179,7 @@
 *************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "slapstic.h"
 #include "cpu/m68000/m68000.h"
 
diff --git a/src/mame/machine/snes.c b/src/mame/machine/snes.c
index 6e8497b91cb..282f37182f9 100644
--- a/src/mame/machine/snes.c
+++ b/src/mame/machine/snes.c
@@ -12,8 +12,8 @@
 ***************************************************************************/
 #define __MACHINE_SNES_C
 
-#include <math.h>
 #include "driver.h"
+#include "deprecat.h"
 #include "includes/snes.h"
 #include "cpu/g65816/g65816.h"
 #ifdef MESS
diff --git a/src/mame/machine/stactics.c b/src/mame/machine/stactics.c
index 0c214e80ddc..4ea1cc7e151 100644
--- a/src/mame/machine/stactics.c
+++ b/src/mame/machine/stactics.c
@@ -1,5 +1,6 @@
 
 #include "driver.h"
+#include "deprecat.h"
 
 /* needed in video/stactics.c */
 int stactics_vert_pos;
diff --git a/src/mame/machine/starwars.c b/src/mame/machine/starwars.c
index d74081a15fc..8b940e1096d 100644
--- a/src/mame/machine/starwars.c
+++ b/src/mame/machine/starwars.c
@@ -8,6 +8,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "starwars.h"
 #include "video/avgdvg.h"
 
diff --git a/src/mame/machine/system16.c b/src/mame/machine/system16.c
index 55c99b10daa..f3ea5f3b31e 100644
--- a/src/mame/machine/system16.c
+++ b/src/mame/machine/system16.c
@@ -1,4 +1,5 @@
 #include "driver.h"
+#include "deprecat.h"
 #include "system16.h"
 #include "sound/upd7759.h"
 
diff --git a/src/mame/machine/tait8741.c b/src/mame/machine/tait8741.c
index bf917435a56..0135c3129c5 100644
--- a/src/mame/machine/tait8741.c
+++ b/src/mame/machine/tait8741.c
@@ -8,6 +8,7 @@ Taito 8741 emulation
 */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "tait8741.h"
 
 #define VERBOSE 0
diff --git a/src/mame/machine/taitosj.c b/src/mame/machine/taitosj.c
index 3015ccceb28..420fd199567 100644
--- a/src/mame/machine/taitosj.c
+++ b/src/mame/machine/taitosj.c
@@ -8,6 +8,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/m6805/m6805.h"
 
 
diff --git a/src/mame/machine/tatsumi.c b/src/mame/machine/tatsumi.c
index 892f2c7f990..14ad9ef41f0 100644
--- a/src/mame/machine/tatsumi.c
+++ b/src/mame/machine/tatsumi.c
@@ -1,4 +1,5 @@
 #include "driver.h"
+#include "deprecat.h"
 #include "tatsumi.h"
 #include "sound/2151intf.h"
 #include "sound/okim6295.h"
diff --git a/src/mame/machine/tnzs.c b/src/mame/machine/tnzs.c
index dce10cda0fc..7636fe6067f 100644
--- a/src/mame/machine/tnzs.c
+++ b/src/mame/machine/tnzs.c
@@ -13,6 +13,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/i8x41/i8x41.h"
 #include "includes/tnzs.h"
 
diff --git a/src/mame/machine/toaplan1.c b/src/mame/machine/toaplan1.c
index 606023e1cb7..10852b39ea1 100644
--- a/src/mame/machine/toaplan1.c
+++ b/src/mame/machine/toaplan1.c
@@ -4,6 +4,7 @@
  ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/m68000/m68000.h"
 #include "cpu/tms32010/tms32010.h"
 #include "includes/toaplan1.h"
diff --git a/src/mame/machine/twincobr.c b/src/mame/machine/twincobr.c
index 1c6577d299d..645a0aa4431 100644
--- a/src/mame/machine/twincobr.c
+++ b/src/mame/machine/twincobr.c
@@ -4,6 +4,7 @@
  ****************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/m68000/m68000.h"
 #include "cpu/tms32010/tms32010.h"
 #include "twincobr.h"
diff --git a/src/mame/machine/tx1.c b/src/mame/machine/tx1.c
index ed01cecd701..f3cf262470a 100644
--- a/src/mame/machine/tx1.c
+++ b/src/mame/machine/tx1.c
@@ -4,6 +4,7 @@
 
 ***************************************************************************/
 #include "driver.h"
+#include "deprecat.h"
 #include "debugger.h"
 #include "machine/8255ppi.h"
 #include "tx1.h"
diff --git a/src/mame/machine/vertigo.c b/src/mame/machine/vertigo.c
index 81ea5195d37..e1b1ea8358d 100644
--- a/src/mame/machine/vertigo.c
+++ b/src/mame/machine/vertigo.c
@@ -5,6 +5,7 @@
 *************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "vertigo.h"
 #include "exidy440.h"
 #include "machine/74148.h"
diff --git a/src/mame/machine/vsnes.c b/src/mame/machine/vsnes.c
index f52a54985a5..d1efdc9a818 100644
--- a/src/mame/machine/vsnes.c
+++ b/src/mame/machine/vsnes.c
@@ -8,6 +8,7 @@ Nintendo VS UniSystem and DualSystem - (c) 1984 Nintendo of America
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "video/ppu2c0x.h"
 
 /* Globals */
diff --git a/src/mame/machine/williams.c b/src/mame/machine/williams.c
index a63d1f5f47e..67938381252 100644
--- a/src/mame/machine/williams.c
+++ b/src/mame/machine/williams.c
@@ -5,6 +5,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "audio/williams.h"
 #include "cpu/m6800/m6800.h"
 #include "cpu/m6809/m6809.h"
diff --git a/src/mame/video/1942.c b/src/mame/video/1942.c
index e1c2507a0bd..44bac96ccb1 100644
--- a/src/mame/video/1942.c
+++ b/src/mame/video/1942.c
@@ -7,6 +7,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 
 
 UINT8 *c1942_fgvideoram;
diff --git a/src/mame/video/20pacgal.c b/src/mame/video/20pacgal.c
index 276e58a9ad6..9b6737769e2 100644
--- a/src/mame/video/20pacgal.c
+++ b/src/mame/video/20pacgal.c
@@ -1,4 +1,5 @@
 #include "driver.h"
+#include "deprecat.h"
 
 
 
diff --git a/src/mame/video/actfancr.c b/src/mame/video/actfancr.c
index 6582081d231..16780dda57b 100644
--- a/src/mame/video/actfancr.c
+++ b/src/mame/video/actfancr.c
@@ -5,6 +5,7 @@
 *******************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 
 
 static UINT8 actfancr_control_1[0x20],actfancr_control_2[0x20];
diff --git a/src/mame/video/alpha68k.c b/src/mame/video/alpha68k.c
index 7c013e80cc1..a90df61ffe2 100644
--- a/src/mame/video/alpha68k.c
+++ b/src/mame/video/alpha68k.c
@@ -5,6 +5,7 @@
 ****************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 
 static tilemap *fix_tilemap;
 static int bank_base,flipscreen;
diff --git a/src/mame/video/angelkds.c b/src/mame/video/angelkds.c
index d44ba331954..a9d87955b5f 100644
--- a/src/mame/video/angelkds.c
+++ b/src/mame/video/angelkds.c
@@ -7,6 +7,7 @@ enable / disable tilemap bits might be wrong
 */
 
 #include "driver.h"
+#include "deprecat.h"
 
 
 static tilemap *tx_tilemap,*bgbot_tilemap ,*bgtop_tilemap;
diff --git a/src/mame/video/argus.c b/src/mame/video/argus.c
index ed78ccc01ef..3fe86bc5ce0 100644
--- a/src/mame/video/argus.c
+++ b/src/mame/video/argus.c
@@ -114,6 +114,7 @@ BG0 palette intensity ( $C47F, $C4FF )
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 
 #include "jalblend.c"
 
diff --git a/src/mame/video/arkanoid.c b/src/mame/video/arkanoid.c
index bfa77d843de..1928f61f7d9 100644
--- a/src/mame/video/arkanoid.c
+++ b/src/mame/video/arkanoid.c
@@ -7,6 +7,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "includes/arkanoid.h"
 
 static UINT8 gfxbank, palettebank;
diff --git a/src/mame/video/astrocde.c b/src/mame/video/astrocde.c
index a4f3fe4a5e2..959af27fae4 100644
--- a/src/mame/video/astrocde.c
+++ b/src/mame/video/astrocde.c
@@ -5,6 +5,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/z80/z80.h"
 #include "includes/astrocde.h"
 #include "sound/astrocde.h"
diff --git a/src/mame/video/atari.c b/src/mame/video/atari.c
index da75b8810c1..844eaff35ba 100644
--- a/src/mame/video/atari.c
+++ b/src/mame/video/atari.c
@@ -7,6 +7,7 @@
 ******************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "includes/atari.h"
 #include "video/gtia.h"
 
diff --git a/src/mame/video/atarirle.c b/src/mame/video/atarirle.c
index 36824fd7e4f..c16965ca435 100644
--- a/src/mame/video/atarirle.c
+++ b/src/mame/video/atarirle.c
@@ -19,6 +19,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "atarirle.h"
 
 
diff --git a/src/mame/video/atarisy1.c b/src/mame/video/atarisy1.c
index 5cef0d7b435..5e74e3b1062 100644
--- a/src/mame/video/atarisy1.c
+++ b/src/mame/video/atarisy1.c
@@ -5,6 +5,7 @@
 ****************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "machine/atarigen.h"
 #include "atarisy1.h"
 
diff --git a/src/mame/video/atarisy2.c b/src/mame/video/atarisy2.c
index 0e7322dd055..719441a601e 100644
--- a/src/mame/video/atarisy2.c
+++ b/src/mame/video/atarisy2.c
@@ -5,6 +5,7 @@
 ****************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "machine/atarigen.h"
 #include "slapstic.h"
 #include "atarisy2.h"
diff --git a/src/mame/video/avgdvg.c b/src/mame/video/avgdvg.c
index c17155c2dc9..4270e1e583b 100644
--- a/src/mame/video/avgdvg.c
+++ b/src/mame/video/avgdvg.c
@@ -12,6 +12,7 @@
 **************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "avgdvg.h"
 #include "video/vector.h"
 
diff --git a/src/mame/video/balsente.c b/src/mame/video/balsente.c
index 3accd77acdf..8d7db877f68 100644
--- a/src/mame/video/balsente.c
+++ b/src/mame/video/balsente.c
@@ -7,6 +7,7 @@
 ****************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "balsente.h"
 
 
diff --git a/src/mame/video/battlane.c b/src/mame/video/battlane.c
index 9c5089a16eb..8d85c01de15 100644
--- a/src/mame/video/battlane.c
+++ b/src/mame/video/battlane.c
@@ -5,6 +5,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 
 UINT8 *battlane_spriteram;
 UINT8 *battlane_tileram;
diff --git a/src/mame/video/battlera.c b/src/mame/video/battlera.c
index 80afb596294..7b49beaeb5e 100644
--- a/src/mame/video/battlera.c
+++ b/src/mame/video/battlera.c
@@ -8,6 +8,7 @@
 *******************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/h6280/h6280.h"
 
 static int HuC6270_registers[20];
diff --git a/src/mame/video/battlex.c b/src/mame/video/battlex.c
index a0b1a69a5a6..7915faf4486 100644
--- a/src/mame/video/battlex.c
+++ b/src/mame/video/battlex.c
@@ -1,4 +1,5 @@
 #include "driver.h"
+#include "deprecat.h"
 
 static int battlex_scroll_lsb;
 static int battlex_scroll_msb;
diff --git a/src/mame/video/beathead.c b/src/mame/video/beathead.c
index fc420d5c2a7..ca5ba47073b 100644
--- a/src/mame/video/beathead.c
+++ b/src/mame/video/beathead.c
@@ -5,6 +5,7 @@
 ****************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "beathead.h"
 
 
diff --git a/src/mame/video/beezer.c b/src/mame/video/beezer.c
index e09918ae831..efaf3d5aafe 100644
--- a/src/mame/video/beezer.c
+++ b/src/mame/video/beezer.c
@@ -1,4 +1,5 @@
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/m6809/m6809.h"
 #include "machine/6522via.h"
 
diff --git a/src/mame/video/bfm_adr2.c b/src/mame/video/bfm_adr2.c
index 88c8881433e..4650a13be13 100644
--- a/src/mame/video/bfm_adr2.c
+++ b/src/mame/video/bfm_adr2.c
@@ -91,6 +91,7 @@ E000-FFFF  | R | D D D D D D D D | 8K ROM
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/m6809/m6809.h"
 #include "machine/bfm_bd1.h"  // vfd
 #include "video/bfm_adr2.h"
diff --git a/src/mame/video/bigevglf.c b/src/mame/video/bigevglf.c
index 067ec1a1ed2..4bd58215443 100644
--- a/src/mame/video/bigevglf.c
+++ b/src/mame/video/bigevglf.c
@@ -6,6 +6,7 @@
 
 ***************************************************************************/
 #include "driver.h"
+#include "deprecat.h"
 
 
 UINT8 *bigevglf_spriteram1;
diff --git a/src/mame/video/blktiger.c b/src/mame/video/blktiger.c
index ba246ad9f1b..5f3156ae7e3 100644
--- a/src/mame/video/blktiger.c
+++ b/src/mame/video/blktiger.c
@@ -1,4 +1,5 @@
 #include "driver.h"
+#include "deprecat.h"
 
 UINT8 *blktiger_txvideoram;
 
diff --git a/src/mame/video/blmbycar.c b/src/mame/video/blmbycar.c
index 061bfc842c7..47a126f443b 100644
--- a/src/mame/video/blmbycar.c
+++ b/src/mame/video/blmbycar.c
@@ -29,6 +29,7 @@ Note:   if MAME_DEBUG is defined, pressing Z with:
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 
 /* Variables needed by driver: */
 
diff --git a/src/mame/video/blockout.c b/src/mame/video/blockout.c
index a26e61ba702..9f9b95858fd 100644
--- a/src/mame/video/blockout.c
+++ b/src/mame/video/blockout.c
@@ -1,4 +1,5 @@
 #include "driver.h"
+#include "deprecat.h"
 
 
 
diff --git a/src/mame/video/boogwing.c b/src/mame/video/boogwing.c
index ae21009f1a2..e12e55ecbf2 100644
--- a/src/mame/video/boogwing.c
+++ b/src/mame/video/boogwing.c
@@ -1,4 +1,5 @@
 #include "driver.h"
+#include "deprecat.h"
 #include "deco16ic.h"
 
 static void draw_sprites(running_machine *machine, mame_bitmap *bitmap,const rectangle *cliprect, UINT16* spriteram_base, int gfx_region)
diff --git a/src/mame/video/btoads.c b/src/mame/video/btoads.c
index 1f2ce4d00a0..eb1cfacb3c2 100644
--- a/src/mame/video/btoads.c
+++ b/src/mame/video/btoads.c
@@ -7,6 +7,7 @@
 **************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/tms34010/tms34010.h"
 #include "video/tlc34076.h"
 #include "btoads.h"
diff --git a/src/mame/video/bwing.c b/src/mame/video/bwing.c
index 5241f7e4e8a..cd0f1cc2143 100644
--- a/src/mame/video/bwing.c
+++ b/src/mame/video/bwing.c
@@ -9,6 +9,7 @@ drivers by Acho A. Tang
 // Directives
 
 #include "driver.h"
+#include "deprecat.h"
 
 #define BW_DEBUG 0
 
diff --git a/src/mame/video/carjmbre.c b/src/mame/video/carjmbre.c
index a39f039dabc..813025170dd 100644
--- a/src/mame/video/carjmbre.c
+++ b/src/mame/video/carjmbre.c
@@ -4,6 +4,7 @@ Omori Electric CAD (OEC) 1981
 */
 
 #include "driver.h"
+#include "deprecat.h"
 
 static tilemap *carjmbre_tilemap;
 
diff --git a/src/mame/video/cbuster.c b/src/mame/video/cbuster.c
index e800d5db0e8..50443e0f5ab 100644
--- a/src/mame/video/cbuster.c
+++ b/src/mame/video/cbuster.c
@@ -5,6 +5,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "deco16ic.h"
 
 static int twocrude_pri;
diff --git a/src/mame/video/ccastles.c b/src/mame/video/ccastles.c
index 26dd241c730..21ef22575ef 100644
--- a/src/mame/video/ccastles.c
+++ b/src/mame/video/ccastles.c
@@ -5,6 +5,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "ccastles.h"
 #include "video/resnet.h"
 
diff --git a/src/mame/video/cchasm.c b/src/mame/video/cchasm.c
index 53fbf63117e..2dfb58522f8 100644
--- a/src/mame/video/cchasm.c
+++ b/src/mame/video/cchasm.c
@@ -5,6 +5,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "video/vector.h"
 #include "cchasm.h"
 
diff --git a/src/mame/video/cclimber.c b/src/mame/video/cclimber.c
index 1475456b880..f80abff1f86 100644
--- a/src/mame/video/cclimber.c
+++ b/src/mame/video/cclimber.c
@@ -7,6 +7,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "includes/cclimber.h"
 
 
diff --git a/src/mame/video/centiped.c b/src/mame/video/centiped.c
index d4e13bfaea0..0cef7974e05 100644
--- a/src/mame/video/centiped.c
+++ b/src/mame/video/centiped.c
@@ -5,6 +5,7 @@
 *************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "centiped.h"
 
 
diff --git a/src/mame/video/changela.c b/src/mame/video/changela.c
index 170c375ef0d..2f04094a242 100644
--- a/src/mame/video/changela.c
+++ b/src/mame/video/changela.c
@@ -12,6 +12,7 @@ Todo: Priority between tree0 and tree1.
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 
 
 extern UINT8 changela_tree0_col;
diff --git a/src/mame/video/cinemat.c b/src/mame/video/cinemat.c
index 250e562364e..bdc105b5d56 100644
--- a/src/mame/video/cinemat.c
+++ b/src/mame/video/cinemat.c
@@ -5,6 +5,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "video/vector.h"
 #include "cpu/ccpu/ccpu.h"
 #include "cinemat.h"
diff --git a/src/mame/video/cischeat.c b/src/mame/video/cischeat.c
index 8285b00208d..5b79fcbe678 100644
--- a/src/mame/video/cischeat.c
+++ b/src/mame/video/cischeat.c
@@ -54,6 +54,7 @@ Note:   if MAME_DEBUG is defined, pressing Z or X with:
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "megasys1.h"
 
 /* Variables only used here: */
diff --git a/src/mame/video/citycon.c b/src/mame/video/citycon.c
index e37b0c8be7e..788cd220258 100644
--- a/src/mame/video/citycon.c
+++ b/src/mame/video/citycon.c
@@ -7,6 +7,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 
 
 
diff --git a/src/mame/video/cloak.c b/src/mame/video/cloak.c
index 29e7c66d5af..50621971b22 100644
--- a/src/mame/video/cloak.c
+++ b/src/mame/video/cloak.c
@@ -5,6 +5,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cloak.h"
 
 static mame_bitmap *tmpbitmap2;
diff --git a/src/mame/video/cloud9.c b/src/mame/video/cloud9.c
index 239c140bd7d..017b4e5031c 100644
--- a/src/mame/video/cloud9.c
+++ b/src/mame/video/cloud9.c
@@ -5,6 +5,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cloud9.h"
 #include "video/resnet.h"
 
diff --git a/src/mame/video/cninja.c b/src/mame/video/cninja.c
index ca295198657..2690133dffd 100644
--- a/src/mame/video/cninja.c
+++ b/src/mame/video/cninja.c
@@ -5,6 +5,7 @@
 ****************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "deco16ic.h"
 #include "cninja.h"
 
diff --git a/src/mame/video/combatsc.c b/src/mame/video/combatsc.c
index 6805026ff46..6d498eaed75 100644
--- a/src/mame/video/combatsc.c
+++ b/src/mame/video/combatsc.c
@@ -7,6 +7,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "video/konamiic.h"
 
 static tilemap *bg_tilemap[2];
diff --git a/src/mame/video/commando.c b/src/mame/video/commando.c
index 113bf305438..b6a06e77a9a 100644
--- a/src/mame/video/commando.c
+++ b/src/mame/video/commando.c
@@ -7,6 +7,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 
 UINT8 *commando_videoram2, *commando_colorram2;
 
diff --git a/src/mame/video/cosmic.c b/src/mame/video/cosmic.c
index b7aebdfa96b..9771243dd4d 100644
--- a/src/mame/video/cosmic.c
+++ b/src/mame/video/cosmic.c
@@ -7,6 +7,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 
 
 static pen_t (*map_color)(UINT8 x, UINT8 y);
diff --git a/src/mame/video/cps1.c b/src/mame/video/cps1.c
index 9fbc2d3393f..90563dccfe8 100644
--- a/src/mame/video/cps1.c
+++ b/src/mame/video/cps1.c
@@ -177,6 +177,7 @@ The games seem to use them to mark platforms, kill zones and no-go areas.
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cps1.h"
 
 #define VERBOSE 0
diff --git a/src/mame/video/crospang.c b/src/mame/video/crospang.c
index c25e16c7327..d97cc587f6e 100644
--- a/src/mame/video/crospang.c
+++ b/src/mame/video/crospang.c
@@ -10,6 +10,7 @@
 */
 
 #include "driver.h"
+#include "deprecat.h"
 
 static int xsproff, ysproff; // sprite offsets
 static tilemap *bg_layer,*fg_layer;
diff --git a/src/mame/video/csk.c b/src/mame/video/csk.c
index a701f820608..4413c990949 100644
--- a/src/mame/video/csk.c
+++ b/src/mame/video/csk.c
@@ -7,6 +7,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 
 #define CPK_VIDEO_SIZE	0x800
 
diff --git a/src/mame/video/cyberbal.c b/src/mame/video/cyberbal.c
index b5274731132..7b24d665e59 100644
--- a/src/mame/video/cyberbal.c
+++ b/src/mame/video/cyberbal.c
@@ -5,6 +5,7 @@
 ****************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "machine/atarigen.h"
 #include "cyberbal.h"
 
diff --git a/src/mame/video/darkmist.c b/src/mame/video/darkmist.c
index a34e016fd0a..b04c5ce733b 100644
--- a/src/mame/video/darkmist.c
+++ b/src/mame/video/darkmist.c
@@ -1,4 +1,5 @@
 #include "driver.h"
+#include "deprecat.h"
 
 /*defined in drivers/darkmist.c */
 
diff --git a/src/mame/video/darkseal.c b/src/mame/video/darkseal.c
index 525942e7d46..a6cfe5f0b71 100644
--- a/src/mame/video/darkseal.c
+++ b/src/mame/video/darkseal.c
@@ -86,6 +86,7 @@ Sprites - Data East custom chip 52
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 
 UINT16 *darkseal_pf12_row,*darkseal_pf34_row;
 UINT16 *darkseal_pf1_data,*darkseal_pf2_data,*darkseal_pf3_data;
diff --git a/src/mame/video/dassault.c b/src/mame/video/dassault.c
index 7d7699259ce..eb17a11d652 100644
--- a/src/mame/video/dassault.c
+++ b/src/mame/video/dassault.c
@@ -5,6 +5,7 @@
 ****************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "deco16ic.h"
 
 /******************************************************************************/
diff --git a/src/mame/video/dec0.c b/src/mame/video/dec0.c
index 8d4b9e29db3..b3ecca25436 100644
--- a/src/mame/video/dec0.c
+++ b/src/mame/video/dec0.c
@@ -95,6 +95,7 @@ Todo:
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "includes/dec0.h"
 
 static tilemap *pf1_tilemap_0,*pf1_tilemap_1,*pf1_tilemap_2;
diff --git a/src/mame/video/dec8.c b/src/mame/video/dec8.c
index 9559286d0a7..7411648e768 100644
--- a/src/mame/video/dec8.c
+++ b/src/mame/video/dec8.c
@@ -41,6 +41,7 @@ sprites.
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 
 //static int scroll1[4];
 static int scroll2[4];
diff --git a/src/mame/video/deco16ic.c b/src/mame/video/deco16ic.c
index c896399ee14..766e7be2549 100644
--- a/src/mame/video/deco16ic.c
+++ b/src/mame/video/deco16ic.c
@@ -140,6 +140,7 @@ Rowscroll style:
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "deco16ic.h"
 #include "ui.h"
 
diff --git a/src/mame/video/deco32.c b/src/mame/video/deco32.c
index 54a0e16a0b4..7337ce893e1 100644
--- a/src/mame/video/deco32.c
+++ b/src/mame/video/deco32.c
@@ -1,4 +1,5 @@
 #include "driver.h"
+#include "deprecat.h"
 #include "deco16ic.h"
 #include "deco32.h"
 
diff --git a/src/mame/video/deco_mlc.c b/src/mame/video/deco_mlc.c
index e8f32ec2bec..41e6593372a 100644
--- a/src/mame/video/deco_mlc.c
+++ b/src/mame/video/deco_mlc.c
@@ -9,6 +9,7 @@
 */
 
 #include "driver.h"
+#include "deprecat.h"
 
 extern int mlc_raster_table[9][256];
 extern UINT32 mlc_clipper[32];
diff --git a/src/mame/video/decocass.c b/src/mame/video/decocass.c
index 32eb7541a36..6434e54a18a 100644
--- a/src/mame/video/decocass.c
+++ b/src/mame/video/decocass.c
@@ -5,6 +5,7 @@
  ***********************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "machine/decocass.h"
 
 static INT32 watchdog_count;
diff --git a/src/mame/video/deniam.c b/src/mame/video/deniam.c
index 28225ed5212..1097b71370f 100644
--- a/src/mame/video/deniam.c
+++ b/src/mame/video/deniam.c
@@ -1,4 +1,5 @@
 #include "driver.h"
+#include "deprecat.h"
 
 
 UINT16 *deniam_videoram,*deniam_textram;
diff --git a/src/mame/video/dietgo.c b/src/mame/video/dietgo.c
index daf564ba41f..51ca3dac1a9 100644
--- a/src/mame/video/dietgo.c
+++ b/src/mame/video/dietgo.c
@@ -1,4 +1,5 @@
 #include "driver.h"
+#include "deprecat.h"
 #include "deco16ic.h"
 
 static void draw_sprites(running_machine* machine, mame_bitmap *bitmap,const rectangle *cliprect)
diff --git a/src/mame/video/diverboy.c b/src/mame/video/diverboy.c
index f24bbbef543..04a1078eb3d 100644
--- a/src/mame/video/diverboy.c
+++ b/src/mame/video/diverboy.c
@@ -1,6 +1,7 @@
 /* Diver Boy - Video Hardware */
 
 #include "driver.h"
+#include "deprecat.h"
 
 UINT16 *diverboy_spriteram;
 size_t diverboy_spriteram_size;
diff --git a/src/mame/video/djboy.c b/src/mame/video/djboy.c
index ca51dec8513..891d985fff5 100644
--- a/src/mame/video/djboy.c
+++ b/src/mame/video/djboy.c
@@ -4,6 +4,7 @@
  * video hardware for DJ Boy
  */
 #include "driver.h"
+#include "deprecat.h"
 #include "kan_pand.h"
 
 static UINT8 djboy_videoreg, djboy_scrollx, djboy_scrolly;
diff --git a/src/mame/video/dkong.c b/src/mame/video/dkong.c
index a7415a745a1..7b37e0a57d9 100644
--- a/src/mame/video/dkong.c
+++ b/src/mame/video/dkong.c
@@ -8,6 +8,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "video/resnet.h"
 #include "includes/dkong.h"
 
diff --git a/src/mame/video/dynduke.c b/src/mame/video/dynduke.c
index 41f0dc17ac5..5387e5919da 100644
--- a/src/mame/video/dynduke.c
+++ b/src/mame/video/dynduke.c
@@ -1,5 +1,6 @@
 
 #include "driver.h"
+#include "deprecat.h"
 
 static tilemap *bg_layer,*fg_layer,*tx_layer;
 UINT16 *dynduke_back_data,*dynduke_fore_data,*dynduke_scroll_ram;
diff --git a/src/mame/video/exidy.c b/src/mame/video/exidy.c
index bd06ac81622..a53e2393f32 100644
--- a/src/mame/video/exidy.c
+++ b/src/mame/video/exidy.c
@@ -5,6 +5,7 @@
 *************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 
 
 UINT8 *exidy_videoram;
diff --git a/src/mame/video/exidy440.c b/src/mame/video/exidy440.c
index ebd13c5b68b..efae24598a8 100644
--- a/src/mame/video/exidy440.c
+++ b/src/mame/video/exidy440.c
@@ -5,6 +5,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "exidy440.h"
 
 #define SPRITE_COUNT		40
diff --git a/src/mame/video/f1gp.c b/src/mame/video/f1gp.c
index 853691ef74a..ac03dfa4046 100644
--- a/src/mame/video/f1gp.c
+++ b/src/mame/video/f1gp.c
@@ -1,6 +1,6 @@
 #include "driver.h"
+#include "deprecat.h"
 #include "video/konamiic.h"
-//#include "f1gp.h"
 
 
 UINT16 *f1gp_spr1vram,*f1gp_spr2vram,*f1gp_spr1cgram,*f1gp_spr2cgram;
diff --git a/src/mame/video/fastfred.c b/src/mame/video/fastfred.c
index 16ea6bc05ac..3982cbb7420 100644
--- a/src/mame/video/fastfred.c
+++ b/src/mame/video/fastfred.c
@@ -7,6 +7,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "fastfred.h"
 
 extern UINT8 galaxian_stars_on;
diff --git a/src/mame/video/flkatck.c b/src/mame/video/flkatck.c
index 182f6422248..1a1c0fee526 100644
--- a/src/mame/video/flkatck.c
+++ b/src/mame/video/flkatck.c
@@ -140,10 +140,10 @@ popmessage("%02x-%02x-%02x-%02x-%02x-%02x-%02x-%02x  %02x-%02x-%02x-%02x-%02x-%0
 #endif
 	if (k007121_flip_screen)
 	{
-		k007121_clip[0] = Machine->screen[0].visarea;
+		k007121_clip[0] = machine->screen[0].visarea;
 		k007121_clip[0].max_x -= 40;
 
-		k007121_clip[1] = Machine->screen[0].visarea;
+		k007121_clip[1] = machine->screen[0].visarea;
 		k007121_clip[1].min_x = k007121_clip[1].max_x-40;
 
 		tilemap_set_scrollx(k007121_tilemap[0],0,K007121_ctrlram[0][0x00] - 56 );
diff --git a/src/mame/video/foodf.c b/src/mame/video/foodf.c
index 7c56c0727d8..e317dc77015 100644
--- a/src/mame/video/foodf.c
+++ b/src/mame/video/foodf.c
@@ -5,6 +5,7 @@
 ****************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "machine/atarigen.h"
 #include "foodf.h"
 #include "video/resnet.h"
diff --git a/src/mame/video/fromanc2.c b/src/mame/video/fromanc2.c
index 732887d3a22..05b49957bad 100644
--- a/src/mame/video/fromanc2.c
+++ b/src/mame/video/fromanc2.c
@@ -7,6 +7,7 @@
 ******************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 
 static int fromanc2_scrollx[2][4], fromanc2_scrolly[2][4];
 static int fromanc2_gfxbank[2][4];
diff --git a/src/mame/video/fromance.c b/src/mame/video/fromance.c
index 62044acac22..33ac0e9d274 100644
--- a/src/mame/video/fromance.c
+++ b/src/mame/video/fromance.c
@@ -8,6 +8,7 @@
 ******************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "fromance.h"
 
 
diff --git a/src/mame/video/funkyjet.c b/src/mame/video/funkyjet.c
index 94f87f28c08..18b5a98a303 100644
--- a/src/mame/video/funkyjet.c
+++ b/src/mame/video/funkyjet.c
@@ -5,6 +5,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "deco16ic.h"
 
 /******************************************************************************/
diff --git a/src/mame/video/funybubl.c b/src/mame/video/funybubl.c
index e6f6b3d4344..6e92156add3 100644
--- a/src/mame/video/funybubl.c
+++ b/src/mame/video/funybubl.c
@@ -6,6 +6,7 @@ todo - convert to tilemap
 
 
 #include "driver.h"
+#include "deprecat.h"
 
 UINT8* funybubl_banked_videoram;
 UINT8 *funybubl_paletteram;
diff --git a/src/mame/video/gaelco2.c b/src/mame/video/gaelco2.c
index ffacd698c7a..3bb309289ea 100644
--- a/src/mame/video/gaelco2.c
+++ b/src/mame/video/gaelco2.c
@@ -77,6 +77,7 @@ Multi monitor notes:
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 
 UINT16 *gaelco2_vregs;
 static UINT16 *gaelco2_videoram;
diff --git a/src/mame/video/gaelco3d.c b/src/mame/video/gaelco3d.c
index 4bc4063d9f3..9baed255b40 100644
--- a/src/mame/video/gaelco3d.c
+++ b/src/mame/video/gaelco3d.c
@@ -7,6 +7,7 @@
 **************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "eminline.h"
 #include "gaelco3d.h"
 #include "cpu/tms32031/tms32031.h"
diff --git a/src/mame/video/gaiden.c b/src/mame/video/gaiden.c
index f005ce3f5d3..1c7b5c4e519 100644
--- a/src/mame/video/gaiden.c
+++ b/src/mame/video/gaiden.c
@@ -5,6 +5,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 
 UINT16 *gaiden_videoram,*gaiden_videoram2,*gaiden_videoram3;
 int gaiden_sprite_sizey;
diff --git a/src/mame/video/galpani2.c b/src/mame/video/galpani2.c
index 7a64aeeeb1d..4af7f98f799 100644
--- a/src/mame/video/galpani2.c
+++ b/src/mame/video/galpani2.c
@@ -8,6 +8,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "kaneko16.h"
 
 /*
diff --git a/src/mame/video/galpanic.c b/src/mame/video/galpanic.c
index 6ee7f201356..a489b406520 100644
--- a/src/mame/video/galpanic.c
+++ b/src/mame/video/galpanic.c
@@ -1,4 +1,5 @@
 #include "driver.h"
+#include "deprecat.h"
 #include "kan_pand.h"
 
 UINT16 *galpanic_bgvideoram,*galpanic_fgvideoram;
diff --git a/src/mame/video/galspnbl.c b/src/mame/video/galspnbl.c
index 361ddd41f3c..6a0d7401568 100644
--- a/src/mame/video/galspnbl.c
+++ b/src/mame/video/galspnbl.c
@@ -1,4 +1,5 @@
 #include "driver.h"
+#include "deprecat.h"
 
 
 UINT16 *galspnbl_bgvideoram,*galspnbl_videoram,*galspnbl_colorram;
diff --git a/src/mame/video/genesis.c b/src/mame/video/genesis.c
index b8b1b01ff85..50cf06d8e85 100644
--- a/src/mame/video/genesis.c
+++ b/src/mame/video/genesis.c
@@ -8,6 +8,7 @@
 ***********************************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "genesis.h"
 
 /* in video/segasyse.c */
diff --git a/src/mame/video/ginganin.c b/src/mame/video/ginganin.c
index c35784e9814..0201c84d834 100644
--- a/src/mame/video/ginganin.c
+++ b/src/mame/video/ginganin.c
@@ -58,6 +58,7 @@ Note:   if MAME_DEBUG is defined, pressing Z with:
 **************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 
 /* Variables only used here */
 static tilemap *bg_tilemap, *fg_tilemap, *tx_tilemap;
diff --git a/src/mame/video/gladiatr.c b/src/mame/video/gladiatr.c
index 80b962885d4..b0598766bc8 100644
--- a/src/mame/video/gladiatr.c
+++ b/src/mame/video/gladiatr.c
@@ -5,6 +5,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 
 UINT8 *gladiatr_videoram, *gladiatr_colorram, *gladiatr_textram;
 
diff --git a/src/mame/video/glass.c b/src/mame/video/glass.c
index 55dad3acb8c..e3d7fa10b4d 100644
--- a/src/mame/video/glass.c
+++ b/src/mame/video/glass.c
@@ -7,6 +7,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 
 UINT16 *glass_spriteram;
 UINT16 *glass_vregs;
diff --git a/src/mame/video/gottlieb.c b/src/mame/video/gottlieb.c
index 501ea4ef7e5..dcee2276255 100644
--- a/src/mame/video/gottlieb.c
+++ b/src/mame/video/gottlieb.c
@@ -7,6 +7,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 
 UINT8 *gottlieb_charram;
 
diff --git a/src/mame/video/grchamp.c b/src/mame/video/grchamp.c
index 9b06f6c495a..38c14ce7af6 100644
--- a/src/mame/video/grchamp.c
+++ b/src/mame/video/grchamp.c
@@ -1,8 +1,8 @@
 /*  Video hardware for Taito Grand Champion */
 
 /* updated by Hans Andersson, dec 2005     */
-#include <math.h>
 #include "driver.h"
+#include "deprecat.h"
 #include "video/resnet.h"
 #include "includes/grchamp.h"
 
diff --git a/src/mame/video/gtia.c b/src/mame/video/gtia.c
index 9fd51d01804..b8206d44620 100644
--- a/src/mame/video/gtia.c
+++ b/src/mame/video/gtia.c
@@ -9,6 +9,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/m6502/m6502.h"
 #include "includes/atari.h"
 #include "video/gtia.h"
diff --git a/src/mame/video/gticlub.c b/src/mame/video/gticlub.c
index c01a8ab3c53..6bd2ca03c49 100644
--- a/src/mame/video/gticlub.c
+++ b/src/mame/video/gticlub.c
@@ -1,4 +1,5 @@
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/sharc/sharc.h"
 #include "machine/konppc.h"
 #include "video/poly.h"
diff --git a/src/mame/video/gundealr.c b/src/mame/video/gundealr.c
index 40916d82f9b..dbd57efa724 100644
--- a/src/mame/video/gundealr.c
+++ b/src/mame/video/gundealr.c
@@ -7,6 +7,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 
 
 
diff --git a/src/mame/video/harddriv.c b/src/mame/video/harddriv.c
index e3d5914b8c7..c2780c61928 100644
--- a/src/mame/video/harddriv.c
+++ b/src/mame/video/harddriv.c
@@ -5,6 +5,7 @@
 ****************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/tms34010/tms34010.h"
 #include "cpu/tms34010/34010ops.h"
 #include "harddriv.h"
diff --git a/src/mame/video/hng64.c b/src/mame/video/hng64.c
index 6bed1ccf068..c0cfbc39644 100644
--- a/src/mame/video/hng64.c
+++ b/src/mame/video/hng64.c
@@ -1096,7 +1096,7 @@ static void hng64_drawtilemap3(running_machine *machine, mame_bitmap *bitmap, co
 
 //  usrintf_showmessage("%d", hng64_hackTm3Count) ;
 
-	if (hng64_hackTm3Count/4 < Machine->screen[0].visarea.max_y)
+	if (hng64_hackTm3Count/4 < machine->screen[0].visarea.max_y)
 	{
 		for (i = 0; i < hng64_hackTm3Count/4; i++)
 		{
diff --git a/src/mame/video/homedata.c b/src/mame/video/homedata.c
index 6833be4b174..833bb22336a 100644
--- a/src/mame/video/homedata.c
+++ b/src/mame/video/homedata.c
@@ -1,4 +1,5 @@
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/m6809/m6809.h"
 #include "homedata.h"
 
diff --git a/src/mame/video/homerun.c b/src/mame/video/homerun.c
index b71cc09c1b2..514e4880649 100644
--- a/src/mame/video/homerun.c
+++ b/src/mame/video/homerun.c
@@ -1,4 +1,5 @@
 #include "driver.h"
+#include "deprecat.h"
 
 static int homerun_gfx_ctrl;
 static int homerun_gc_up,homerun_gc_down;
diff --git a/src/mame/video/hyprduel.c b/src/mame/video/hyprduel.c
index 06cc91527e5..485c2a6e889 100644
--- a/src/mame/video/hyprduel.c
+++ b/src/mame/video/hyprduel.c
@@ -55,6 +55,7 @@ Note:   if MAME_DEBUG is defined, pressing Z with:
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 
 #define RASTER_LINES 262
 #define FIRST_VISIBLE_LINE 0
diff --git a/src/mame/video/irobot.c b/src/mame/video/irobot.c
index a9006cb7adb..9ae04452499 100644
--- a/src/mame/video/irobot.c
+++ b/src/mame/video/irobot.c
@@ -5,6 +5,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "irobot.h"
 
 #define BITMAP_WIDTH	256
diff --git a/src/mame/video/itech32.c b/src/mame/video/itech32.c
index 131f2133af5..d484a596ed5 100644
--- a/src/mame/video/itech32.c
+++ b/src/mame/video/itech32.c
@@ -6,6 +6,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "profiler.h"
 #include "cpu/m68000/m68000.h"
 #include "itech32.h"
diff --git a/src/mame/video/itech8.c b/src/mame/video/itech8.c
index 46b55082918..c0c3eda073a 100644
--- a/src/mame/video/itech8.c
+++ b/src/mame/video/itech8.c
@@ -88,6 +88,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "video/tms34061.h"
 #include "video/tlc34076.h"
 #include "cpu/m6809/m6809.h"
diff --git a/src/mame/video/jaguar.c b/src/mame/video/jaguar.c
index 1f1cea73b3a..9232af2d9b6 100644
--- a/src/mame/video/jaguar.c
+++ b/src/mame/video/jaguar.c
@@ -135,6 +135,7 @@
 ****************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "profiler.h"
 #include "machine/atarigen.h"
 #include "cpu/mips/r3000.h"
diff --git a/src/mame/video/jedi.c b/src/mame/video/jedi.c
index d1003ad7328..65206dc0723 100644
--- a/src/mame/video/jedi.c
+++ b/src/mame/video/jedi.c
@@ -5,6 +5,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "jedi.h"
 
 
diff --git a/src/mame/video/jpmimpct.c b/src/mame/video/jpmimpct.c
index 11f4ddbc8dd..4b2759d120d 100644
--- a/src/mame/video/jpmimpct.c
+++ b/src/mame/video/jpmimpct.c
@@ -5,6 +5,7 @@
 ****************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/tms34010/tms34010.h"
 #include "jpmimpct.h"
 
diff --git a/src/mame/video/kan_pand.c b/src/mame/video/kan_pand.c
index 1d563634163..c50aabd8e5c 100644
--- a/src/mame/video/kan_pand.c
+++ b/src/mame/video/kan_pand.c
@@ -45,6 +45,7 @@
 */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "kan_pand.h"
 
 static UINT8* pandora_spriteram;
diff --git a/src/mame/video/kaneko16.c b/src/mame/video/kaneko16.c
index 4dcfcef4faf..b8449580316 100644
--- a/src/mame/video/kaneko16.c
+++ b/src/mame/video/kaneko16.c
@@ -391,11 +391,11 @@ else
 }
 
 // custom function to draw a single sprite. needed to keep correct sprites - sprites and sprites - tilemaps priorities
-static void kaneko16_draw_sprites_custom(mame_bitmap *dest_bmp,const gfx_element *gfx,
+static void kaneko16_draw_sprites_custom(running_machine *machine, mame_bitmap *dest_bmp,const gfx_element *gfx,
 		UINT32 code,UINT32 color,int flipx,int flipy,int sx,int sy,
 		const rectangle *clip,int priority)
 {
-	const pen_t *pal = &Machine->remapped_colortable[gfx->color_base + gfx->color_granularity * (color % gfx->total_colors)];
+	const pen_t *pal = &machine->remapped_colortable[gfx->color_base + gfx->color_granularity * (color % gfx->total_colors)];
 	UINT8 *source_base = gfx->gfxdata + (code % gfx->total_elements) * gfx->char_modulo;
 
 	int sprite_screen_height = ((1<<16)*gfx->height+0x8000)>>16;
@@ -594,7 +594,8 @@ void kaneko16_draw_sprites(running_machine *machine, mame_bitmap *bitmap, const
 
 		UINT32 primask = kaneko16_priority.sprite[curr_pri];
 
-		kaneko16_draw_sprites_custom(	bitmap,machine->gfx[0],
+		kaneko16_draw_sprites_custom(	machine,
+										bitmap,machine->gfx[0],
 										s->code,
 										s->color,
 										s->flipx, s->flipy,
diff --git a/src/mame/video/kangaroo.c b/src/mame/video/kangaroo.c
index 0edb4c61c2c..d224f840d10 100644
--- a/src/mame/video/kangaroo.c
+++ b/src/mame/video/kangaroo.c
@@ -5,6 +5,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "kangaroo.h"
 
 
diff --git a/src/mame/video/konamigx.c b/src/mame/video/konamigx.c
index 6928d949cec..5c16fa7b39a 100644
--- a/src/mame/video/konamigx.c
+++ b/src/mame/video/konamigx.c
@@ -4,6 +4,7 @@
  */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "video/konamiic.h"
 #include "machine/konamigx.h"
 
diff --git a/src/mame/video/konamiic.c b/src/mame/video/konamiic.c
index 45b92e55582..934afa0b026 100644
--- a/src/mame/video/konamiic.c
+++ b/src/mame/video/konamiic.c
@@ -1149,6 +1149,7 @@ Registers (word-wise):
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "video/konamiic.h"
 
 #define VERBOSE 0
diff --git a/src/mame/video/ladybug.c b/src/mame/video/ladybug.c
index 08a4f6b77bc..ea0f85e417f 100644
--- a/src/mame/video/ladybug.c
+++ b/src/mame/video/ladybug.c
@@ -7,6 +7,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 
 /* Use the Zero Hour star generator board */
 extern void redclash_set_stars_enable( UINT8 on );
diff --git a/src/mame/video/lemmings.c b/src/mame/video/lemmings.c
index 7e34ad90423..fd17115aa11 100644
--- a/src/mame/video/lemmings.c
+++ b/src/mame/video/lemmings.c
@@ -13,6 +13,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "includes/lemmings.h"
 
 UINT16 *lemmings_pixel_0_data,*lemmings_pixel_1_data,*lemmings_vram_data,*lemmings_control_data;
diff --git a/src/mame/video/lethalj.c b/src/mame/video/lethalj.c
index b3b86316224..6a32da4d195 100644
--- a/src/mame/video/lethalj.c
+++ b/src/mame/video/lethalj.c
@@ -5,6 +5,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/tms34010/tms34010.h"
 #include "lethalj.h"
 
diff --git a/src/mame/video/liberate.c b/src/mame/video/liberate.c
index 47896f0f068..fa00bd62df2 100644
--- a/src/mame/video/liberate.c
+++ b/src/mame/video/liberate.c
@@ -10,6 +10,7 @@
 *******************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/m6502/m6502.h"
 
 static int background_color,background_disable;
diff --git a/src/mame/video/lordgun.c b/src/mame/video/lordgun.c
index 46b489433ea..6777606f07c 100644
--- a/src/mame/video/lordgun.c
+++ b/src/mame/video/lordgun.c
@@ -36,6 +36,7 @@ Note:   if MAME_DEBUG is defined, pressing Z with:
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 
 // Variables needed by driver:
 
diff --git a/src/mame/video/m72.c b/src/mame/video/m72.c
index 98bc5b73c8b..99d69989d1c 100644
--- a/src/mame/video/m72.c
+++ b/src/mame/video/m72.c
@@ -1,4 +1,5 @@
 #include "driver.h"
+#include "deprecat.h"
 #include "audio/m72.h"
 #include "m72.h"
 
diff --git a/src/mame/video/macrossp.c b/src/mame/video/macrossp.c
index 6fc8213ffb6..f45f7be7ad2 100644
--- a/src/mame/video/macrossp.c
+++ b/src/mame/video/macrossp.c
@@ -2,6 +2,7 @@
   see DRIVER file for notes */
 
 #include "driver.h"
+#include "deprecat.h"
 
 
 UINT32 *macrossp_scra_videoram, *macrossp_scra_videoregs;
diff --git a/src/mame/video/madmotor.c b/src/mame/video/madmotor.c
index c6d415c9268..d81b8286679 100644
--- a/src/mame/video/madmotor.c
+++ b/src/mame/video/madmotor.c
@@ -7,6 +7,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 
 UINT16 *madmotor_pf1_rowscroll;
 UINT16 *madmotor_pf1_data,*madmotor_pf2_data,*madmotor_pf3_data;
diff --git a/src/mame/video/mainsnk.c b/src/mame/video/mainsnk.c
index 0b943ef9536..47c7bfe9bc8 100644
--- a/src/mame/video/mainsnk.c
+++ b/src/mame/video/mainsnk.c
@@ -1,4 +1,5 @@
 #include "driver.h"
+#include "deprecat.h"
 
 static UINT8 bg_color,  old_bg_color;
 #define mainsnk_offset 8
diff --git a/src/mame/video/mario.c b/src/mame/video/mario.c
index e78395c389f..3e8dfb436a7 100644
--- a/src/mame/video/mario.c
+++ b/src/mame/video/mario.c
@@ -7,6 +7,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "video/resnet.h"
 
 #include "includes/mario.h"
diff --git a/src/mame/video/matmania.c b/src/mame/video/matmania.c
index 305445cac5b..7a47fbea8e0 100644
--- a/src/mame/video/matmania.c
+++ b/src/mame/video/matmania.c
@@ -13,6 +13,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 
 
 
diff --git a/src/mame/video/mcr.c b/src/mame/video/mcr.c
index 01f2e588efa..ce874ccb474 100644
--- a/src/mame/video/mcr.c
+++ b/src/mame/video/mcr.c
@@ -5,6 +5,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "mcr.h"
 
 
diff --git a/src/mame/video/mcr3.c b/src/mame/video/mcr3.c
index 7366ea78cdd..0769feeb36b 100644
--- a/src/mame/video/mcr3.c
+++ b/src/mame/video/mcr3.c
@@ -5,6 +5,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "mcr.h"
 
 
diff --git a/src/mame/video/mcr68.c b/src/mame/video/mcr68.c
index cba2fcb06a6..f7fdfd7f5b2 100644
--- a/src/mame/video/mcr68.c
+++ b/src/mame/video/mcr68.c
@@ -5,6 +5,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "mcr.h"
 
 
diff --git a/src/mame/video/megasys1.c b/src/mame/video/megasys1.c
index d9bfa67965f..1dce5dfe976 100644
--- a/src/mame/video/megasys1.c
+++ b/src/mame/video/megasys1.c
@@ -192,6 +192,7 @@ actual code sent to the hardware.
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "megasys1.h"
 
 /* Variables defined here, that have to be shared: */
diff --git a/src/mame/video/metro.c b/src/mame/video/metro.c
index b8beed934bf..ae3bfb3e97a 100644
--- a/src/mame/video/metro.c
+++ b/src/mame/video/metro.c
@@ -52,6 +52,7 @@ Note:   if MAME_DEBUG is defined, pressing Z with:
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "video/konamiic.h"
 
 /* Variables that driver has access to: */
diff --git a/src/mame/video/midtunit.c b/src/mame/video/midtunit.c
index 39897713ab3..f4f1e2019be 100644
--- a/src/mame/video/midtunit.c
+++ b/src/mame/video/midtunit.c
@@ -5,6 +5,7 @@
 **************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "profiler.h"
 #include "cpu/tms34010/tms34010.h"
 #include "cpu/tms34010/34010ops.h"
diff --git a/src/mame/video/midvunit.c b/src/mame/video/midvunit.c
index 4c37bb4f4ac..8a35cd68600 100644
--- a/src/mame/video/midvunit.c
+++ b/src/mame/video/midvunit.c
@@ -5,6 +5,7 @@
 **************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/tms34010/tms34010.h"
 #include "cpu/adsp2100/adsp2100.h"
 #include "audio/williams.h"
diff --git a/src/mame/video/midyunit.c b/src/mame/video/midyunit.c
index e323007f941..a9a68bcb202 100644
--- a/src/mame/video/midyunit.c
+++ b/src/mame/video/midyunit.c
@@ -5,6 +5,7 @@
 **************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "profiler.h"
 #include "cpu/tms34010/tms34010.h"
 #include "cpu/tms34010/34010ops.h"
diff --git a/src/mame/video/midzeus.c b/src/mame/video/midzeus.c
index d7a24172ecb..379b8694204 100644
--- a/src/mame/video/midzeus.c
+++ b/src/mame/video/midzeus.c
@@ -5,6 +5,7 @@
 **************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "eminline.h"
 #include "includes/midzeus.h"
 #include "video/poly.h"
diff --git a/src/mame/video/mjsister.c b/src/mame/video/mjsister.c
index 737caa855b4..eca4df6c2d4 100644
--- a/src/mame/video/mjsister.c
+++ b/src/mame/video/mjsister.c
@@ -8,6 +8,7 @@ Video hardware
 *****************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 
 int mjsister_screen_redraw;
 int mjsister_flip_screen;
diff --git a/src/mame/video/model1.c b/src/mame/video/model1.c
index 931a8c8626b..91b181a98db 100644
--- a/src/mame/video/model1.c
+++ b/src/mame/video/model1.c
@@ -1,6 +1,6 @@
 #include "driver.h"
+#include "deprecat.h"
 #include "video/segaic24.h"
-#include <math.h>
 
 #define LOG_TGP_VIDEO 0
 
diff --git a/src/mame/video/ms32.c b/src/mame/video/ms32.c
index ccaf805a62c..a20d0c5a0f5 100644
--- a/src/mame/video/ms32.c
+++ b/src/mame/video/ms32.c
@@ -13,6 +13,7 @@ priority should be given to
 
 
 #include "driver.h"
+#include "deprecat.h"
 
 //UINT32 *ms32_fce00000;
 UINT32 *ms32_roz_ctrl;
diff --git a/src/mame/video/n8080.c b/src/mame/video/n8080.c
index 400b8752d94..f5a0b93d74a 100644
--- a/src/mame/video/n8080.c
+++ b/src/mame/video/n8080.c
@@ -5,8 +5,8 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "includes/n8080.h"
-#include <math.h>
 
 int spacefev_red_screen;
 int spacefev_red_cannon;
diff --git a/src/mame/video/namcona1.c b/src/mame/video/namcona1.c
index 66cca49f864..bf8cd4005b1 100644
--- a/src/mame/video/namcona1.c
+++ b/src/mame/video/namcona1.c
@@ -1,6 +1,7 @@
 /*  Namco System NA1/2 Video Hardware */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "namcona1.h"
 
 #define NAMCONA1_NUM_TILEMAPS 4
diff --git a/src/mame/video/namcos1.c b/src/mame/video/namcos1.c
index 350e2c4984b..471d5869c71 100644
--- a/src/mame/video/namcos1.c
+++ b/src/mame/video/namcos1.c
@@ -5,6 +5,7 @@ Namco System 1 Video Hardware
 *******************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 
 
 /*
diff --git a/src/mame/video/namcos2.c b/src/mame/video/namcos2.c
index 39854728d6a..ed5986e9e0f 100644
--- a/src/mame/video/namcos2.c
+++ b/src/mame/video/namcos2.c
@@ -1,6 +1,7 @@
 /* video hardware for Namco System II */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "namcos2.h"
 #include "namcoic.h"
 
diff --git a/src/mame/video/namcos21.c b/src/mame/video/namcos21.c
index 100b066b179..5e2292c0e0d 100644
--- a/src/mame/video/namcos21.c
+++ b/src/mame/video/namcos21.c
@@ -7,6 +7,7 @@ Namco System 21 Video Hardware
 */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "namcos2.h"
 #include "namcoic.h"
 #include "namcos21.h"
diff --git a/src/mame/video/namcos22.c b/src/mame/video/namcos22.c
index adc3c95a8ca..7aa96cafb0d 100644
--- a/src/mame/video/namcos22.c
+++ b/src/mame/video/namcos22.c
@@ -34,11 +34,11 @@ SPOT TABLE test
 */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "eminline.h"
 #include "video/rgbutil.h"
 #include "namcos22.h"
 #include "video/poly.h"
-#include <math.h>
 
 // uncomment this line to render everything as quads
 //#define RENDER_AS_QUADS
diff --git a/src/mame/video/nbmj8688.c b/src/mame/video/nbmj8688.c
index a79c2c50f43..00257f8d5df 100644
--- a/src/mame/video/nbmj8688.c
+++ b/src/mame/video/nbmj8688.c
@@ -7,6 +7,7 @@
 ******************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "nb1413m3.h"
 
 
diff --git a/src/mame/video/nbmj8891.c b/src/mame/video/nbmj8891.c
index db4b683237b..34cd935aa78 100644
--- a/src/mame/video/nbmj8891.c
+++ b/src/mame/video/nbmj8891.c
@@ -7,6 +7,7 @@
 ******************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "nb1413m3.h"
 
 
diff --git a/src/mame/video/nbmj8991.c b/src/mame/video/nbmj8991.c
index 98bae54e529..397fe46cc28 100644
--- a/src/mame/video/nbmj8991.c
+++ b/src/mame/video/nbmj8991.c
@@ -7,6 +7,7 @@
 ******************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "nb1413m3.h"
 
 
diff --git a/src/mame/video/nbmj9195.c b/src/mame/video/nbmj9195.c
index 501ed4e4f9d..e9a674d2a4c 100644
--- a/src/mame/video/nbmj9195.c
+++ b/src/mame/video/nbmj9195.c
@@ -8,6 +8,7 @@
 ******************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 
 
 #define	VRAM_MAX	2
diff --git a/src/mame/video/nemesis.c b/src/mame/video/nemesis.c
index ff347613f5d..e3d5b064ed0 100644
--- a/src/mame/video/nemesis.c
+++ b/src/mame/video/nemesis.c
@@ -5,7 +5,7 @@
 ***************************************************************************/
 
 #include "driver.h"
-#include <math.h>
+#include "deprecat.h"
 
 UINT16 *nemesis_videoram1b;
 UINT16 *nemesis_videoram2b;
diff --git a/src/mame/video/niyanpai.c b/src/mame/video/niyanpai.c
index 6789ce32c45..aa799a7462c 100644
--- a/src/mame/video/niyanpai.c
+++ b/src/mame/video/niyanpai.c
@@ -7,6 +7,7 @@
 ******************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 
 
 #define	VRAM_MAX	3
diff --git a/src/mame/video/ojankohs.c b/src/mame/video/ojankohs.c
index 276c9ebc9d2..1910171d2ca 100644
--- a/src/mame/video/ojankohs.c
+++ b/src/mame/video/ojankohs.c
@@ -8,6 +8,7 @@
 ******************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/z80/z80.h"
 
 
diff --git a/src/mame/video/pacland.c b/src/mame/video/pacland.c
index f3390df8a6a..36c10e280e5 100644
--- a/src/mame/video/pacland.c
+++ b/src/mame/video/pacland.c
@@ -25,6 +25,7 @@ sprite color 0x7f will erase the tilemap and force it to be transparent.
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 
 
 UINT8 *pacland_videoram,*pacland_videoram2,*pacland_spriteram;
diff --git a/src/mame/video/pacman.c b/src/mame/video/pacman.c
index 9be86130a12..35c568c9a3f 100644
--- a/src/mame/video/pacman.c
+++ b/src/mame/video/pacman.c
@@ -17,6 +17,7 @@
 **************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "includes/pacman.h"
 #include "video/resnet.h"
 
diff --git a/src/mame/video/paradise.c b/src/mame/video/paradise.c
index f0db0429327..e3b7857396f 100644
--- a/src/mame/video/paradise.c
+++ b/src/mame/video/paradise.c
@@ -26,6 +26,7 @@ Note:   if MAME_DEBUG is defined, pressing Z with:
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "paradise.h"
 
 /* Variables that driver has access to: */
diff --git a/src/mame/video/pastelg.c b/src/mame/video/pastelg.c
index 5c59c562b0e..53029853d4d 100644
--- a/src/mame/video/pastelg.c
+++ b/src/mame/video/pastelg.c
@@ -7,6 +7,7 @@
 ******************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "nb1413m3.h"
 
 
diff --git a/src/mame/video/pktgaldx.c b/src/mame/video/pktgaldx.c
index 565fcc8f2b4..becfc35cc41 100644
--- a/src/mame/video/pktgaldx.c
+++ b/src/mame/video/pktgaldx.c
@@ -1,4 +1,5 @@
 #include "driver.h"
+#include "deprecat.h"
 #include "deco16ic.h"
 
 UINT16* pcktgaldb_fgram;
diff --git a/src/mame/video/playch10.c b/src/mame/video/playch10.c
index 5d8dff5d9b7..93f440e2ec5 100644
--- a/src/mame/video/playch10.c
+++ b/src/mame/video/playch10.c
@@ -1,4 +1,5 @@
 #include "driver.h"
+#include "deprecat.h"
 #include "video/ppu2c0x.h"
 
 /* from machine */
diff --git a/src/mame/video/playmark.c b/src/mame/video/playmark.c
index 577ac076305..a1d05bdfd5a 100644
--- a/src/mame/video/playmark.c
+++ b/src/mame/video/playmark.c
@@ -1,4 +1,5 @@
 #include "driver.h"
+#include "deprecat.h"
 
 UINT16 *bigtwin_bgvideoram;
 UINT16 *wbeachvl_videoram1,*wbeachvl_videoram2,*wbeachvl_videoram3;
diff --git a/src/mame/video/policetr.c b/src/mame/video/policetr.c
index 3d763360cce..73bdb31ba21 100644
--- a/src/mame/video/policetr.c
+++ b/src/mame/video/policetr.c
@@ -5,6 +5,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/mips/r3000.h"
 #include "policetr.h"
 
diff --git a/src/mame/video/popeye.c b/src/mame/video/popeye.c
index 84b1fcc18a4..162e92bebc1 100644
--- a/src/mame/video/popeye.c
+++ b/src/mame/video/popeye.c
@@ -7,6 +7,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 
 UINT8 *popeye_background_pos;
 UINT8 *popeye_palettebank;
diff --git a/src/mame/video/popper.c b/src/mame/video/popper.c
index 5b2b1cd5030..87f6f7ad154 100644
--- a/src/mame/video/popper.c
+++ b/src/mame/video/popper.c
@@ -4,6 +4,7 @@ Omori Electric CAD (OEC) 1983
 */
 
 #include "driver.h"
+#include "deprecat.h"
 
 static tilemap *popper_p123_tilemap, *popper_p0_tilemap, *popper_ol_p123_tilemap, *popper_ol_p0_tilemap;
 UINT8 *popper_videoram, *popper_attribram, *popper_ol_videoram, *popper_ol_attribram, *popper_spriteram;
diff --git a/src/mame/video/powerins.c b/src/mame/video/powerins.c
index 629c768919e..cc3e67c375b 100644
--- a/src/mame/video/powerins.c
+++ b/src/mame/video/powerins.c
@@ -38,6 +38,7 @@ Note:   if MAME_DEBUG is defined, pressing Z with:
 **************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 
 /* Variables that driver has access to: */
 UINT16 *powerins_vram_0, *powerins_vctrl_0;
diff --git a/src/mame/video/ppu2c0x.c b/src/mame/video/ppu2c0x.c
index 7d8f9028e50..f93f2b4acaa 100644
--- a/src/mame/video/ppu2c0x.c
+++ b/src/mame/video/ppu2c0x.c
@@ -24,9 +24,9 @@ NES-specific:
 
 ******************************************************************************/
 
-#include <math.h>
 #include "driver.h"
 #include "profiler.h"
+#include "deprecat.h"
 #include "video/ppu2c0x.h"
 
 /* constant definitions */
diff --git a/src/mame/video/psikyosh.c b/src/mame/video/psikyosh.c
index cde52334007..8899722920a 100644
--- a/src/mame/video/psikyosh.c
+++ b/src/mame/video/psikyosh.c
@@ -90,6 +90,7 @@ sol divide doesn't seem to make much use of tilemaps at all, it uses them to fad
 */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "profiler.h"
 #include "psikyosh.h"
 
diff --git a/src/mame/video/psx.c b/src/mame/video/psx.c
index 7a47a3b95ec..202b5cf8cf5 100644
--- a/src/mame/video/psx.c
+++ b/src/mame/video/psx.c
@@ -17,8 +17,8 @@
 
 ***************************************************************************/
 
-#include <stdarg.h>
 #include "driver.h"
+#include "deprecat.h"
 #include "includes/psx.h"
 
 #define STOP_ON_ERROR ( 0 )
diff --git a/src/mame/video/psychic5.c b/src/mame/video/psychic5.c
index 860038eed92..2baf487c00a 100644
--- a/src/mame/video/psychic5.c
+++ b/src/mame/video/psychic5.c
@@ -6,6 +6,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "jalblend.c"
 
 #define	BG_SCROLLX_LSB		0x308
diff --git a/src/mame/video/qix.c b/src/mame/video/qix.c
index db2ccbea614..a6b8c5aaa1f 100644
--- a/src/mame/video/qix.c
+++ b/src/mame/video/qix.c
@@ -7,6 +7,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "qix.h"
 #include "video/crtc6845.h"
 
diff --git a/src/mame/video/quizdna.c b/src/mame/video/quizdna.c
index adba3c0d13e..479e9609434 100644
--- a/src/mame/video/quizdna.c
+++ b/src/mame/video/quizdna.c
@@ -10,6 +10,7 @@ Video hardware
 ******************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 
 static UINT8 *quizdna_bg_ram;
 static UINT8 *quizdna_fg_ram;
diff --git a/src/mame/video/realbrk.c b/src/mame/video/realbrk.c
index c9427d2646d..a5f44f19a7c 100644
--- a/src/mame/video/realbrk.c
+++ b/src/mame/video/realbrk.c
@@ -20,6 +20,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "realbrk.h"
 
 //UINT16 *realbrk_vram_0, *realbrk_vram_1, *realbrk_vram_2, *realbrk_vregs;
diff --git a/src/mame/video/rockola.c b/src/mame/video/rockola.c
index fb07854e84c..b8c6b6efcf7 100644
--- a/src/mame/video/rockola.c
+++ b/src/mame/video/rockola.c
@@ -7,6 +7,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 
 UINT8 *rockola_videoram2;
 UINT8 *rockola_charram;
diff --git a/src/mame/video/rohga.c b/src/mame/video/rohga.c
index 0ba9ea20806..da8dece3215 100644
--- a/src/mame/video/rohga.c
+++ b/src/mame/video/rohga.c
@@ -5,6 +5,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "deco16ic.h"
 
 static UINT16 * rohga_spriteram;
diff --git a/src/mame/video/rpunch.c b/src/mame/video/rpunch.c
index 75e1d964ac5..8de69de7ca7 100644
--- a/src/mame/video/rpunch.c
+++ b/src/mame/video/rpunch.c
@@ -7,6 +7,7 @@
 ****************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 
 
 #define BITMAP_WIDTH	304
diff --git a/src/mame/video/runaway.c b/src/mame/video/runaway.c
index 0f94d91daa8..4b167427c70 100644
--- a/src/mame/video/runaway.c
+++ b/src/mame/video/runaway.c
@@ -5,6 +5,7 @@
 ****************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 
 
 static tilemap *bg_tilemap;
diff --git a/src/mame/video/segag80r.c b/src/mame/video/segag80r.c
index d7d34682aef..586ef848f26 100644
--- a/src/mame/video/segag80r.c
+++ b/src/mame/video/segag80r.c
@@ -5,6 +5,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "segag80r.h"
 #include "rescap.h"
 #include "video/resnet.h"
diff --git a/src/mame/video/segaic16.c b/src/mame/video/segaic16.c
index e41a400d6da..a59fe88f1df 100644
--- a/src/mame/video/segaic16.c
+++ b/src/mame/video/segaic16.c
@@ -351,6 +351,7 @@ Quick review of the system16 hardware:
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "segaic16.h"
 #include "video/resnet.h"
 
diff --git a/src/mame/video/segaic24.c b/src/mame/video/segaic24.c
index 5355be8a774..ec05a9e8b2d 100644
--- a/src/mame/video/segaic24.c
+++ b/src/mame/video/segaic24.c
@@ -23,6 +23,7 @@ System 24      68000x2  315-5292   315-5293  315-5294  315-5242        ym2151 da
 */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "segaic24.h"
 
 
diff --git a/src/mame/video/segaic24.h b/src/mame/video/segaic24.h
index 2c7e3edf83f..9c1e481de82 100644
--- a/src/mame/video/segaic24.h
+++ b/src/mame/video/segaic24.h
@@ -6,8 +6,6 @@
    just made a copy & renamed them for now to avoid any conflicts
 */
 
-//#include "vmixer.h"
-
 WRITE16_HANDLER (system24temp_sys16_paletteram1_w);
 
 // Tilemaps
diff --git a/src/mame/video/segas32.c b/src/mame/video/segas32.c
index 5989ae01ac9..532cf99c4c0 100644
--- a/src/mame/video/segas32.c
+++ b/src/mame/video/segas32.c
@@ -142,6 +142,7 @@
 */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "profiler.h"
 #include "segas32.h"
 
diff --git a/src/mame/video/segasyse.c b/src/mame/video/segasyse.c
index 5a57b8269b7..b5a4a33b446 100644
--- a/src/mame/video/segasyse.c
+++ b/src/mame/video/segasyse.c
@@ -8,6 +8,7 @@
 *******************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 
 /*-- Variables --*/
 
diff --git a/src/mame/video/seibuspi.c b/src/mame/video/seibuspi.c
index 52ad30594c4..f23c515f951 100644
--- a/src/mame/video/seibuspi.c
+++ b/src/mame/video/seibuspi.c
@@ -1,4 +1,5 @@
 #include "driver.h"
+#include "deprecat.h"
 
 static tilemap *text_layer;
 static tilemap *back_layer;
diff --git a/src/mame/video/seta.c b/src/mame/video/seta.c
index 2665af69f03..c646ed1046c 100644
--- a/src/mame/video/seta.c
+++ b/src/mame/video/seta.c
@@ -136,6 +136,7 @@ Note:   if MAME_DEBUG is defined, pressing Z with:
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "sound/x1_010.h"
 #include "seta.h"
 
diff --git a/src/mame/video/shangha3.c b/src/mame/video/shangha3.c
index 94e15386cf8..f26cc95729e 100644
--- a/src/mame/video/shangha3.c
+++ b/src/mame/video/shangha3.c
@@ -59,6 +59,7 @@ Word | Bit(s)           | Use
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "profiler.h"
 
 
diff --git a/src/mame/video/shisen.c b/src/mame/video/shisen.c
index 7b8ad5bde8e..a24d9a2ae85 100644
--- a/src/mame/video/shisen.c
+++ b/src/mame/video/shisen.c
@@ -1,4 +1,5 @@
 #include "driver.h"
+#include "deprecat.h"
 
 static int gfxbank;
 
diff --git a/src/mame/video/sidearms.c b/src/mame/video/sidearms.c
index 5b2159d5772..40a07ede437 100644
--- a/src/mame/video/sidearms.c
+++ b/src/mame/video/sidearms.c
@@ -7,6 +7,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 
 extern int sidearms_gameid;
 
diff --git a/src/mame/video/simpl156.c b/src/mame/video/simpl156.c
index 48ad5f4cb33..5567e5748e3 100644
--- a/src/mame/video/simpl156.c
+++ b/src/mame/video/simpl156.c
@@ -3,6 +3,7 @@
 */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "deco16ic.h"
 
 /*
diff --git a/src/mame/video/skullxbo.c b/src/mame/video/skullxbo.c
index a492c16b347..b009626ed0d 100644
--- a/src/mame/video/skullxbo.c
+++ b/src/mame/video/skullxbo.c
@@ -5,6 +5,7 @@
 ****************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "machine/atarigen.h"
 #include "includes/skullxbo.h"
 
diff --git a/src/mame/video/skychut.c b/src/mame/video/skychut.c
index d9f97b60186..6b13882b02a 100644
--- a/src/mame/video/skychut.c
+++ b/src/mame/video/skychut.c
@@ -11,6 +11,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "skychut.h"
 
 static tilemap *		tx_tilemap;
diff --git a/src/mame/video/snk68.c b/src/mame/video/snk68.c
index 03dcf08a1c5..0f72b1b6ea0 100644
--- a/src/mame/video/snk68.c
+++ b/src/mame/video/snk68.c
@@ -13,6 +13,7 @@ Notes:
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 
 static int sprite_flip, pow_charbase=0; //*
 static tilemap *fix_tilemap;
diff --git a/src/mame/video/sshangha.c b/src/mame/video/sshangha.c
index d5b14e07156..845553327d1 100644
--- a/src/mame/video/sshangha.c
+++ b/src/mame/video/sshangha.c
@@ -6,6 +6,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 
 UINT16 *sshangha_pf2_data,*sshangha_pf1_data;
 UINT16 *sshangha_pf1_rowscroll,*sshangha_pf2_rowscroll;
diff --git a/src/mame/video/ssozumo.c b/src/mame/video/ssozumo.c
index 4d88ee57840..52a5ec8320b 100644
--- a/src/mame/video/ssozumo.c
+++ b/src/mame/video/ssozumo.c
@@ -8,6 +8,7 @@ Driver by Takahiro Nogi (nogi@kt.rim.or.jp) 1999/10/04
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 
 UINT8 *ssozumo_videoram2;
 UINT8 *ssozumo_colorram2;
diff --git a/src/mame/video/ssv.c b/src/mame/video/ssv.c
index 3191f11b261..b2949af09e7 100644
--- a/src/mame/video/ssv.c
+++ b/src/mame/video/ssv.c
@@ -136,6 +136,7 @@ Note: press Z to show some info on each sprite (debug builds only)
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "seta.h"
 #ifdef MAME_DEBUG
 #include "ui.h"
diff --git a/src/mame/video/st0016.c b/src/mame/video/st0016.c
index 1ef6c085639..f86eb4bd1dd 100644
--- a/src/mame/video/st0016.c
+++ b/src/mame/video/st0016.c
@@ -4,6 +4,7 @@
 ************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "st0016.h"
 
 UINT8 *st0016_charram,*st0016_spriteram,*st0016_paletteram;
diff --git a/src/mame/video/stadhero.c b/src/mame/video/stadhero.c
index ea6c0dc11c1..8e5b4366c63 100644
--- a/src/mame/video/stadhero.c
+++ b/src/mame/video/stadhero.c
@@ -10,6 +10,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 
 UINT16 *stadhero_pf1_data;
 static UINT16 *stadhero_pf2_data;
diff --git a/src/mame/video/starfire.c b/src/mame/video/starfire.c
index 4341a6ff0b8..0a1b703fca9 100644
--- a/src/mame/video/starfire.c
+++ b/src/mame/video/starfire.c
@@ -5,6 +5,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "includes/starfire.h"
 
 /* local allocated storage */
diff --git a/src/mame/video/starshp1.c b/src/mame/video/starshp1.c
index a7dfe164c62..6a7b5fe30e9 100644
--- a/src/mame/video/starshp1.c
+++ b/src/mame/video/starshp1.c
@@ -5,8 +5,8 @@ Atari Starship 1 video emulation
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "includes/starshp1.h"
-#include <math.h>
 
 UINT8* starshp1_playfield_ram;
 UINT8* starshp1_hpos_ram;
diff --git a/src/mame/video/stvvdp1.c b/src/mame/video/stvvdp1.c
index 44ea361987b..d994ec00fb3 100644
--- a/src/mame/video/stvvdp1.c
+++ b/src/mame/video/stvvdp1.c
@@ -17,6 +17,7 @@ Framebuffer todo:
 
 
 #include "driver.h"
+#include "deprecat.h"
 
 static int vdp1_sprite_log = 0;
 
diff --git a/src/mame/video/stvvdp2.c b/src/mame/video/stvvdp2.c
index eacf60c92b3..18230fb7767 100644
--- a/src/mame/video/stvvdp2.c
+++ b/src/mame/video/stvvdp2.c
@@ -82,6 +82,7 @@ In other words,the first three types uses the offset and not the color allocated
 #include "driver.h"
 #include "eminline.h"
 #include "profiler.h"
+#include "deprecat.h"
 
 UINT32* stv_vdp2_regs;
 UINT32* stv_vdp2_vram;
diff --git a/src/mame/video/subs.c b/src/mame/video/subs.c
index fd36fc86f80..cde7f809732 100644
--- a/src/mame/video/subs.c
+++ b/src/mame/video/subs.c
@@ -5,6 +5,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "subs.h"
 #include "sound/discrete.h"
 
diff --git a/src/mame/video/suna16.c b/src/mame/video/suna16.c
index ec7ab020e27..dddbd117ed3 100644
--- a/src/mame/video/suna16.c
+++ b/src/mame/video/suna16.c
@@ -58,6 +58,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 
 static int color_bank;
 
diff --git a/src/mame/video/suna8.c b/src/mame/video/suna8.c
index b118f6d69b9..fc28d56b0d0 100644
--- a/src/mame/video/suna8.c
+++ b/src/mame/video/suna8.c
@@ -70,6 +70,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 
 #define TILEMAPS 0
 
diff --git a/src/mame/video/supbtime.c b/src/mame/video/supbtime.c
index 96a1192584f..891206ef7db 100644
--- a/src/mame/video/supbtime.c
+++ b/src/mame/video/supbtime.c
@@ -13,6 +13,7 @@ End sequence uses rowscroll '98 c0' on pf1 (jmp to 1d61a on supbtimj)
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "deco16ic.h"
 
 /******************************************************************************/
diff --git a/src/mame/video/superqix.c b/src/mame/video/superqix.c
index b63d9149b6f..e669735a3db 100644
--- a/src/mame/video/superqix.c
+++ b/src/mame/video/superqix.c
@@ -7,6 +7,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 
 UINT8 *superqix_videoram;
 UINT8 *superqix_bitmapram,*superqix_bitmapram2;
diff --git a/src/mame/video/suprnova.c b/src/mame/video/suprnova.c
index f653b6dee18..be60431a648 100644
--- a/src/mame/video/suprnova.c
+++ b/src/mame/video/suprnova.c
@@ -15,6 +15,7 @@ Tilemap flip flags were reversed
 */
 
 #include "driver.h"
+#include "deprecat.h"
 
 #define SUPRNOVA_DECODE_BUFFER_SIZE 0x2000
 
diff --git a/src/mame/video/system1.c b/src/mame/video/system1.c
index 6618071ae64..9ac401a72b0 100644
--- a/src/mame/video/system1.c
+++ b/src/mame/video/system1.c
@@ -8,6 +8,7 @@
 *************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "system1.h"
 
 UINT8 *system1_scroll_y;
diff --git a/src/mame/video/system16.c b/src/mame/video/system16.c
index 68e0a9f1566..a1d33051af3 100644
--- a/src/mame/video/system16.c
+++ b/src/mame/video/system16.c
@@ -89,6 +89,7 @@ type1       type0           function
 
 ***************************************************************************/
 #include "driver.h"
+#include "deprecat.h"
 #include "system16.h"
 #include "video/resnet.h"
 
diff --git a/src/mame/video/taito_b.c b/src/mame/video/taito_b.c
index f79f5d65290..2eab084fac2 100644
--- a/src/mame/video/taito_b.c
+++ b/src/mame/video/taito_b.c
@@ -1,4 +1,5 @@
 #include "driver.h"
+#include "deprecat.h"
 #include "profiler.h"
 
 UINT16 *taitob_scroll;
diff --git a/src/mame/video/taito_f2.c b/src/mame/video/taito_f2.c
index 04f267dcf8f..9040e7aea7f 100644
--- a/src/mame/video/taito_f2.c
+++ b/src/mame/video/taito_f2.c
@@ -1,4 +1,5 @@
 #include "driver.h"
+#include "deprecat.h"
 #include "video/taitoic.h"
 #include "includes/taito_f2.h"
 
diff --git a/src/mame/video/taito_f3.c b/src/mame/video/taito_f3.c
index b778cb3fc55..55a4e8424a8 100644
--- a/src/mame/video/taito_f3.c
+++ b/src/mame/video/taito_f3.c
@@ -204,6 +204,7 @@ Playfield tile info:
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "taito_f3.h"
 #include "ui.h"
 
diff --git a/src/mame/video/taito_h.c b/src/mame/video/taito_h.c
index 1c90da5306d..6c0fffe14c6 100644
--- a/src/mame/video/taito_h.c
+++ b/src/mame/video/taito_h.c
@@ -46,6 +46,7 @@ sprite RAM
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "taitoic.h"
 
 
diff --git a/src/mame/video/taito_l.c b/src/mame/video/taito_l.c
index 8b2771a73d4..36e626811d4 100644
--- a/src/mame/video/taito_l.c
+++ b/src/mame/video/taito_l.c
@@ -1,4 +1,5 @@
 #include "driver.h"
+#include "deprecat.h"
 
 
 extern UINT8 *taitol_rambanks;
diff --git a/src/mame/video/taito_z.c b/src/mame/video/taito_z.c
index 76b0ca864b0..7141df5137c 100644
--- a/src/mame/video/taito_z.c
+++ b/src/mame/video/taito_z.c
@@ -1,4 +1,5 @@
 #include "driver.h"
+#include "deprecat.h"
 #include "video/taitoic.h"
 
 #define TC0100SCN_GFX_NUM 1
diff --git a/src/mame/video/taitoair.c b/src/mame/video/taitoair.c
index d8912d76d23..19850765105 100644
--- a/src/mame/video/taitoair.c
+++ b/src/mame/video/taitoair.c
@@ -46,6 +46,7 @@ sprite RAM
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "taitoic.h"
 
 
diff --git a/src/mame/video/taitoic.c b/src/mame/video/taitoic.c
index ffe39ee9e0c..cb6109705c9 100644
--- a/src/mame/video/taitoic.c
+++ b/src/mame/video/taitoic.c
@@ -533,6 +533,7 @@ Newer version of the I/O chip ?
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "taitoic.h"
 
 #define TOPSPEED_ROAD_COLORS
diff --git a/src/mame/video/taitojc.c b/src/mame/video/taitojc.c
index 305d4d7457d..445500d6484 100644
--- a/src/mame/video/taitojc.c
+++ b/src/mame/video/taitojc.c
@@ -1,4 +1,5 @@
 #include "driver.h"
+#include "deprecat.h"
 #include "video/poly.h"
 
 UINT8 *taitojc_texture;
diff --git a/src/mame/video/tank8.c b/src/mame/video/tank8.c
index 29c2fd1555e..253aae2b819 100644
--- a/src/mame/video/tank8.c
+++ b/src/mame/video/tank8.c
@@ -5,6 +5,7 @@ Atari Tank 8 video emulation
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "includes/tank8.h"
 
 
diff --git a/src/mame/video/tatsumi.c b/src/mame/video/tatsumi.c
index 0e269dc73dd..67379650904 100644
--- a/src/mame/video/tatsumi.c
+++ b/src/mame/video/tatsumi.c
@@ -1,6 +1,6 @@
 #include "driver.h"
+#include "deprecat.h"
 #include "tatsumi.h"
-#include <math.h>
 
 static tilemap *tx_layer;
 static tilemap *layer0, *layer1, *layer2, *layer3;
diff --git a/src/mame/video/tceptor.c b/src/mame/video/tceptor.c
index 4fde53b121b..6e8a57a8f43 100644
--- a/src/mame/video/tceptor.c
+++ b/src/mame/video/tceptor.c
@@ -4,6 +4,7 @@
  */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "namcoic.h"
 
 #define TX_TILE_OFFSET_CENTER	(32 * 2)
diff --git a/src/mame/video/tetrisp2.c b/src/mame/video/tetrisp2.c
index a52265e25a4..75a6acc7d97 100644
--- a/src/mame/video/tetrisp2.c
+++ b/src/mame/video/tetrisp2.c
@@ -39,6 +39,7 @@ To Do:
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 
 
 extern UINT16 tetrisp2_systemregs[0x10];
diff --git a/src/mame/video/thief.c b/src/mame/video/thief.c
index a52c733d74a..cfcb93b708b 100644
--- a/src/mame/video/thief.c
+++ b/src/mame/video/thief.c
@@ -3,6 +3,7 @@
 */
 
 #include "driver.h"
+#include "deprecat.h"
 
 static UINT8 thief_read_mask, thief_write_mask;
 static UINT8 thief_video_control;
diff --git a/src/mame/video/tia.c b/src/mame/video/tia.c
index e48f4aea805..f6edbb388d6 100644
--- a/src/mame/video/tia.c
+++ b/src/mame/video/tia.c
@@ -5,9 +5,9 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "tia.h"
 #include "sound/tiaintf.h"
-#include <math.h>
 
 #define HMOVE_INACTIVE		-200
 #define PLAYER_GFX_SLOTS	4
diff --git a/src/mame/video/tiamc1.c b/src/mame/video/tiamc1.c
index e27360ffb88..a8b85afdd63 100644
--- a/src/mame/video/tiamc1.c
+++ b/src/mame/video/tiamc1.c
@@ -8,6 +8,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 
 
 UINT8 *tiamc1_tileram;
diff --git a/src/mame/video/tmnt.c b/src/mame/video/tmnt.c
index 268122b4d06..b6f83ec03b5 100644
--- a/src/mame/video/tmnt.c
+++ b/src/mame/video/tmnt.c
@@ -1,4 +1,5 @@
 #include "driver.h"
+#include "deprecat.h"
 #include "machine/eeprom.h"
 #include "video/konamiic.h"
 
diff --git a/src/mame/video/toaplan1.c b/src/mame/video/toaplan1.c
index 6adab286389..877f7632497 100644
--- a/src/mame/video/toaplan1.c
+++ b/src/mame/video/toaplan1.c
@@ -119,6 +119,7 @@ Abnormalities:
 
 
 #include "driver.h"
+#include "deprecat.h"
 #include "toaplan1.h"
 #include "cpu/m68000/m68000.h"
 
diff --git a/src/mame/video/toaplan2.c b/src/mame/video/toaplan2.c
index 9ebe7519ae2..b82194e469c 100644
--- a/src/mame/video/toaplan2.c
+++ b/src/mame/video/toaplan2.c
@@ -145,6 +145,7 @@ Pipi & Bibis     | Fix Eight        | V-Five           | Snow Bros. 2     |
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/m68000/m68000.h"
 
 
diff --git a/src/mame/video/toobin.c b/src/mame/video/toobin.c
index 78a16f4646c..0f26dce9ac4 100644
--- a/src/mame/video/toobin.c
+++ b/src/mame/video/toobin.c
@@ -5,6 +5,7 @@
 ****************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "machine/atarigen.h"
 #include "toobin.h"
 
diff --git a/src/mame/video/toypop.c b/src/mame/video/toypop.c
index a256f8c9810..704a02abdc3 100644
--- a/src/mame/video/toypop.c
+++ b/src/mame/video/toypop.c
@@ -7,6 +7,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 
 UINT8 *toypop_videoram;
 
diff --git a/src/mame/video/tryout.c b/src/mame/video/tryout.c
index d67328f271b..b0f75714a7e 100644
--- a/src/mame/video/tryout.c
+++ b/src/mame/video/tryout.c
@@ -6,6 +6,7 @@
 ****************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 
 static tilemap *fg_tilemap, *bg_tilemap;
 static UINT8 vram_bank;
diff --git a/src/mame/video/tubep.c b/src/mame/video/tubep.c
index b4cc3be38e5..e485ac05cd2 100644
--- a/src/mame/video/tubep.c
+++ b/src/mame/video/tubep.c
@@ -7,6 +7,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "includes/tubep.h"
 #include "video/resnet.h"
 
diff --git a/src/mame/video/tumbleb.c b/src/mame/video/tumbleb.c
index d8cd0128b0d..ae7feb45b06 100644
--- a/src/mame/video/tumbleb.c
+++ b/src/mame/video/tumbleb.c
@@ -15,6 +15,7 @@ to switch between 8*8 tiles and 16*16 tiles.
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 
 static UINT16 tumblepb_control_0[8];
 UINT16 *tumblepb_pf1_data,*tumblepb_pf2_data;
diff --git a/src/mame/video/tumblep.c b/src/mame/video/tumblep.c
index a037698b944..81907b12d7f 100644
--- a/src/mame/video/tumblep.c
+++ b/src/mame/video/tumblep.c
@@ -14,6 +14,7 @@ to switch between 8*8 tiles and 16*16 tiles.
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "deco16ic.h"
 
 static void draw_sprites(running_machine *machine, mame_bitmap *bitmap,const rectangle *cliprect)
diff --git a/src/mame/video/turbo.c b/src/mame/video/turbo.c
index e4b9258af8e..051a0bd22df 100644
--- a/src/mame/video/turbo.c
+++ b/src/mame/video/turbo.c
@@ -5,9 +5,9 @@
 *************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "turbo.h"
 #include "video/resnet.h"
-#include <math.h>
 
 
 
diff --git a/src/mame/video/twin16.c b/src/mame/video/twin16.c
index 76a69254b6f..a6621e9e8ad 100644
--- a/src/mame/video/twin16.c
+++ b/src/mame/video/twin16.c
@@ -14,6 +14,7 @@
 */
 
 #include "driver.h"
+#include "deprecat.h"
 
 extern UINT16 twin16_custom_video;
 extern UINT16 *twin16_gfx_rom;
diff --git a/src/mame/video/tx1.c b/src/mame/video/tx1.c
index ba306811f47..69fef9b2119 100644
--- a/src/mame/video/tx1.c
+++ b/src/mame/video/tx1.c
@@ -4,6 +4,7 @@
 
 ****************************************************************************/
 #include "driver.h"
+#include "deprecat.h"
 #include "profiler.h"
 #include "render.h"
 #include "cpu/i86/i86.h"
diff --git a/src/mame/video/unico.c b/src/mame/video/unico.c
index 1db9b9f3b69..1643bda8ebc 100644
--- a/src/mame/video/unico.c
+++ b/src/mame/video/unico.c
@@ -37,6 +37,7 @@ Note:   if MAME_DEBUG is defined, pressing Z with:
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "unico.h"
 
 /* Variables needed by drivers: */
diff --git a/src/mame/video/usgames.c b/src/mame/video/usgames.c
index 12de56ecf57..1fa054f75c9 100644
--- a/src/mame/video/usgames.c
+++ b/src/mame/video/usgames.c
@@ -1,4 +1,5 @@
 #include "driver.h"
+#include "deprecat.h"
 
 UINT8 *usg_videoram,*usg_charram;
 
diff --git a/src/mame/video/vaportra.c b/src/mame/video/vaportra.c
index a144b458460..eac35c2c9e2 100644
--- a/src/mame/video/vaportra.c
+++ b/src/mame/video/vaportra.c
@@ -10,6 +10,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "deco16ic.h"
 
 static UINT16 vaportra_priority[2];
diff --git a/src/mame/video/vball.c b/src/mame/video/vball.c
index 7319423b923..dfc55865bf8 100644
--- a/src/mame/video/vball.c
+++ b/src/mame/video/vball.c
@@ -7,6 +7,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/m6502/m6502.h"
 
 int vb_scrollx_hi=0;
diff --git a/src/mame/video/vdc.c b/src/mame/video/vdc.c
index 7c2f5803861..ece1b33ef11 100644
--- a/src/mame/video/vdc.c
+++ b/src/mame/video/vdc.c
@@ -1,4 +1,5 @@
 #include "driver.h"
+#include "deprecat.h"
 #include "video/vdc.h"
 
 /* VDC segments */
diff --git a/src/mame/video/victory.c b/src/mame/video/victory.c
index d64c55e5052..83a1bd56b98 100644
--- a/src/mame/video/victory.c
+++ b/src/mame/video/victory.c
@@ -5,6 +5,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "victory.h"
 
 
diff --git a/src/mame/video/vigilant.c b/src/mame/video/vigilant.c
index 4088bf47fac..8a23968895b 100644
--- a/src/mame/video/vigilant.c
+++ b/src/mame/video/vigilant.c
@@ -15,6 +15,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 
 
 static const rectangle bottomvisiblearea =
diff --git a/src/mame/video/vindictr.c b/src/mame/video/vindictr.c
index c13cd5e52a0..a9dce05976c 100644
--- a/src/mame/video/vindictr.c
+++ b/src/mame/video/vindictr.c
@@ -5,6 +5,7 @@
 ****************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "machine/atarigen.h"
 #include "vindictr.h"
 #include "thunderj.h"
diff --git a/src/mame/video/vsnes.c b/src/mame/video/vsnes.c
index 99642726af0..804247ca7ad 100644
--- a/src/mame/video/vsnes.c
+++ b/src/mame/video/vsnes.c
@@ -1,4 +1,5 @@
 #include "driver.h"
+#include "deprecat.h"
 #include "video/ppu2c0x.h"
 
 /* from machine */
diff --git a/src/mame/video/wecleman.c b/src/mame/video/wecleman.c
index e3e2eea7a36..e10b2fa1f32 100644
--- a/src/mame/video/wecleman.c
+++ b/src/mame/video/wecleman.c
@@ -8,6 +8,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "video/konamiic.h"
 
 #define BMP_PAD		8
diff --git a/src/mame/video/williams.c b/src/mame/video/williams.c
index d9f71a77a55..18cb2e64e03 100644
--- a/src/mame/video/williams.c
+++ b/src/mame/video/williams.c
@@ -92,6 +92,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "video/resnet.h"
 #include "williams.h"
 
diff --git a/src/mame/video/wolfpack.c b/src/mame/video/wolfpack.c
index c0ad9a7a42d..c6c4b1e5abc 100644
--- a/src/mame/video/wolfpack.c
+++ b/src/mame/video/wolfpack.c
@@ -5,6 +5,7 @@ Atari Wolf Pack (prototype) video emulation
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 
 int wolfpack_collision;
 
diff --git a/src/mame/video/yard.c b/src/mame/video/yard.c
index 02f85af12cc..b74249be983 100644
--- a/src/mame/video/yard.c
+++ b/src/mame/video/yard.c
@@ -12,6 +12,7 @@ J Clegg
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 
 UINT8 *yard_scroll_x_low;
 UINT8 *yard_scroll_x_high;
diff --git a/src/mame/video/ygv608.c b/src/mame/video/ygv608.c
index 4c76fa02844..30fbf381b95 100644
--- a/src/mame/video/ygv608.c
+++ b/src/mame/video/ygv608.c
@@ -29,8 +29,8 @@
  *    Everything else! :)
  */
 
-#include <ctype.h>
 #include "driver.h"
+#include "deprecat.h"
 #include "namcond1.h"   // only while debugging
 #include "video/ygv608.h"
 
@@ -1380,7 +1380,7 @@ void nvsram( offs_t offset, UINT16 data )
     if( i%16 == 0 )
       logerror( "%04X: ", offset );
     logerror( "%02X ", data );
-    ascii[i%16] = ( isprint( data ) ? data : '.' );
+    ascii[i%16] = ( data > 0x20) ? data : '.' );
     if( i%16 == 15 )
       logerror( "| %-16.16s\n", ascii );
   }
@@ -1644,7 +1644,7 @@ READ16_HANDLER( ygv608_debug_trigger )
     if( i % 16 == 0 )
       logerror( "$%04X : ", i );
     logerror( "%02X ", ygv608.pattern_name_table[i] );
-    if( isprint( ygv608.pattern_name_table[i] ) )
+    if( ygv608.pattern_name_table[i] >= 0x20)
       ascii[i%16] = ygv608.pattern_name_table[i];
     else
       ascii[i%16] = '.';
@@ -1663,7 +1663,7 @@ READ16_HANDLER( ygv608_debug_trigger )
     if( i % 16 == 0 )
       logerror( "$%04X : ", i );
     logerror( "%02X ", ygv608.scroll_data_table[0][i] );
-    if( isprint( ygv608.scroll_data_table[0][i] ) )
+    if( ygv608.scroll_data_table[0][i] >= 0x20 )
       ascii[i%16] = ygv608.scroll_data_table[0][i];
     else
       ascii[i%16] = '.';
diff --git a/src/mame/video/yunsung8.c b/src/mame/video/yunsung8.c
index f5e80d04132..1ecffd199a7 100644
--- a/src/mame/video/yunsung8.c
+++ b/src/mame/video/yunsung8.c
@@ -28,6 +28,7 @@ Note:   if MAME_DEBUG is defined, pressing Z with:
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 
 /* Variables that driver has access to: */
 
diff --git a/src/osd/windows/debugwin.c b/src/osd/windows/debugwin.c
index 6b9201078c4..f25ebdea0df 100644
--- a/src/osd/windows/debugwin.c
+++ b/src/osd/windows/debugwin.c
@@ -21,6 +21,7 @@
 #include "debug/debugvw.h"
 #include "debug/debugcon.h"
 #include "debug/debugcpu.h"
+#include "deprecat.h"
 
 // MAMEOS headers
 #include "debugwin.h"
diff --git a/src/osd/windows/drawd3d.c b/src/osd/windows/drawd3d.c
index 57f29811aa1..4627bb9cf6c 100644
--- a/src/osd/windows/drawd3d.c
+++ b/src/osd/windows/drawd3d.c
@@ -29,6 +29,7 @@
 #include "render.h"
 #include "rendutil.h"
 #include "options.h"
+#include "deprecat.h"
 
 // MAMEOS headers
 #include "d3dintf.h"
diff --git a/src/osd/windows/drawdd.c b/src/osd/windows/drawdd.c
index 8b450860685..7ff6352b232 100644
--- a/src/osd/windows/drawdd.c
+++ b/src/osd/windows/drawdd.c
@@ -23,6 +23,7 @@
 #include "render.h"
 #include "rendutil.h"
 #include "options.h"
+#include "deprecat.h"
 
 // MAMEOS headers
 #include "winmain.h"
diff --git a/src/osd/windows/output.c b/src/osd/windows/output.c
index 5de81d152cd..436afc9d99e 100644
--- a/src/osd/windows/output.c
+++ b/src/osd/windows/output.c
@@ -14,6 +14,7 @@
 // MAME headers
 #include "osdepend.h"
 #include "driver.h"
+#include "deprecat.h"
 
 // MAMEOS headers
 #include "output.h"
diff --git a/src/osd/windows/sound.c b/src/osd/windows/sound.c
index f5d877555ca..97aa08c6795 100644
--- a/src/osd/windows/sound.c
+++ b/src/osd/windows/sound.c
@@ -20,6 +20,7 @@
 #include "osdepend.h"
 #include "driver.h"
 #include "osdepend.h"
+#include "deprecat.h"
 
 // MAMEOS headers
 #include "winmain.h"
diff --git a/src/osd/windows/video.c b/src/osd/windows/video.c
index 7c8a66b453b..36d053dbf14 100644
--- a/src/osd/windows/video.c
+++ b/src/osd/windows/video.c
@@ -30,6 +30,7 @@
 #include "render.h"
 #include "rendutil.h"
 #include "ui.h"
+#include "deprecat.h"
 
 // MAMEOS headers
 #include "winmain.h"
diff --git a/src/osd/windows/window.c b/src/osd/windows/window.c
index 68521011e84..673da9c5d33 100644
--- a/src/osd/windows/window.c
+++ b/src/osd/windows/window.c
@@ -27,6 +27,7 @@
 // MAME headers
 #include "osdepend.h"
 #include "driver.h"
+#include "deprecat.h"
 
 // MAMEOS headers
 #include "winmain.h"