diff --git a/src/emu/cpu/adsp2100/adsp2100.h b/src/emu/cpu/adsp2100/adsp2100.h
index 0a67c4c8ef7..1875f552483 100644
--- a/src/emu/cpu/adsp2100/adsp2100.h
+++ b/src/emu/cpu/adsp2100/adsp2100.h
@@ -67,6 +67,7 @@ enum
 
 #if (HAS_ADSP2100)
 extern CPU_GET_INFO( adsp2100 );
+#define CPU_ADSP2100 CPU_GET_INFO_NAME( adsp2100 )
 #endif
 
 /**************************************************************************
@@ -84,6 +85,7 @@ extern CPU_GET_INFO( adsp2100 );
 
 #if (HAS_ADSP2101)
 extern CPU_GET_INFO( adsp2101 );
+#define CPU_ADSP2101 CPU_GET_INFO_NAME( adsp2101 )
 #endif
 
 #if (HAS_ADSP2104)
@@ -101,6 +103,7 @@ extern CPU_GET_INFO( adsp2101 );
 #define ADSP2104_TIMER		5		/* internal timer IRQ */
 
 extern CPU_GET_INFO( adsp2104 );
+#define CPU_ADSP2104 CPU_GET_INFO_NAME( adsp2104 )
 extern void adsp2104_load_boot_data(UINT8 *srcdata, UINT32 *dstdata);
 #endif /* (HAS_ADSP2104) */
 
@@ -117,6 +120,7 @@ extern void adsp2104_load_boot_data(UINT8 *srcdata, UINT32 *dstdata);
 #define ADSP2105_TIMER		5		/* internal timer IRQ */
 
 extern CPU_GET_INFO( adsp2105 );
+#define CPU_ADSP2105 CPU_GET_INFO_NAME( adsp2105 )
 extern void adsp2105_load_boot_data(UINT8 *srcdata, UINT32 *dstdata);
 #endif /* (HAS_ADSP2105) */
 
@@ -135,6 +139,7 @@ extern void adsp2105_load_boot_data(UINT8 *srcdata, UINT32 *dstdata);
 #define ADSP2115_TIMER		5		/* internal timer IRQ */
 
 extern CPU_GET_INFO( adsp2115 );
+#define CPU_ADSP2115 CPU_GET_INFO_NAME( adsp2115 )
 extern void adsp2115_load_boot_data(UINT8 *srcdata, UINT32 *dstdata);
 #endif /* (HAS_ADSP2115) */
 
@@ -156,6 +161,7 @@ extern void adsp2115_load_boot_data(UINT8 *srcdata, UINT32 *dstdata);
 #define ADSP2181_IRQL2		8		/* IRQL2 */
 
 extern CPU_GET_INFO( adsp2181 );
+#define CPU_ADSP2181 CPU_GET_INFO_NAME( adsp2181 )
 extern void adsp2181_load_boot_data(UINT8 *srcdata, UINT32 *dstdata);
 extern void adsp2181_idma_addr_w(const device_config *device, UINT16 data);
 extern UINT16 adsp2181_idma_addr_r(const device_config *device);
diff --git a/src/emu/cpu/alph8201/alph8201.h b/src/emu/cpu/alph8201/alph8201.h
index 874b300ec0d..4cccfbf0db4 100644
--- a/src/emu/cpu/alph8201/alph8201.h
+++ b/src/emu/cpu/alph8201/alph8201.h
@@ -44,6 +44,9 @@ enum
 extern CPU_GET_INFO( alpha8201 );
 extern CPU_GET_INFO( alpha8301 );
 
+#define CPU_ALPHA8201 CPU_GET_INFO_NAME( alpha8201 )
+#define CPU_ALPHA8301 CPU_GET_INFO_NAME( alpha8301 )
+
 CPU_DISASSEMBLE( alpha8201 );
 
 #endif  /* __ALPH8201_H__ */
diff --git a/src/emu/cpu/apexc/apexc.h b/src/emu/cpu/apexc/apexc.h
index 7013f4828e4..d5b4a134321 100644
--- a/src/emu/cpu/apexc/apexc.h
+++ b/src/emu/cpu/apexc/apexc.h
@@ -19,6 +19,7 @@ enum
 };
 
 CPU_GET_INFO( apexc );
+#define CPU_APEXC CPU_GET_INFO_NAME( apexc )
 
 CPU_DISASSEMBLE( apexc );
 
diff --git a/src/emu/cpu/arm/arm.h b/src/emu/cpu/arm/arm.h
index 69701599cea..25b02a771b4 100644
--- a/src/emu/cpu/arm/arm.h
+++ b/src/emu/cpu/arm/arm.h
@@ -17,6 +17,7 @@
  ***************************************************************************************************/
 
 extern CPU_GET_INFO( arm );
+#define CPU_ARM CPU_GET_INFO_NAME( arm )
 
 extern UINT32 arm_disasm(char *pBuf, UINT32 pc, UINT32 opcode);
 
diff --git a/src/emu/cpu/arm7/arm7.h b/src/emu/cpu/arm7/arm7.h
index b03896d66cc..ba34a9dda91 100644
--- a/src/emu/cpu/arm7/arm7.h
+++ b/src/emu/cpu/arm7/arm7.h
@@ -39,5 +39,6 @@
  *  PUBLIC FUNCTIONS
  ***************************************************************************************************/
 extern CPU_GET_INFO( arm7 );
+#define CPU_ARM7 CPU_GET_INFO_NAME( arm7 )
 
 #endif /* __ARM7_H__ */
diff --git a/src/emu/cpu/asap/asap.h b/src/emu/cpu/asap/asap.h
index 16997543da4..2e5d407eca0 100644
--- a/src/emu/cpu/asap/asap.h
+++ b/src/emu/cpu/asap/asap.h
@@ -40,5 +40,6 @@ enum
 ***************************************************************************/
 
 extern CPU_GET_INFO( asap );
+#define CPU_ASAP CPU_GET_INFO_NAME( asap )
 
 #endif /* __ASAP_H__ */
diff --git a/src/emu/cpu/ccpu/ccpu.h b/src/emu/cpu/ccpu/ccpu.h
index fa277e75e87..595e9609477 100644
--- a/src/emu/cpu/ccpu/ccpu.h
+++ b/src/emu/cpu/ccpu/ccpu.h
@@ -57,6 +57,8 @@ struct _ccpu_config
 ***************************************************************************/
 
 CPU_GET_INFO( ccpu );
+#define CPU_CCPU CPU_GET_INFO_NAME( ccpu )
+
 void ccpu_wdt_timer_trigger(const device_config *device);
 
 CPU_DISASSEMBLE( ccpu );
diff --git a/src/emu/cpu/cdp1802/cdp1802.h b/src/emu/cpu/cdp1802/cdp1802.h
index 836720e861b..079f8a085c8 100644
--- a/src/emu/cpu/cdp1802/cdp1802.h
+++ b/src/emu/cpu/cdp1802/cdp1802.h
@@ -88,6 +88,7 @@ enum
 };
 
 CPU_GET_INFO( cdp1802 );
+#define CPU_CDP1802 CPU_GET_INFO_NAME( cdp1802 )
 
 typedef cdp1802_control_mode (*cdp1802_mode_read_func)(const device_config *device);
 #define CDP1802_MODE_READ(name) cdp1802_control_mode name(const device_config *device)
diff --git a/src/emu/cpu/cop400/cop400.h b/src/emu/cpu/cop400/cop400.h
index 58feef345eb..fe6ee670147 100644
--- a/src/emu/cpu/cop400/cop400.h
+++ b/src/emu/cpu/cop400/cop400.h
@@ -94,12 +94,21 @@ extern CPU_GET_INFO( cop401 );
 extern CPU_GET_INFO( cop410 );
 extern CPU_GET_INFO( cop411 );
 
+#define CPU_COP401 CPU_GET_INFO_NAME( cop401 )
+#define CPU_COP410 CPU_GET_INFO_NAME( cop410 )
+#define CPU_COP411 CPU_GET_INFO_NAME( cop411 )
+
 /* COP 42x */
 extern CPU_GET_INFO( cop402 );
 extern CPU_GET_INFO( cop420 );
 extern CPU_GET_INFO( cop421 );
 extern CPU_GET_INFO( cop422 );
 
+#define CPU_COP402 CPU_GET_INFO_NAME( cop402 )
+#define CPU_COP420 CPU_GET_INFO_NAME( cop420 )
+#define CPU_COP421 CPU_GET_INFO_NAME( cop421 )
+#define CPU_COP422 CPU_GET_INFO_NAME( cop422 )
+
 /* COP 44x */
 extern CPU_GET_INFO( cop404 );
 extern CPU_GET_INFO( cop424 );
@@ -108,6 +117,13 @@ extern CPU_GET_INFO( cop426 );
 extern CPU_GET_INFO( cop444 );
 extern CPU_GET_INFO( cop445 );
 
+#define CPU_COP404 CPU_GET_INFO_NAME( cop404 )
+#define CPU_COP424 CPU_GET_INFO_NAME( cop424 )
+#define CPU_COP425 CPU_GET_INFO_NAME( cop425 )
+#define CPU_COP426 CPU_GET_INFO_NAME( cop426 )
+#define CPU_COP444 CPU_GET_INFO_NAME( cop444 )
+#define CPU_COP445 CPU_GET_INFO_NAME( cop445 )
+
 CPU_DISASSEMBLE( cop410 );
 CPU_DISASSEMBLE( cop420 );
 CPU_DISASSEMBLE( cop444 );
diff --git a/src/emu/cpu/cp1610/cp1610.h b/src/emu/cpu/cp1610/cp1610.h
index c7194c674db..09eae618e3b 100644
--- a/src/emu/cpu/cp1610/cp1610.h
+++ b/src/emu/cpu/cp1610/cp1610.h
@@ -37,6 +37,7 @@ enum
 
 
 CPU_GET_INFO( cp1610 );
+#define CPU_CP1610 CPU_GET_INFO_NAME( cp1610 )
 
 CPU_DISASSEMBLE( cp1610 );
 
diff --git a/src/emu/cpu/cubeqcpu/cubeqcpu.h b/src/emu/cpu/cubeqcpu/cubeqcpu.h
index 0384098f761..5f1d0d9fbf5 100644
--- a/src/emu/cpu/cubeqcpu/cubeqcpu.h
+++ b/src/emu/cpu/cubeqcpu/cubeqcpu.h
@@ -156,5 +156,12 @@ void cubeqcpu_clear_stack(const device_config *device);
 UINT8 cubeqcpu_get_ptr_ram_val(const device_config *device, int i);
 UINT32* cubeqcpu_get_stack_ram(const device_config *device);
 
+CPU_GET_INFO( cquestsnd );
+CPU_GET_INFO( cquestrot );
+CPU_GET_INFO( cquestlin );
+
+#define CPU_CQUESTSND CPU_GET_INFO_NAME( cquestsnd )
+#define CPU_CQUESTROT CPU_GET_INFO_NAME( cquestrot )
+#define CPU_CQUESTLIN CPU_GET_INFO_NAME( cquestlin )
 
 #endif /* _CUBEQCPU_H */
diff --git a/src/emu/cpu/dsp32/dsp32.h b/src/emu/cpu/dsp32/dsp32.h
index 30d70fd5c8d..e33110568d8 100644
--- a/src/emu/cpu/dsp32/dsp32.h
+++ b/src/emu/cpu/dsp32/dsp32.h
@@ -80,6 +80,7 @@ struct _dsp32_config
 ***************************************************************************/
 
 extern CPU_GET_INFO( dsp32c );
+#define CPU_DSP32C CPU_GET_INFO_NAME( dsp32c )
 
 extern void dsp32c_pio_w(const device_config *device, int reg, int data);
 extern int dsp32c_pio_r(const device_config *device, int reg);
diff --git a/src/emu/cpu/dsp56k/dsp56k.h b/src/emu/cpu/dsp56k/dsp56k.h
index c2cb859cb1b..ca637f201b7 100644
--- a/src/emu/cpu/dsp56k/dsp56k.h
+++ b/src/emu/cpu/dsp56k/dsp56k.h
@@ -66,6 +66,7 @@ enum
 
 // Needed for MAME
 extern CPU_GET_INFO( dsp56k );
+#define CPU_DSP56156 CPU_GET_INFO_NAME( dsp56k )
 
 
 /***************************************************************************
diff --git a/src/emu/cpu/e132xs/e132xs.h b/src/emu/cpu/e132xs/e132xs.h
index 9c709537580..5ce4ade1f2c 100644
--- a/src/emu/cpu/e132xs/e132xs.h
+++ b/src/emu/cpu/e132xs/e132xs.h
@@ -25,58 +25,72 @@
 
 #if (HAS_E116T)
 CPU_GET_INFO( e116t );
+#define CPU_E116T CPU_GET_INFO_NAME( e116t )
 #endif
 
 #if (HAS_E116XT)
 CPU_GET_INFO( e116xt );
+#define CPU_E116XT CPU_GET_INFO_NAME( e116xt )
 #endif
 
 #if (HAS_E116XS)
 CPU_GET_INFO( e116xs );
+#define CPU_E116XS CPU_GET_INFO_NAME( e116xs )
 #endif
 
 #if (HAS_E116XSR)
 CPU_GET_INFO( e116xsr );
+#define CPU_E116XSR CPU_GET_INFO_NAME( e116xsr )
 #endif
 
 #if (HAS_E132N)
 CPU_GET_INFO( e132n );
+#define CPU_E132N CPU_GET_INFO_NAME( e132n )
 #endif
 
 #if (HAS_E132T)
 CPU_GET_INFO( e132t );
+#define CPU_E132T CPU_GET_INFO_NAME( e132t )
 #endif
 
 #if (HAS_E132XN)
 CPU_GET_INFO( e132xn );
+#define CPU_E132XN CPU_GET_INFO_NAME( e132xn )
 #endif
 
 #if (HAS_E132XT)
 CPU_GET_INFO( e132xt );
+#define CPU_E132XT CPU_GET_INFO_NAME( e132xt )
 #endif
 
 #if (HAS_E132XS)
 CPU_GET_INFO( e132xs );
+#define CPU_E132XS CPU_GET_INFO_NAME( e132xs )
 #endif
 
 #if (HAS_E132XSR)
 CPU_GET_INFO( e132xsr );
+#define CPU_E132XSR CPU_GET_INFO_NAME( e132xsr )
 #endif
 
 #if (HAS_GMS30C2116)
 CPU_GET_INFO( gms30c2116 );
+#define CPU_GMS30C2116 CPU_GET_INFO_NAME( gms30c2116 )
 #endif
 
 #if (HAS_GMS30C2132)
 CPU_GET_INFO( gms30c2132 );
+#define CPU_GMS30C2132 CPU_GET_INFO_NAME( gms30c2132 )
 #endif
 
 #if (HAS_GMS30C2216)
 CPU_GET_INFO( gms30c2216 );
+#define CPU_GMS30C2216 CPU_GET_INFO_NAME( gms30c2216 )
 #endif
 
 #if (HAS_GMS30C2232)
 CPU_GET_INFO( gms30c2232 );
+#define CPU_GMS30C2232 CPU_GET_INFO_NAME( gms30c2232 )
 #endif
 
 extern unsigned dasm_hyperstone(char *buffer, unsigned pc, const UINT8 *oprom, unsigned h_flag, int private_fp);
diff --git a/src/emu/cpu/f8/f8.h b/src/emu/cpu/f8/f8.h
index 9f277490187..c48d710f7dd 100644
--- a/src/emu/cpu/f8/f8.h
+++ b/src/emu/cpu/f8/f8.h
@@ -48,6 +48,7 @@ enum
 #define F8_INT_INTR  1
 
 CPU_GET_INFO( f8 );
+#define CPU_F8 CPU_GET_INFO_NAME( f8 )
 
 #ifdef __cplusplus
 }
diff --git a/src/emu/cpu/g65816/g65816.h b/src/emu/cpu/g65816/g65816.h
index 0d7643c58b9..cc5cca08ce5 100644
--- a/src/emu/cpu/g65816/g65816.h
+++ b/src/emu/cpu/g65816/g65816.h
@@ -65,6 +65,7 @@ enum
 
 /* Main interface function */
 CPU_GET_INFO( g65816 );
+#define CPU_G65816 CPU_GET_INFO_NAME( g65816 )
 
 #undef G65816_CALL_DEBUGGER
 #define G65816_CALL_DEBUGGER(x) debugger_instruction_hook(cpustate->device, x)
diff --git a/src/emu/cpu/h6280/h6280.h b/src/emu/cpu/h6280/h6280.h
index 440ed8b7381..3a714074741 100644
--- a/src/emu/cpu/h6280/h6280.h
+++ b/src/emu/cpu/h6280/h6280.h
@@ -75,6 +75,7 @@ typedef struct
 
 
 CPU_GET_INFO( h6280 );
+#define CPU_H6280 CPU_GET_INFO_NAME( h6280 )
 
 READ8_HANDLER( h6280_irq_status_r );
 WRITE8_HANDLER( h6280_irq_status_w );
diff --git a/src/emu/cpu/h83002/h8.h b/src/emu/cpu/h83002/h8.h
index d396f7a24fe..9080b9ce4c1 100644
--- a/src/emu/cpu/h83002/h8.h
+++ b/src/emu/cpu/h83002/h8.h
@@ -86,8 +86,15 @@ enum
 	H8_SERIAL_1,
 };
 
-CPU_GET_INFO( h8_300 );
 CPU_GET_INFO( h8_3002 );
-CPU_GET_INFO( h8_3344 );
+CPU_GET_INFO( h8_3007 );
+CPU_GET_INFO( h8_3044 );
+CPU_GET_INFO( h8_3334 );
+
+#define CPU_H83002 CPU_GET_INFO_NAME( h8_3002 )
+#define CPU_H83007 CPU_GET_INFO_NAME( h8_3007 )
+#define CPU_H83044 CPU_GET_INFO_NAME( h8_3044 )
+#define CPU_H83334 CPU_GET_INFO_NAME( h8_3334 )
+
 
 #endif /* __H83002_H__ */
diff --git a/src/emu/cpu/hd6309/hd6309.h b/src/emu/cpu/hd6309/hd6309.h
index 17a6d577261..beffe8cf995 100644
--- a/src/emu/cpu/hd6309/hd6309.h
+++ b/src/emu/cpu/hd6309/hd6309.h
@@ -19,6 +19,7 @@ enum
 
 /* PUBLIC FUNCTIONS */
 CPU_GET_INFO( hd6309 );
+#define CPU_HD6309 CPU_GET_INFO_NAME( hd6309 )
 
 
 CPU_DISASSEMBLE( hd6309 );
diff --git a/src/emu/cpu/i386/i386intf.h b/src/emu/cpu/i386/i386intf.h
index 4ba18918b57..5c8d9c54195 100644
--- a/src/emu/cpu/i386/i386intf.h
+++ b/src/emu/cpu/i386/i386intf.h
@@ -5,9 +5,16 @@
 
 #include "cpuintrf.h"
 
-void i386_get_info(UINT32, cpuinfo*);
-void i486_get_info(UINT32, cpuinfo*);
-void pentium_get_info(UINT32, cpuinfo*);
-void mediagx_get_info(UINT32, cpuinfo*);
+CPU_GET_INFO( i386 );
+CPU_GET_INFO( i486 );
+CPU_GET_INFO( pentium );
+CPU_GET_INFO( mediagx );
+
+#define CPU_I386 CPU_GET_INFO_NAME( i386 )
+#define CPU_I486 CPU_GET_INFO_NAME( i486 )
+#define CPU_PENTIUM CPU_GET_INFO_NAME( pentium )
+#define CPU_MEDIAGX CPU_GET_INFO_NAME( mediagx )
+
+
 
 #endif /* __I386INTF_H__ */
diff --git a/src/emu/cpu/i8085/i8085.h b/src/emu/cpu/i8085/i8085.h
index 2eb9e3dbdf2..cd6fb41a7ea 100644
--- a/src/emu/cpu/i8085/i8085.h
+++ b/src/emu/cpu/i8085/i8085.h
@@ -32,6 +32,7 @@ typedef void (*i8085_status_func)(const device_config *device, UINT8 status);
 #define I8085_RST75_LINE	3
 
 CPU_GET_INFO( i8085 );
+#define CPU_8085A CPU_GET_INFO_NAME( i8085 )
 
 /**************************************************************************
  * I8080 section
@@ -59,6 +60,7 @@ CPU_GET_INFO( i8085 );
 #define I8080_INTR_LINE         I8085_INTR_LINE
 
 CPU_GET_INFO( i8080 );
+#define CPU_8080 CPU_GET_INFO_NAME( i8080 )
 #endif
 
 CPU_DISASSEMBLE( i8085 );
diff --git a/src/emu/cpu/i86/i186intf.h b/src/emu/cpu/i86/i186intf.h
index 7bbf3f4e28d..88d142fa0ae 100644
--- a/src/emu/cpu/i86/i186intf.h
+++ b/src/emu/cpu/i86/i186intf.h
@@ -6,5 +6,6 @@
 
 /* Public functions */
 CPU_GET_INFO( i80186 );
+#define CPU_I80186 CPU_GET_INFO_NAME( i80186 )
 
 #endif /* __I186INTF_H__ */
diff --git a/src/emu/cpu/i86/i188intf.h b/src/emu/cpu/i86/i188intf.h
index 73524c50b4f..5f247645b1e 100644
--- a/src/emu/cpu/i86/i188intf.h
+++ b/src/emu/cpu/i86/i188intf.h
@@ -7,5 +7,6 @@
 
 /* Public functions */
 CPU_GET_INFO( i80188 );
+#define CPU_I80188 CPU_GET_INFO_NAME( i80188 )
 
 #endif /* __I186INTF_H__ */
diff --git a/src/emu/cpu/i86/i286intf.h b/src/emu/cpu/i86/i286intf.h
index 3237d8a0d91..59a8e3294b6 100644
--- a/src/emu/cpu/i86/i286intf.h
+++ b/src/emu/cpu/i86/i286intf.h
@@ -44,5 +44,6 @@ enum
 
 /* Public functions */
 CPU_GET_INFO( i80286 );
+#define CPU_I80286 CPU_GET_INFO_NAME( i80286 )
 
 #endif /* __I286INTF_H__ */
diff --git a/src/emu/cpu/i86/i86intf.h b/src/emu/cpu/i86/i86intf.h
index 7a566bdfd25..1290e9e3c69 100644
--- a/src/emu/cpu/i86/i86intf.h
+++ b/src/emu/cpu/i86/i86intf.h
@@ -28,5 +28,6 @@ enum
 
 /* Public functions */
 CPU_GET_INFO( i8086 );
+#define CPU_I8086 CPU_GET_INFO_NAME( i8086 )
 
 #endif /* __I86INTF_H__ */
diff --git a/src/emu/cpu/i86/i88intf.h b/src/emu/cpu/i86/i88intf.h
index 38844c63792..edde3441fbf 100644
--- a/src/emu/cpu/i86/i88intf.h
+++ b/src/emu/cpu/i86/i88intf.h
@@ -7,5 +7,6 @@
 
 /* Public functions */
 CPU_GET_INFO( i8088 );
+#define CPU_I8088 CPU_GET_INFO_NAME( i8088 )
 
 #endif /* __I88INTF_H__ */
diff --git a/src/emu/cpu/i8x41/i8x41.h b/src/emu/cpu/i8x41/i8x41.h
index 00fbacb54b6..7e88a5feaf2 100644
--- a/src/emu/cpu/i8x41/i8x41.h
+++ b/src/emu/cpu/i8x41/i8x41.h
@@ -89,6 +89,12 @@ extern CPU_GET_INFO( i8042 );
 extern CPU_GET_INFO( i8242 );
 extern CPU_GET_INFO( i8742 );
 
+#define CPU_I8041 CPU_GET_INFO_NAME( i8041 )
+#define CPU_I8741 CPU_GET_INFO_NAME( i8741 )
+#define CPU_I8042 CPU_GET_INFO_NAME( i8042 )
+#define CPU_I8242 CPU_GET_INFO_NAME( i8242 )
+#define CPU_I8742 CPU_GET_INFO_NAME( i8742 )
+
 extern CPU_DISASSEMBLE( i8x41 );
 
 #endif /* __I8X41_H__ */
diff --git a/src/emu/cpu/i960/i960.h b/src/emu/cpu/i960/i960.h
index 778f027c6bb..4ea749be825 100644
--- a/src/emu/cpu/i960/i960.h
+++ b/src/emu/cpu/i960/i960.h
@@ -62,6 +62,8 @@ enum
 };
 
 CPU_GET_INFO( i960 );
+#define CPU_I960 CPU_GET_INFO_NAME( i960 )
+
 void i960_noburst(const device_config *device);
 void i960_stall(const device_config *device);
 
diff --git a/src/emu/cpu/jaguar/jaguar.h b/src/emu/cpu/jaguar/jaguar.h
index f5d8845a5a6..a5c64a174b7 100644
--- a/src/emu/cpu/jaguar/jaguar.h
+++ b/src/emu/cpu/jaguar/jaguar.h
@@ -101,10 +101,12 @@ struct _jaguar_cpu_config
 ***************************************************************************/
 
 extern CPU_GET_INFO( jaguargpu );
+#define CPU_JAGUARGPU CPU_GET_INFO_NAME( jaguargpu )
 extern void jaguargpu_ctrl_w(const device_config *device, offs_t offset, UINT32 data, UINT32 mem_mask);
 extern UINT32 jaguargpu_ctrl_r(const device_config *device, offs_t offset);
 
 extern CPU_GET_INFO( jaguardsp );
+#define CPU_JAGUARDSP CPU_GET_INFO_NAME( jaguardsp )
 extern void jaguardsp_ctrl_w(const device_config *device, offs_t offset, UINT32 data, UINT32 mem_mask);
 extern UINT32 jaguardsp_ctrl_r(const device_config *device, offs_t offset);
 
diff --git a/src/emu/cpu/konami/konami.h b/src/emu/cpu/konami/konami.h
index 8a492a08eb5..34155e2803c 100644
--- a/src/emu/cpu/konami/konami.h
+++ b/src/emu/cpu/konami/konami.h
@@ -27,6 +27,7 @@ enum
 
 /* PUBLIC FUNCTIONS */
 CPU_GET_INFO( konami );
+#define CPU_KONAMI CPU_GET_INFO_NAME( konami )
 
 CPU_DISASSEMBLE( konami );
 
diff --git a/src/emu/cpu/lh5801/lh5801.h b/src/emu/cpu/lh5801/lh5801.h
index ead8230c465..1460322a83e 100644
--- a/src/emu/cpu/lh5801/lh5801.h
+++ b/src/emu/cpu/lh5801/lh5801.h
@@ -78,6 +78,7 @@ struct _lh5801_cpu_core
 #define LH5801_IRQ 1
 
 CPU_GET_INFO( lh5801 );
+#define CPU_LH5801 CPU_GET_INFO_NAME( lh5801 )
 extern CPU_DISASSEMBLE( lh5801 );
 
 #endif /* __LH5801_H__ */
diff --git a/src/emu/cpu/lr35902/lr35902.h b/src/emu/cpu/lr35902/lr35902.h
index 9fde7856e3a..5c21f5860c6 100644
--- a/src/emu/cpu/lr35902/lr35902.h
+++ b/src/emu/cpu/lr35902/lr35902.h
@@ -31,6 +31,7 @@ enum
 /* Return register contents                                                 */
 /****************************************************************************/
 extern CPU_GET_INFO( lr35902 );
+#define CPU_LR35902 CPU_GET_INFO_NAME( lr35902 )
 
 extern CPU_DISASSEMBLE( lr35902 );
 
diff --git a/src/emu/cpu/m37710/m37710.h b/src/emu/cpu/m37710/m37710.h
index 759d7a8bd40..980ceb2e9ce 100644
--- a/src/emu/cpu/m37710/m37710.h
+++ b/src/emu/cpu/m37710/m37710.h
@@ -111,6 +111,10 @@ void m37710_state_load(void *file);
 
 
 CPU_GET_INFO( m37710 );
+CPU_GET_INFO( m37702 );
+
+#define CPU_M37710 CPU_GET_INFO_NAME( m37710 )
+#define CPU_M37702 CPU_GET_INFO_NAME( m37702 )
 
 /* ======================================================================== */
 /* ============================== END OF FILE ============================= */
diff --git a/src/emu/cpu/m6502/m4510.h b/src/emu/cpu/m6502/m4510.h
index 59c9d61c96d..2bd84711aaf 100644
--- a/src/emu/cpu/m6502/m4510.h
+++ b/src/emu/cpu/m6502/m4510.h
@@ -40,6 +40,7 @@ enum
 #define M4510_IRQ_LINE					M6502_IRQ_LINE
 
 CPU_GET_INFO( m4510 );
+#define CPU_M4510 CPU_GET_INFO_NAME( m4510 )
 
 
 extern CPU_DISASSEMBLE( m4510 );
diff --git a/src/emu/cpu/m6502/m6502.h b/src/emu/cpu/m6502/m6502.h
index c8795d86117..1d20c6d3a74 100644
--- a/src/emu/cpu/m6502/m6502.h
+++ b/src/emu/cpu/m6502/m6502.h
@@ -79,6 +79,7 @@ enum
 };
 
 extern CPU_GET_INFO( m6502 );
+#define CPU_M6502 CPU_GET_INFO_NAME( m6502 )
 
 extern CPU_DISASSEMBLE( m6502 );
 
@@ -100,6 +101,7 @@ extern CPU_DISASSEMBLE( m6502 );
 #define M6510_IRQ_LINE					M6502_IRQ_LINE
 
 extern CPU_GET_INFO( m6510 );
+#define CPU_M6510 CPU_GET_INFO_NAME( m6510 )
 
 extern CPU_DISASSEMBLE( m6510 );
 
@@ -120,6 +122,7 @@ extern CPU_DISASSEMBLE( m6510 );
 #define M6510T_IRQ_LINE					M6502_IRQ_LINE
 
 extern CPU_GET_INFO( m6510t );
+#define CPU_M6510T CPU_GET_INFO_NAME( m6510t )
 
 #endif
 
@@ -138,6 +141,7 @@ extern CPU_GET_INFO( m6510t );
 #define M7501_IRQ_LINE					M6502_IRQ_LINE
 
 extern CPU_GET_INFO( m7501 );
+#define CPU_M7501 CPU_GET_INFO_NAME( m7501 )
 #endif
 
 #if (HAS_M8502)
@@ -155,6 +159,7 @@ extern CPU_GET_INFO( m7501 );
 #define M8502_IRQ_LINE					M6502_IRQ_LINE
 
 extern CPU_GET_INFO( m8502 );
+#define CPU_M8502 CPU_GET_INFO_NAME( m8502 )
 #endif
 
 
@@ -176,6 +181,7 @@ extern CPU_GET_INFO( m8502 );
 #define N2A03_IRQ_LINE					M6502_IRQ_LINE
 
 extern CPU_GET_INFO( n2a03 );
+#define CPU_N2A03 CPU_GET_INFO_NAME( n2a03 )
 
 #define N2A03_DEFAULTCLOCK (21477272.724 / 12)
 
@@ -205,6 +211,7 @@ extern void n2a03_irq(const device_config *device);
 #define M65C02_IRQ_LINE					M6502_IRQ_LINE
 
 extern CPU_GET_INFO( m65c02 );
+#define CPU_M65C02 CPU_GET_INFO_NAME( m65c02 )
 
 extern CPU_DISASSEMBLE( m65c02 );
 
@@ -228,6 +235,7 @@ extern CPU_DISASSEMBLE( m65c02 );
 #define M65SC02_IRQ_LINE				M6502_IRQ_LINE
 
 extern CPU_GET_INFO( m65sc02 );
+#define CPU_M65SC02 CPU_GET_INFO_NAME( m65sc02 )
 
 extern CPU_DISASSEMBLE( m65sc02 );
 #endif
@@ -250,6 +258,7 @@ extern CPU_DISASSEMBLE( m65sc02 );
 #define DECO16_IRQ_LINE					M6502_IRQ_LINE
 
 extern CPU_GET_INFO( deco16 );
+#define CPU_DECO16 CPU_GET_INFO_NAME( deco16 )
 #endif
 
 extern CPU_DISASSEMBLE( deco16 );
diff --git a/src/emu/cpu/m6502/m6509.h b/src/emu/cpu/m6502/m6509.h
index 5eaa368092f..0ff2dc546b4 100644
--- a/src/emu/cpu/m6502/m6509.h
+++ b/src/emu/cpu/m6502/m6509.h
@@ -40,5 +40,6 @@ enum
 #define M6509_SET_OVERFLOW 3
 
 CPU_GET_INFO( m6509 );
+#define CPU_M6509 CPU_GET_INFO_NAME( m6509 )
 
 #endif /* __M6509_H__ */
diff --git a/src/emu/cpu/m6502/m65ce02.h b/src/emu/cpu/m6502/m65ce02.h
index 8f7519d0ddf..be79c482277 100644
--- a/src/emu/cpu/m6502/m65ce02.h
+++ b/src/emu/cpu/m6502/m65ce02.h
@@ -36,6 +36,7 @@ enum
 #define M65CE02_IRQ_LINE				M6502_IRQ_LINE
 
 CPU_GET_INFO( m65ce02 );
+#define CPU_M65CE02 CPU_GET_INFO_NAME( m65ce02 )
 
 extern CPU_DISASSEMBLE( m65ce02 );
 
diff --git a/src/emu/cpu/m6800/m6800.h b/src/emu/cpu/m6800/m6800.h
index 2dee80e6882..c155f48e740 100644
--- a/src/emu/cpu/m6800/m6800.h
+++ b/src/emu/cpu/m6800/m6800.h
@@ -46,25 +46,31 @@ enum
 #endif
 
 CPU_GET_INFO( m6800 );
+#define CPU_M6800 CPU_GET_INFO_NAME( m6800 )
 
 #if (HAS_M6801)
 CPU_GET_INFO( m6801 );
+#define CPU_M6801 CPU_GET_INFO_NAME( m6801 )
 #endif
 
 #if (HAS_M6802)
 CPU_GET_INFO( m6802 );
+#define CPU_M6802 CPU_GET_INFO_NAME( m6802 )
 #endif
 
 #if (HAS_M6803)
 CPU_GET_INFO( m6803 );
+#define CPU_M6803 CPU_GET_INFO_NAME( m6803 )
 #endif
 
 #if (HAS_M6808)
 CPU_GET_INFO( m6808 );
+#define CPU_M6808 CPU_GET_INFO_NAME( m6808 )
 #endif
 
 #if (HAS_HD63701)
 CPU_GET_INFO( hd63701 );
+#define CPU_HD63701 CPU_GET_INFO_NAME( hd63701 )
 
 /* FIMXE: these should be replaced to use m6803 ones */
 #define HD63701_DDR1 M6803_DDR1
@@ -84,6 +90,7 @@ WRITE8_HANDLER( hd63701_internal_registers_w );
 
 #if (HAS_NSC8105)
 CPU_GET_INFO( nsc8105 );
+#define CPU_NSC8105 CPU_GET_INFO_NAME( nsc8105 )
 #endif
 
 
@@ -252,6 +259,6 @@ WRITE8_HANDLER( hd63701_internal_registers_w );
 extern CPU_GET_INFO( nsc8105 );
 #endif
 
-
 #endif
 #endif /* __M6800_H__ */
+
diff --git a/src/emu/cpu/m68000/m68000.h b/src/emu/cpu/m68000/m68000.h
index da5352fe615..618eb17db5c 100644
--- a/src/emu/cpu/m68000/m68000.h
+++ b/src/emu/cpu/m68000/m68000.h
@@ -79,6 +79,13 @@ CPU_GET_INFO( m68ec020 );
 CPU_GET_INFO( m68020 );
 CPU_GET_INFO( m68040 );
 
+#define CPU_M68000 CPU_GET_INFO_NAME( m68000 )
+#define CPU_M68008 CPU_GET_INFO_NAME( m68008 )
+#define CPU_M68010 CPU_GET_INFO_NAME( m68010 )
+#define CPU_M68EC020 CPU_GET_INFO_NAME( m68ec020 )
+#define CPU_M68020 CPU_GET_INFO_NAME( m68020 )
+#define CPU_M68040 CPU_GET_INFO_NAME( m68040 )
+
 void m68k_set_encrypted_opcode_range(const device_config *device, offs_t start, offs_t end);
 
 unsigned int m68k_disassemble_raw(char* str_buff, unsigned int pc, const unsigned char* opdata, const unsigned char* argdata, unsigned int cpu_type);
diff --git a/src/emu/cpu/m6805/m6805.h b/src/emu/cpu/m6805/m6805.h
index 5a2401ee606..f8aa4c54b1c 100644
--- a/src/emu/cpu/m6805/m6805.h
+++ b/src/emu/cpu/m6805/m6805.h
@@ -12,6 +12,7 @@ enum { M6805_PC=1, M6805_S, M6805_CC, M6805_A, M6805_X, M6805_IRQ_STATE };
 #define M6805_IRQ_LINE		0
 
 extern CPU_GET_INFO( m6805 );
+#define CPU_M6805 CPU_GET_INFO_NAME( m6805 )
 
 /****************************************************************************
  * 68705 section
@@ -29,6 +30,7 @@ extern CPU_GET_INFO( m6805 );
 #define M68705_INT_TIMER			0x01
 
 extern CPU_GET_INFO( m68705 );
+#define CPU_M68705 CPU_GET_INFO_NAME( m68705 )
 #endif
 
 /****************************************************************************
@@ -58,6 +60,7 @@ extern CPU_GET_INFO( m68705 );
 #define HD63705_INT_NMI				0x08
 
 extern CPU_GET_INFO( hd63705 );
+#define CPU_HD63705 CPU_GET_INFO_NAME( hd63705 )
 #endif
 
 /****************************************************************************/
diff --git a/src/emu/cpu/m6809/m6809.h b/src/emu/cpu/m6809/m6809.h
index 410ae4475a2..caf5a9a244c 100644
--- a/src/emu/cpu/m6809/m6809.h
+++ b/src/emu/cpu/m6809/m6809.h
@@ -17,9 +17,11 @@ enum
 #define M6809_FIRQ_LINE 1   /* FIRQ line number */
 
 CPU_GET_INFO( m6809 );
+#define CPU_M6809 CPU_GET_INFO_NAME( m6809 )
 
 /* M6809e has LIC line to indicate opcode/data fetch */
 CPU_GET_INFO( m6809e );
+#define CPU_M6809E CPU_GET_INFO_NAME( m6809e )
 
 
 CPU_DISASSEMBLE( m6809 );
diff --git a/src/emu/cpu/mb86233/mb86233.h b/src/emu/cpu/mb86233/mb86233.h
index 6190914676e..89f8ae2d8f1 100644
--- a/src/emu/cpu/mb86233/mb86233.h
+++ b/src/emu/cpu/mb86233/mb86233.h
@@ -55,5 +55,6 @@ struct _mb86233_cpu_core
 };
 
 extern CPU_GET_INFO( mb86233 );
+#define CPU_MB86233 CPU_GET_INFO_NAME( mb86233 )
 
 #endif /* __MB86233_H__ */
diff --git a/src/emu/cpu/mb88xx/mb88xx.h b/src/emu/cpu/mb88xx/mb88xx.h
index f2fd26ff17e..759f7d446b7 100644
--- a/src/emu/cpu/mb88xx/mb88xx.h
+++ b/src/emu/cpu/mb88xx/mb88xx.h
@@ -74,6 +74,12 @@ CPU_GET_INFO( mb8842 );
 CPU_GET_INFO( mb8843 );
 CPU_GET_INFO( mb8844 );
 
+#define CPU_MB88 CPU_GET_INFO_NAME( mb88 )
+#define CPU_MB8841 CPU_GET_INFO_NAME( mb8841 )
+#define CPU_MB8842 CPU_GET_INFO_NAME( mb8842 )
+#define CPU_MB8843 CPU_GET_INFO_NAME( mb8843 )
+#define CPU_MB8844 CPU_GET_INFO_NAME( mb8844 )
+
 CPU_DISASSEMBLE( mb88 );
 
 #endif /* __MB88XX_H__ */
diff --git a/src/emu/cpu/mc68hc11/mc68hc11.h b/src/emu/cpu/mc68hc11/mc68hc11.h
index ea37f738a66..636c5385d0f 100644
--- a/src/emu/cpu/mc68hc11/mc68hc11.h
+++ b/src/emu/cpu/mc68hc11/mc68hc11.h
@@ -8,6 +8,7 @@
 offs_t hc11_disasm(const device_config *device, char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram);
 
 CPU_GET_INFO( mc68hc11 );
+#define CPU_MC68HC11 CPU_GET_INFO_NAME( mc68hc11 )
 
 
 #define MC68HC11_IO_PORTA			0x00
diff --git a/src/emu/cpu/mcs48/mcs48.h b/src/emu/cpu/mcs48/mcs48.h
index 836f802069e..4f26c7d2364 100644
--- a/src/emu/cpu/mcs48/mcs48.h
+++ b/src/emu/cpu/mcs48/mcs48.h
@@ -79,12 +79,24 @@ CPU_GET_INFO( i8748 );
 CPU_GET_INFO( mb8884 );
 CPU_GET_INFO( n7751 );
 
+#define CPU_I8035 CPU_GET_INFO_NAME( i8035 )
+#define CPU_I8048 CPU_GET_INFO_NAME( i8048 )
+#define CPU_I8648 CPU_GET_INFO_NAME( i8648 )
+#define CPU_I8748 CPU_GET_INFO_NAME( i8748 )
+#define CPU_MB8884 CPU_GET_INFO_NAME( mb8884 )
+#define CPU_N7751 CPU_GET_INFO_NAME( n7751 )
+
 /* variants with 128 bytes of internal RAM and up to 2k of internal ROM */
 CPU_GET_INFO( i8039 );
 CPU_GET_INFO( i8049 );
 CPU_GET_INFO( i8749 );
 CPU_GET_INFO( m58715 );
 
+#define CPU_I8039 CPU_GET_INFO_NAME( i8039 )
+#define CPU_I8049 CPU_GET_INFO_NAME( i8049 )
+#define CPU_I8749 CPU_GET_INFO_NAME( i8749 )
+#define CPU_M58715 CPU_GET_INFO_NAME( m58715 )
+
 /* disassembler */
 CPU_DISASSEMBLE( mcs48 );
 
diff --git a/src/emu/cpu/mcs51/mcs51.h b/src/emu/cpu/mcs51/mcs51.h
index 951bb93fe6e..0f186afea9c 100644
--- a/src/emu/cpu/mcs51/mcs51.h
+++ b/src/emu/cpu/mcs51/mcs51.h
@@ -98,29 +98,46 @@ extern void i8051_set_serial_rx_callback(const device_config *device, mcs51_seri
 
 /* variants with no internal rom and 128 byte internal memory */
 CPU_GET_INFO( i8031 );
+#define CPU_I8031 CPU_GET_INFO_NAME( i8031 )
 
 /* variants with no internal rom and 256 byte internal memory */
 CPU_GET_INFO( i8032 );
+#define CPU_I8032 CPU_GET_INFO_NAME( i8032 )
 
 /* variants 4k internal rom and 128 byte internal memory */
 CPU_GET_INFO( i8051 );
 CPU_GET_INFO( i8751 );
 
+#define CPU_I8051 CPU_GET_INFO_NAME( i8051 )
+#define CPU_I8751 CPU_GET_INFO_NAME( i8751 )
+
 /* variants 8k internal rom and 256 byte internal memory and more registers */
 CPU_GET_INFO( i8052 );
 CPU_GET_INFO( i8752 );
 
+#define CPU_I8052 CPU_GET_INFO_NAME( i8052 )
+#define CPU_I8752 CPU_GET_INFO_NAME( i8752 )
+
 /* cmos variants */
 CPU_GET_INFO( i80c31 );
 CPU_GET_INFO( i80c51 );
 CPU_GET_INFO( i87c51 );
 
+#define CPU_I80C31 CPU_GET_INFO_NAME( i80c31 )
+#define CPU_I80C32 CPU_GET_INFO_NAME( i80c32 )
+#define CPU_I80C51 CPU_GET_INFO_NAME( i80c51 )
+
 CPU_GET_INFO( i80c32 );
 CPU_GET_INFO( i80c52 );
 CPU_GET_INFO( i87c52 );
 
+#define CPU_I80C52 CPU_GET_INFO_NAME( i80c52 )
+#define CPU_I87C51 CPU_GET_INFO_NAME( i87c51 )
+#define CPU_I87C52 CPU_GET_INFO_NAME( i87c52 )
+
 /* 4k internal perom and 128 internal ram and 2 analog comparators */
 CPU_GET_INFO( at89c4051 );
+#define CPU_AT89C4051 CPU_GET_INFO_NAME( at89c4051 )
 
 /*
  * The DS5002FP has 2 16 bits data address buses (the byte-wide bus and the expanded bus). The exact memory position accessed depends on the
@@ -139,6 +156,7 @@ CPU_GET_INFO( at89c4051 );
  */
 
 CPU_GET_INFO( ds5002fp );
+#define CPU_DS5002FP CPU_GET_INFO_NAME( ds5002fp )
 
 
 /****************************************************************************
diff --git a/src/emu/cpu/minx/minx.h b/src/emu/cpu/minx/minx.h
index 7b4fdd1bc4b..bc02023887f 100644
--- a/src/emu/cpu/minx/minx.h
+++ b/src/emu/cpu/minx/minx.h
@@ -15,6 +15,9 @@ enum
         MINX_XI, MINX_YI,
 };
 
+CPU_GET_INFO( minx );
+#define CPU_MINX CPU_GET_INFO_NAME( minx )
+
 extern CPU_DISASSEMBLE( minx );
 
 #endif /* __MINX_H__ */
diff --git a/src/emu/cpu/mips/mips3.c b/src/emu/cpu/mips/mips3.c
index 1690686e5c8..bb4c155382a 100644
--- a/src/emu/cpu/mips/mips3.c
+++ b/src/emu/cpu/mips/mips3.c
@@ -2104,7 +2104,7 @@ static CPU_SET_INFO( mips3 )
 }
 
 
-CPU_GET_INFO( mips3 )
+static CPU_GET_INFO( mips3 )
 {
 	switch (state)
 	{
@@ -2163,7 +2163,7 @@ CPU_GET_INFO( r4600be )
 		case CPUINFO_STR_NAME:							strcpy(info->s, "R4600 (big)");			break;
 
 		/* --- everything else is handled generically --- */
-		default:										mips3_get_info(state, info);			break;
+		default:										CPU_GET_INFO_CALL(mips3);			break;
 	}
 }
 
@@ -2181,7 +2181,7 @@ CPU_GET_INFO( r4600le )
 		case CPUINFO_STR_NAME:							strcpy(info->s, "R4600 (little)");		break;
 
 		/* --- everything else is handled generically --- */
-		default:										mips3_get_info(state, info);			break;
+		default:										CPU_GET_INFO_CALL(mips3);			break;
 	}
 }
 #endif
@@ -2221,7 +2221,7 @@ CPU_GET_INFO( r4650be )
 		case CPUINFO_STR_NAME:							strcpy(info->s, "IDT R4650 (big)");		break;
 
 		/* --- everything else is handled generically --- */
-		default:										mips3_get_info(state, info);			break;
+		default:										CPU_GET_INFO_CALL(mips3);			break;
 	}
 }
 
@@ -2239,7 +2239,7 @@ CPU_GET_INFO( r4650le )
 		case CPUINFO_STR_NAME:							strcpy(info->s, "IDT R4650 (little)");	break;
 
 		/* --- everything else is handled generically --- */
-		default:										mips3_get_info(state, info);			break;
+		default:										CPU_GET_INFO_CALL(mips3);			break;
 	}
 }
 #endif
@@ -2279,7 +2279,7 @@ CPU_GET_INFO( r4700be )
 		case CPUINFO_STR_NAME:							strcpy(info->s, "R4700 (big)");			break;
 
 		/* --- everything else is handled generically --- */
-		default:										mips3_get_info(state, info);			break;
+		default:										CPU_GET_INFO_CALL(mips3);			break;
 	}
 }
 
@@ -2298,7 +2298,7 @@ CPU_GET_INFO( r4700le )
 		case CPUINFO_STR_NAME:							strcpy(info->s, "R4700 (little)");		break;
 
 		/* --- everything else is handled generically --- */
-		default:										mips3_get_info(state, info);			break;
+		default:										CPU_GET_INFO_CALL(mips3);			break;
 	}
 }
 #endif
@@ -2338,7 +2338,7 @@ CPU_GET_INFO( r5000be )
 		case CPUINFO_STR_NAME:							strcpy(info->s, "R5000 (big)");			break;
 
 		/* --- everything else is handled generically --- */
-		default:										mips3_get_info(state, info);			break;
+		default:										CPU_GET_INFO_CALL(mips3);			break;
 	}
 }
 
@@ -2356,7 +2356,7 @@ CPU_GET_INFO( r5000le )
 		case CPUINFO_STR_NAME:							strcpy(info->s, "R5000 (little)");		break;
 
 		/* --- everything else is handled generically --- */
-		default:										mips3_get_info(state, info);			break;
+		default:										CPU_GET_INFO_CALL(mips3);			break;
 	}
 }
 #endif
@@ -2396,7 +2396,7 @@ CPU_GET_INFO( qed5271be )
 		case CPUINFO_STR_NAME:							strcpy(info->s, "QED5271 (big)");		break;
 
 		/* --- everything else is handled generically --- */
-		default:										mips3_get_info(state, info);			break;
+		default:										CPU_GET_INFO_CALL(mips3);			break;
 	}
 }
 
@@ -2414,7 +2414,7 @@ CPU_GET_INFO( qed5271le )
 		case CPUINFO_STR_NAME:							strcpy(info->s, "QED5271 (little)");	break;
 
 		/* --- everything else is handled generically --- */
-		default:										mips3_get_info(state, info);			break;
+		default:										CPU_GET_INFO_CALL(mips3);			break;
 	}
 }
 #endif
@@ -2454,7 +2454,7 @@ CPU_GET_INFO( rm7000be )
 		case CPUINFO_STR_NAME:							strcpy(info->s, "RM7000 (big)");		break;
 
 		/* --- everything else is handled generically --- */
-		default:										mips3_get_info(state, info);			break;
+		default:										CPU_GET_INFO_CALL(mips3);			break;
 	}
 }
 
@@ -2472,7 +2472,7 @@ CPU_GET_INFO( rm7000le )
 		case CPUINFO_STR_NAME:							strcpy(info->s, "RM7000 (little)");		break;
 
 		/* --- everything else is handled generically --- */
-		default:										mips3_get_info(state, info);			break;
+		default:										CPU_GET_INFO_CALL(mips3);			break;
 	}
 }
 #endif
diff --git a/src/emu/cpu/mips/mips3.h b/src/emu/cpu/mips/mips3.h
index ffc130cb52f..c7ca7c50b51 100644
--- a/src/emu/cpu/mips/mips3.h
+++ b/src/emu/cpu/mips/mips3.h
@@ -227,27 +227,44 @@ struct _mips3_config
 
 #if (HAS_R4600)
 CPU_GET_INFO( r4600be );
+#define CPU_R4600BE CPU_GET_INFO_NAME( r4600be )
 CPU_GET_INFO( r4600le );
+#define CPU_R4600LE CPU_GET_INFO_NAME( r4600le )
+#endif
+
+#if (HAS_R4650)
+CPU_GET_INFO( r4650be);
+#define CPU_R4650BE CPU_GET_INFO_NAME( r4650be )
+CPU_GET_INFO( r4650le);
+#define CPU_R4650LE CPU_GET_INFO_NAME( r4650le )
 #endif
 
 #if (HAS_R4700)
 CPU_GET_INFO( r4700be );
+#define CPU_R4700BE CPU_GET_INFO_NAME( r4700be )
 CPU_GET_INFO( r4700le );
+#define CPU_R4700LE CPU_GET_INFO_NAME( r4700le )
 #endif
 
 #if (HAS_R5000)
 CPU_GET_INFO( r5000be );
+#define CPU_R5000BE CPU_GET_INFO_NAME( r5000be )
 CPU_GET_INFO( r5000le );
+#define CPU_R5000LE CPU_GET_INFO_NAME( r5000le )
 #endif
 
 #if (HAS_QED5271)
 CPU_GET_INFO( qed5271be );
+#define CPU_QED5271BE CPU_GET_INFO_NAME( qed5271be )
 CPU_GET_INFO( qed5271le );
+#define CPU_QED5271LE CPU_GET_INFO_NAME( qed5271le )
 #endif
 
 #if (HAS_RM7000)
 CPU_GET_INFO( rm7000be );
+#define CPU_RM7000BE CPU_GET_INFO_NAME( rm7000be )
 CPU_GET_INFO( rm7000le );
+#define CPU_RM7000LE CPU_GET_INFO_NAME( rm7000le )
 #endif
 
 
diff --git a/src/emu/cpu/mips/psx.h b/src/emu/cpu/mips/psx.h
index 68e50969849..50f04818e2e 100644
--- a/src/emu/cpu/mips/psx.h
+++ b/src/emu/cpu/mips/psx.h
@@ -215,4 +215,10 @@ struct _DasmPSXCPU_state
 
 extern unsigned DasmPSXCPU( DasmPSXCPU_state *state, char *buffer, UINT32 pc, const UINT8 *opram );
 
+CPU_GET_INFO( psxcpu );
+#define CPU_PSXCPU CPU_GET_INFO_NAME( psxcpu )
+
+CPU_GET_INFO( cxd8661r );
+#define CPU_CXD8661R CPU_GET_INFO_NAME( cxd8661r )
+
 #endif /* __PSX_H__ */
diff --git a/src/emu/cpu/mips/r3000.h b/src/emu/cpu/mips/r3000.h
index 0a55b2a1db2..de357026240 100644
--- a/src/emu/cpu/mips/r3000.h
+++ b/src/emu/cpu/mips/r3000.h
@@ -63,7 +63,13 @@ struct _r3000_cpu_core
 extern CPU_GET_INFO( r3000be );
 extern CPU_GET_INFO( r3000le );
 
+#define CPU_R3000BE CPU_GET_INFO_NAME( r3000be )
+#define CPU_R3000LE CPU_GET_INFO_NAME( r3000le )
+
 extern CPU_GET_INFO( r3041be );
 extern CPU_GET_INFO( r3041le );
 
+#define CPU_R3041BE CPU_GET_INFO_NAME( r3041be )
+#define CPU_R3041LE CPU_GET_INFO_NAME( r3041le )
+
 #endif /* __R3000_H__ */
diff --git a/src/emu/cpu/nec/necintrf.h b/src/emu/cpu/nec/necintrf.h
index 552647b51f3..e3005a82809 100644
--- a/src/emu/cpu/nec/necintrf.h
+++ b/src/emu/cpu/nec/necintrf.h
@@ -14,7 +14,15 @@ enum
 
 /* Public functions */
 extern CPU_GET_INFO( v20 );
+extern CPU_GET_INFO( v25 );
 extern CPU_GET_INFO( v30 );
 extern CPU_GET_INFO( v33 );
+extern CPU_GET_INFO( v35 );
+
+#define CPU_V20 CPU_GET_INFO_NAME( v20 )
+#define CPU_V25 CPU_GET_INFO_NAME( v25 )
+#define CPU_V30 CPU_GET_INFO_NAME( v30 )
+#define CPU_V33 CPU_GET_INFO_NAME( v33 )
+#define CPU_V35 CPU_GET_INFO_NAME( v35 )
 
 #endif
diff --git a/src/emu/cpu/pdp1/pdp1.h b/src/emu/cpu/pdp1/pdp1.h
index caeb5b6be41..c5557914267 100644
--- a/src/emu/cpu/pdp1/pdp1.h
+++ b/src/emu/cpu/pdp1/pdp1.h
@@ -50,6 +50,7 @@ struct _pdp1_reset_param_t
 
 /* PUBLIC FUNCTIONS */
 CPU_GET_INFO( pdp1 );
+#define CPU_PDP1 CPU_GET_INFO_NAME( pdp1 )
 
 #define AND 001
 #define IOR 002
diff --git a/src/emu/cpu/pdp1/tx0.h b/src/emu/cpu/pdp1/tx0.h
index 38b6cbe97cb..ee3989cf8ff 100644
--- a/src/emu/cpu/pdp1/tx0.h
+++ b/src/emu/cpu/pdp1/tx0.h
@@ -47,6 +47,9 @@ struct _tx0_reset_param_t
 CPU_GET_INFO( tx0_64kw );
 CPU_GET_INFO( tx0_8kw );
 
+#define CPU_TX0_64KW CPU_GET_INFO_NAME( tx0_64kw )
+#define CPU_TX0_8KW CPU_GET_INFO_NAME( tx0_8kw )
+
 CPU_DISASSEMBLE( tx0_64kw );
 CPU_DISASSEMBLE( tx0_8kw );
 
diff --git a/src/emu/cpu/pic16c5x/pic16c5x.h b/src/emu/cpu/pic16c5x/pic16c5x.h
index aad94b198ef..f3fe8494b27 100644
--- a/src/emu/cpu/pic16c5x/pic16c5x.h
+++ b/src/emu/cpu/pic16c5x/pic16c5x.h
@@ -104,27 +104,32 @@ void pic16c5x_set_config(const device_config *cpu, int data);
 
 
 #if (HAS_PIC16C54)
-CPU_GET_INFO( pic16C54 );
+CPU_GET_INFO( pic16c54 );
+#define CPU_PIC16C54 CPU_GET_INFO_NAME( pic16c54 )
 #endif
 
 
 #if (HAS_PIC16C55)
-CPU_GET_INFO( pic16C55 );
+CPU_GET_INFO( pic16c55 );
+#define CPU_PIC16C55 CPU_GET_INFO_NAME( pic16c55 )
 #endif
 
 
 #if (HAS_PIC16C56)
-CPU_GET_INFO( pic16C56 );
+CPU_GET_INFO( pic16c56 );
+#define CPU_PIC16C56 CPU_GET_INFO_NAME( pic16c56 )
 #endif
 
 
 #if (HAS_PIC16C57)
-CPU_GET_INFO( pic16C57 );
+CPU_GET_INFO( pic16c57 );
+#define CPU_PIC16C57 CPU_GET_INFO_NAME( pic16c57 )
 #endif
 
 
 #if (HAS_PIC16C58)
-CPU_GET_INFO( pic16C58 );
+CPU_GET_INFO( pic16c58 );
+#define CPU_PIC16C58 CPU_GET_INFO_NAME( pic16c58 )
 #endif
 
 
diff --git a/src/emu/cpu/powerpc/ppc.c b/src/emu/cpu/powerpc/ppc.c
index f8c8808e580..0f6ebeaa1fe 100644
--- a/src/emu/cpu/powerpc/ppc.c
+++ b/src/emu/cpu/powerpc/ppc.c
@@ -1956,7 +1956,7 @@ CPU_GET_INFO( ppc403 )
 		case CPUINFO_STR_REGISTER + PPC_EXIER:			sprintf(info->s, "EXIER: %08X", EXIER); break;
 		case CPUINFO_STR_REGISTER + PPC_EXISR:			sprintf(info->s, "EXISR: %08X", EXISR); break;
 
-		default:										ppc_get_info(state, info);				break;
+		default:										CPU_GET_INFO_CALL(ppc);				break;
 	}
 }
 #endif
@@ -1991,7 +1991,7 @@ CPU_GET_INFO( ppc603 )
 		case CPUINFO_STR_NAME:							strcpy(info->s, "PPC603");				break;
 		case CPUINFO_STR_REGISTER + PPC_DEC:			sprintf(info->s, "DEC: %08X", read_decrementer()); break;
 
-		default:										ppc_get_info(state, info);				break;
+		default:										CPU_GET_INFO_CALL(ppc);				break;
 	}
 }
 #endif
@@ -2040,7 +2040,7 @@ CPU_GET_INFO( ppc602 )
 		case CPUINFO_STR_NAME:							strcpy(info->s, "PPC602");				break;
 		case CPUINFO_STR_REGISTER + PPC_IBR:			sprintf(info->s, "IBR: %08X", ppc.ibr); break;
 
-		default:										ppc_get_info(state, info);				break;
+		default:										CPU_GET_INFO_CALL(ppc);				break;
 	}
 }
 #endif
@@ -2085,7 +2085,7 @@ CPU_GET_INFO( mpc8240 )
 		/* --- the following bits of info are returned as NULL-terminated strings --- */
 		case CPUINFO_STR_NAME:							strcpy(info->s, "MPC8240");				break;
 
-		default:										ppc_get_info(state, info);				break;
+		default:										CPU_GET_INFO_CALL(ppc);				break;
 	}
 }
 #endif
@@ -2130,7 +2130,7 @@ CPU_GET_INFO( ppc601 )
 		/* --- the following bits of info are returned as NULL-terminated strings --- */
 		case CPUINFO_STR_NAME:							strcpy(info->s, "PPC601");				break;
 
-		default:										ppc_get_info(state, info);				break;
+		default:										CPU_GET_INFO_CALL(ppc);				break;
 	}
 }
 #endif
@@ -2175,7 +2175,7 @@ CPU_GET_INFO( ppc604 )
 		/* --- the following bits of info are returned as NULL-terminated strings --- */
 		case CPUINFO_STR_NAME:							strcpy(info->s, "PPC604");				break;
 
-		default:										ppc_get_info(state, info);				break;
+		default:										CPU_GET_INFO_CALL(ppc);				break;
 	}
 }
 #endif
diff --git a/src/emu/cpu/powerpc/ppc.h b/src/emu/cpu/powerpc/ppc.h
index f630c370f8c..693e24bd222 100644
--- a/src/emu/cpu/powerpc/ppc.h
+++ b/src/emu/cpu/powerpc/ppc.h
@@ -152,38 +152,47 @@ struct _powerpc_config
 
 #if (HAS_PPC403GA)
 CPU_GET_INFO( ppc403ga );
+#define CPU_PPC403GA CPU_GET_INFO_NAME( ppc403ga )
 #endif
 
 #if (HAS_PPC403GCX)
 CPU_GET_INFO( ppc403gcx );
+#define CPU_PPC403GCX CPU_GET_INFO_NAME( ppc403gcx )
 #endif
 
 #if (HAS_PPC601)
 CPU_GET_INFO( ppc601 );
+#define CPU_PPC601 CPU_GET_INFO_NAME( ppc601 )
 #endif
 
 #if (HAS_PPC602)
 CPU_GET_INFO( ppc602 );
+#define CPU_PPC602 CPU_GET_INFO_NAME( ppc602 )
 #endif
 
 #if (HAS_PPC603)
 CPU_GET_INFO( ppc603 );
+#define CPU_PPC603 CPU_GET_INFO_NAME( ppc603 )
 #endif
 
 #if (HAS_PPC603E)
 CPU_GET_INFO( ppc603e );
+#define CPU_PPC603E CPU_GET_INFO_NAME( ppc603e )
 #endif
 
 #if (HAS_PPC603R)
 CPU_GET_INFO( ppc603r );
+#define CPU_PPC603R CPU_GET_INFO_NAME( ppc603r )
 #endif
 
 #if (HAS_PPC604)
 CPU_GET_INFO( ppc604 );
+#define CPU_PPC604 CPU_GET_INFO_NAME( ppc604 )
 #endif
 
 #if (HAS_MPC8240)
 CPU_GET_INFO( mpc8240 );
+#define CPU_MPC8240 CPU_GET_INFO_NAME( mpc8240 )
 #endif
 
 
diff --git a/src/emu/cpu/rsp/rsp.h b/src/emu/cpu/rsp/rsp.h
index ea72d239306..1dc48d794be 100644
--- a/src/emu/cpu/rsp/rsp.h
+++ b/src/emu/cpu/rsp/rsp.h
@@ -72,6 +72,7 @@ enum
 #define RSP_STATUS_SIGNAL7       0x4000
 
 CPU_GET_INFO( rsp );
+#define CPU_RSP CPU_GET_INFO_NAME( rsp )
 
 extern offs_t rsp_dasm_one(char *buffer, offs_t pc, UINT32 op);
 
diff --git a/src/emu/cpu/s2650/s2650.h b/src/emu/cpu/s2650/s2650.h
index 43d0b18d63f..dc1d7240b62 100644
--- a/src/emu/cpu/s2650/s2650.h
+++ b/src/emu/cpu/s2650/s2650.h
@@ -25,6 +25,7 @@ enum
 #define S2650_SENSE_PORT 0x102
 
 extern CPU_GET_INFO( s2650 );
+#define CPU_S2650 CPU_GET_INFO_NAME( s2650 )
 
 extern CPU_DISASSEMBLE( s2650 );
 
diff --git a/src/emu/cpu/saturn/saturn.h b/src/emu/cpu/saturn/saturn.h
index 4901449e6c1..e505f2afbbe 100644
--- a/src/emu/cpu/saturn/saturn.h
+++ b/src/emu/cpu/saturn/saturn.h
@@ -89,5 +89,6 @@ enum
 CPU_DISASSEMBLE( saturn );
 
 CPU_GET_INFO( saturn );
+#define CPU_SATURN CPU_GET_INFO_NAME( saturn )
 
 #endif /* __SATURN_H__ */
diff --git a/src/emu/cpu/sc61860/sc61860.h b/src/emu/cpu/sc61860/sc61860.h
index 8d44c79c2a4..7c854f610f3 100644
--- a/src/emu/cpu/sc61860/sc61860.h
+++ b/src/emu/cpu/sc61860/sc61860.h
@@ -57,5 +57,6 @@ CPU_DISASSEMBLE( sc61860 );
 UINT8 *sc61860_internal_ram(const device_config *device);
 
 CPU_GET_INFO( sc61860 );
+#define CPU_SC61860 CPU_GET_INFO_NAME( sc61860 )
 
 #endif /* __SC61860_H__ */
diff --git a/src/emu/cpu/se3208/se3208.h b/src/emu/cpu/se3208/se3208.h
index 01c7177b992..b6346fca4ef 100644
--- a/src/emu/cpu/se3208/se3208.h
+++ b/src/emu/cpu/se3208/se3208.h
@@ -9,5 +9,6 @@ enum
 #define SE3208_INT	0
 
 extern CPU_GET_INFO( se3208 );
+#define CPU_SE3208 CPU_GET_INFO_NAME( se3208 )
 
 CPU_DISASSEMBLE( se3208 );
diff --git a/src/emu/cpu/sh2/sh2.c b/src/emu/cpu/sh2/sh2.c
index 561de704d35..80718ff2e23 100644
--- a/src/emu/cpu/sh2/sh2.c
+++ b/src/emu/cpu/sh2/sh2.c
@@ -2461,7 +2461,7 @@ CPU_GET_INFO( sh1 )
 		/* --- the following bits of info are returned as NULL-terminated strings --- */
 		case CPUINFO_STR_NAME:	    					strcpy(info->s, "SH-1");				break;
 
-		default:							sh2_get_info(state, info);			break;
+		default:							CPU_GET_INFO_CALL(sh2);			break;
 	}
 }
 
diff --git a/src/emu/cpu/sh2/sh2.h b/src/emu/cpu/sh2/sh2.h
index 7436b1b24ae..e7689bf06c8 100644
--- a/src/emu/cpu/sh2/sh2.h
+++ b/src/emu/cpu/sh2/sh2.h
@@ -92,8 +92,12 @@ struct _sh2_cpu_core
   int  (*dma_callback_kludge)(UINT32 src, UINT32 dst, UINT32 data, int size);
 };
 
+extern CPU_GET_INFO( sh1 );
 extern CPU_GET_INFO( sh2 );
 
+#define CPU_SH1 CPU_GET_INFO_NAME( sh1 )
+#define CPU_SH2 CPU_GET_INFO_NAME( sh2 )
+
 WRITE32_HANDLER( sh2_internal_w );
 READ32_HANDLER( sh2_internal_r );
 
diff --git a/src/emu/cpu/sh4/sh4.h b/src/emu/cpu/sh4/sh4.h
index d10303f5783..347b7151102 100644
--- a/src/emu/cpu/sh4/sh4.h
+++ b/src/emu/cpu/sh4/sh4.h
@@ -102,6 +102,7 @@ struct sh4_ddt_dma
 };
 
 extern CPU_GET_INFO( sh4 );
+#define CPU_SH4 CPU_GET_INFO_NAME( sh4 )
 
 WRITE32_HANDLER( sh4_internal_w );
 READ32_HANDLER( sh4_internal_r );
diff --git a/src/emu/cpu/sharc/sharc.h b/src/emu/cpu/sharc/sharc.h
index ef31e58ba5c..c5b42a898d4 100644
--- a/src/emu/cpu/sharc/sharc.h
+++ b/src/emu/cpu/sharc/sharc.h
@@ -29,6 +29,7 @@ extern void sharc_external_dma_write(const device_config *device, UINT32 address
 
 #if (HAS_ADSP21062)
 CPU_GET_INFO( adsp21062 );
+#define CPU_ADSP21062 CPU_GET_INFO_NAME( adsp21062 )
 #endif
 
 extern UINT32 sharc_dasm_one(char *buffer, offs_t pc, UINT64 opcode);
diff --git a/src/emu/cpu/sm8500/sm8500.h b/src/emu/cpu/sm8500/sm8500.h
index e38f4bb6de6..263abcaf489 100644
--- a/src/emu/cpu/sm8500/sm8500.h
+++ b/src/emu/cpu/sm8500/sm8500.h
@@ -36,6 +36,7 @@ enum
 extern UINT8* sm8500_internal_ram( void ) ;
 extern unsigned sm8500_get_reg( int regnum );
 extern CPU_GET_INFO( sm8500 );
+#define CPU_sm8500 CPU_GET_INFO_NAME( sm8500 )
 
 UINT8 sm85cpu_mem_readbyte( UINT32 offset );
 void sm85cpu_mem_writebyte( UINT32 offset, UINT8 data );
diff --git a/src/emu/cpu/spc700/spc700.h b/src/emu/cpu/spc700/spc700.h
index 4854163e097..606549e3830 100644
--- a/src/emu/cpu/spc700/spc700.h
+++ b/src/emu/cpu/spc700/spc700.h
@@ -152,6 +152,7 @@ void spc700_branching(unsigned int new_pc);
 #include "cpuintrf.h"
 
 extern CPU_GET_INFO( spc700 );
+#define CPU_SPC700 CPU_GET_INFO_NAME( spc700 )
 
 #define spc700_read_8(addr) memory_read_byte_8le(cpustate->program,addr)
 #define spc700_write_8(addr,data) memory_write_byte_8le(cpustate->program,addr,data)
diff --git a/src/emu/cpu/ssp1601/ssp1601.h b/src/emu/cpu/ssp1601/ssp1601.h
index 60384f064a1..8df2cf15cbe 100644
--- a/src/emu/cpu/ssp1601/ssp1601.h
+++ b/src/emu/cpu/ssp1601/ssp1601.h
@@ -18,6 +18,7 @@ enum
 
 #if (HAS_SSP1601)
 CPU_GET_INFO( ssp1601 );
+#define CPU_SSP1601 CPU_GET_INFO_NAME( ssp1601 )
 #endif
 
 extern unsigned dasm_ssp1601(char *buffer, unsigned pc, const UINT8 *oprom);
diff --git a/src/emu/cpu/t11/t11.h b/src/emu/cpu/t11/t11.h
index 4e04b145d34..db28a1a3438 100644
--- a/src/emu/cpu/t11/t11.h
+++ b/src/emu/cpu/t11/t11.h
@@ -34,6 +34,7 @@ struct t11_setup
 
 
 extern CPU_GET_INFO( t11 );
+#define CPU_T11 CPU_GET_INFO_NAME( t11 )
 
 /****************************************************************************/
 /* Read a byte from given memory location                                   */
diff --git a/src/emu/cpu/tlcs90/tlcs90.h b/src/emu/cpu/tlcs90/tlcs90.h
index b31b55df26a..9b53b843131 100644
--- a/src/emu/cpu/tlcs90/tlcs90.h
+++ b/src/emu/cpu/tlcs90/tlcs90.h
@@ -10,6 +10,11 @@ CPU_GET_INFO( tmp90841 );
 CPU_GET_INFO( tmp91640 );
 CPU_GET_INFO( tmp91641 );
 
+#define CPU_TMP90840 CPU_GET_INFO_NAME( tmp90840 )
+#define CPU_TMP90841 CPU_GET_INFO_NAME( tmp90841 )
+#define CPU_TMP91640 CPU_GET_INFO_NAME( tmp91640 )
+#define CPU_TMP91641 CPU_GET_INFO_NAME( tmp91641 )
+
 CPU_DISASSEMBLE( t90 );
 
 #define T90_IOBASE	0xffc0
diff --git a/src/emu/cpu/tms32010/tms32010.h b/src/emu/cpu/tms32010/tms32010.h
index ab46605ccea..cfe808afc15 100644
--- a/src/emu/cpu/tms32010/tms32010.h
+++ b/src/emu/cpu/tms32010/tms32010.h
@@ -52,6 +52,7 @@ enum
  */
 
 CPU_GET_INFO( tms32010 );
+#define CPU_TMS32010 CPU_GET_INFO_NAME( tms32010 )
 
 
 
diff --git a/src/emu/cpu/tms32025/tms32025.h b/src/emu/cpu/tms32025/tms32025.h
index 632a74b828b..eb4ace50043 100644
--- a/src/emu/cpu/tms32025/tms32025.h
+++ b/src/emu/cpu/tms32025/tms32025.h
@@ -73,6 +73,8 @@ enum
 extern CPU_GET_INFO( tms32025 );
 extern CPU_GET_INFO( tms32026 );
 
+#define CPU_TMS32025 CPU_GET_INFO_NAME( tms32025 )
+#define CPU_TMS32026 CPU_GET_INFO_NAME( tms32026 )
 
 CPU_DISASSEMBLE( tms32025 );
 
diff --git a/src/emu/cpu/tms32031/tms32031.h b/src/emu/cpu/tms32031/tms32031.h
index d3f0c1c82ed..6662884a701 100644
--- a/src/emu/cpu/tms32031/tms32031.h
+++ b/src/emu/cpu/tms32031/tms32031.h
@@ -77,6 +77,9 @@ enum
 extern CPU_GET_INFO( tms32031 );
 extern CPU_GET_INFO( tms32032 );
 
+#define CPU_TMS32031 CPU_GET_INFO_NAME( tms32031 )
+#define CPU_TMS32032 CPU_GET_INFO_NAME( tms32032 )
+
 extern float convert_tms3203x_fp_to_float(UINT32 floatdata);
 extern double convert_tms3203x_fp_to_double(UINT32 floatdata);
 extern UINT32 convert_float_to_tms3203x_fp(float fval);
diff --git a/src/emu/cpu/tms32051/tms32051.h b/src/emu/cpu/tms32051/tms32051.h
index 332708c93e1..691008723da 100644
--- a/src/emu/cpu/tms32051/tms32051.h
+++ b/src/emu/cpu/tms32051/tms32051.h
@@ -5,6 +5,7 @@
 
 #if (HAS_TMS32051)
 CPU_GET_INFO( tms32051 );
+#define CPU_TMS32051 CPU_GET_INFO_NAME( tms32051 )
 #endif
 
 CPU_DISASSEMBLE( tms32051 );
diff --git a/src/emu/cpu/tms34010/tms34010.h b/src/emu/cpu/tms34010/tms34010.h
index 7bb13ac8c8d..34ce3ad7e25 100644
--- a/src/emu/cpu/tms34010/tms34010.h
+++ b/src/emu/cpu/tms34010/tms34010.h
@@ -207,9 +207,11 @@ VIDEO_UPDATE( tms340x0 );
 void tms34010_get_display_params(const device_config *cpu, tms34010_display_params *params);
 
 CPU_GET_INFO( tms34010 );
+#define CPU_TMS34010 CPU_GET_INFO_NAME( tms34010 )
 
 /* PUBLIC FUNCTIONS - 34020 */
 CPU_GET_INFO( tms34020 );
+#define CPU_TMS34020 CPU_GET_INFO_NAME( tms34020 )
 
 
 /* Host control interface */
diff --git a/src/emu/cpu/tms7000/tms7000.h b/src/emu/cpu/tms7000/tms7000.h
index 7a483332174..d344951549e 100644
--- a/src/emu/cpu/tms7000/tms7000.h
+++ b/src/emu/cpu/tms7000/tms7000.h
@@ -51,6 +51,9 @@ extern void tms7000_A6EC1( const device_config *device ); /* External event coun
 extern CPU_GET_INFO( tms7000 );
 extern CPU_GET_INFO( tms7000_exl );
 
+#define CPU_TMS7000 CPU_GET_INFO_NAME( tms7000 )
+#define CPU_TMS7000_EXL CPU_GET_INFO_NAME( tms7000_exl )
+
 extern CPU_DISASSEMBLE( tms7000 );
 
 #endif /* __TMS7000_H__ */
diff --git a/src/emu/cpu/tms9900/tms9900.h b/src/emu/cpu/tms9900/tms9900.h
index 99c360b4816..b3c18b7fb6c 100644
--- a/src/emu/cpu/tms9900/tms9900.h
+++ b/src/emu/cpu/tms9900/tms9900.h
@@ -55,6 +55,7 @@ typedef void (*ti99xx_error_interrupt_func)(const device_config *device, int sta
 #if (HAS_TI990_10)
 
 extern CPU_GET_INFO( ti990_10 );
+#define CPU_TI990_10 CPU_GET_INFO_NAME( ti990_10 )
 
 /*
     structure with the parameters ti990_10_reset wants.
@@ -84,6 +85,7 @@ extern WRITE8_HANDLER(ti990_10_eir_cru_w);
 #if (HAS_TMS9900)
 
 extern CPU_GET_INFO( tms9900 );
+#define CPU_TMS9900 CPU_GET_INFO_NAME( tms9900 )
 
 /*
     structure with optional parameters for tms9900_reset.
@@ -98,6 +100,7 @@ typedef struct tms9900reset_param
 #if (HAS_TMS9940)
 
 extern CPU_GET_INFO( tms9940 );
+#define CPU_TMS9940 CPU_GET_INFO_NAME( tms9940 )
 
 /*
     structure with optional parameters for tms9940_reset.
@@ -112,6 +115,7 @@ typedef struct tms9940reset_param
 #if (HAS_TMS9980)
 
 extern CPU_GET_INFO( tms9980a );
+#define CPU_TMS9980 CPU_GET_INFO_NAME( tms9980a )
 
 /*
     structure with optional parameters for tms9980a_reset.
@@ -126,6 +130,7 @@ typedef struct tms9980areset_param
 #if (HAS_TMS9985)
 
 extern CPU_GET_INFO( tms9985 );
+#define CPU_TMS9986 CPU_GET_INFO_NAME( tms9985 )
 
 /*
     structure with optional parameters for tms9985_reset.
@@ -140,6 +145,7 @@ typedef struct tms9985reset_param
 #if (HAS_TMS9989)
 
 extern CPU_GET_INFO( tms9989 );
+#define CPU_TMS9989 CPU_GET_INFO_NAME( tms9989 )
 
 /*
     structure with optional parameters for tms9989_reset.
@@ -154,6 +160,7 @@ typedef struct tms9989reset_param
 #if (HAS_TMS9995)
 
 extern CPU_GET_INFO( tms9995 );
+#define CPU_TMS9995 CPU_GET_INFO_NAME( tms9995 )
 
 /*
   structure with the parameters tms9995_reset wants.
@@ -184,6 +191,7 @@ extern WRITE8_HANDLER(tms9995_internal2_w);
 #if (HAS_TMS99000)
 
 extern CPU_GET_INFO( tms99000 );
+#define CPU_TMS99000 CPU_GET_INFO_NAME( tms99000 )
 
 /*
     structure with optional parameters for tms99000_reset.
@@ -198,6 +206,7 @@ typedef struct tms99000reset_param
 #if (HAS_TMS99105A)
 
 extern CPU_GET_INFO( tms99105a );
+#define CPU_TMS99105A CPU_GET_INFO_NAME( tms99105a )
 
 /*
     structure with optional parameters for tms99105a_reset.
@@ -212,6 +221,7 @@ typedef struct tms99105areset_param
 #if (HAS_TMS99110A)
 
 extern CPU_GET_INFO( tms99110a );
+#define CPU_TMS99110A CPU_GET_INFO_NAME( tms99110a )
 
 /*
     structure with optional parameters for tms99110a_reset.
diff --git a/src/emu/cpu/upd7810/upd7810.h b/src/emu/cpu/upd7810/upd7810.h
index 4e2b03cb912..0fd2f94e1b3 100644
--- a/src/emu/cpu/upd7810/upd7810.h
+++ b/src/emu/cpu/upd7810/upd7810.h
@@ -77,6 +77,12 @@ CPU_GET_INFO( upd7801 );
 CPU_GET_INFO( upd78c05 );
 CPU_GET_INFO( upd78c06 );
 
+#define CPU_UPD7810 CPU_GET_INFO_NAME( upd7810 )
+#define CPU_UPD7807 CPU_GET_INFO_NAME( upd7807 )
+#define CPU_UPD7801 CPU_GET_INFO_NAME( upd7801 )
+#define CPU_UPD78C05 CPU_GET_INFO_NAME( upd78c05 )
+#define CPU_UPD78C06 CPU_GET_INFO_NAME( upd78c06 )
+
 CPU_DISASSEMBLE( upd7810 );
 CPU_DISASSEMBLE( upd7807 );
 CPU_DISASSEMBLE( upd7801 );
diff --git a/src/emu/cpu/v30mz/necintrf.h b/src/emu/cpu/v30mz/necintrf.h
index 188b42bf16a..67ee0208de4 100644
--- a/src/emu/cpu/v30mz/necintrf.h
+++ b/src/emu/cpu/v30mz/necintrf.h
@@ -14,5 +14,6 @@ enum
 
 /* Public functions */
 extern CPU_GET_INFO( v30mz );
+#define CPU_V30MZ CPU_GET_INFO_NAME( v30mz )
 
 #endif /* __NECINTRF_H__ */
diff --git a/src/emu/cpu/v60/v60.h b/src/emu/cpu/v60/v60.h
index 45ee2f623bb..77e3c9f611b 100644
--- a/src/emu/cpu/v60/v60.h
+++ b/src/emu/cpu/v60/v60.h
@@ -83,10 +83,12 @@ void v60_stall(const device_config *device);
 
 #if HAS_V60
 CPU_GET_INFO( v60 );
+#define CPU_V60 CPU_GET_INFO_NAME( v60 )
 #endif /* HAS_V60 */
 
 #if HAS_V70
 CPU_GET_INFO( v70 );
+#define CPU_V70 CPU_GET_INFO_NAME( v70 )
 #endif /* HAS_V70 */
 
 #endif /* __V60_H__ */
diff --git a/src/emu/cpu/v810/v810.h b/src/emu/cpu/v810/v810.h
index 2c33ab97806..b86e7589c1e 100644
--- a/src/emu/cpu/v810/v810.h
+++ b/src/emu/cpu/v810/v810.h
@@ -5,7 +5,8 @@
 
 #include "cpuintrf.h"
 
-void v810_get_info(UINT32, cpuinfo*);
+CPU_GET_INFO( v810 );
+#define CPU_V810 CPU_GET_INFO_NAME( v810 )
 
 CPU_DISASSEMBLE( v810 );
 
diff --git a/src/emu/cpu/z180/z180.h b/src/emu/cpu/z180/z180.h
index ad6b7a8dc4d..fafac8356b5 100644
--- a/src/emu/cpu/z180/z180.h
+++ b/src/emu/cpu/z180/z180.h
@@ -129,6 +129,7 @@ extern UINT8 z180_readmem(const device_config *device, offs_t offset);
 extern void z180_writemem(const device_config *device, offs_t offset, UINT8 data);
 
 extern CPU_GET_INFO( z180 );
+#define CPU_Z180 CPU_GET_INFO_NAME( z180 )
 
 CPU_DISASSEMBLE( z180 );
 
diff --git a/src/emu/cpu/z80/z80.h b/src/emu/cpu/z80/z80.h
index 4bb881e2355..e07983ab0ec 100644
--- a/src/emu/cpu/z80/z80.h
+++ b/src/emu/cpu/z80/z80.h
@@ -32,6 +32,7 @@ enum
 };
 
 extern CPU_GET_INFO( z80 );
+#define CPU_Z80 CPU_GET_INFO_NAME( z80 )
 
 extern CPU_DISASSEMBLE( z80 );
 
diff --git a/src/emu/cpu/z8000/z8000.h b/src/emu/cpu/z8000/z8000.h
index ea3ca3433ae..a9dc99e7426 100644
--- a/src/emu/cpu/z8000/z8000.h
+++ b/src/emu/cpu/z8000/z8000.h
@@ -26,6 +26,7 @@ enum
 
 /* PUBLIC FUNCTIONS */
 extern CPU_GET_INFO( z8000 );
+#define CPU_Z8000 CPU_GET_INFO_NAME( z8000 )
 
 CPU_DISASSEMBLE( z8000 );
 
diff --git a/src/emu/cpuintrf.h b/src/emu/cpuintrf.h
index 36d05f2ca88..3b6396f2fde 100644
--- a/src/emu/cpuintrf.h
+++ b/src/emu/cpuintrf.h
@@ -408,457 +408,8 @@ struct _cpu_class_header
 #define cpu_next(previous)		device_list_next((previous), CPU)
 
 
-
-/* eventually all drivers should include the CPU core's header, which should define these */
 CPU_GET_INFO( dummy );
 #define CPU_DUMMY CPU_GET_INFO_NAME( dummy )
-CPU_GET_INFO( z80 );
-#define CPU_Z80 CPU_GET_INFO_NAME( z80 )
-CPU_GET_INFO( z180 );
-#define CPU_Z180 CPU_GET_INFO_NAME( z180 )
-CPU_GET_INFO( i8080 );
-#define CPU_8080 CPU_GET_INFO_NAME( i8080 )
-CPU_GET_INFO( i8085 );
-#define CPU_8085A CPU_GET_INFO_NAME( i8085 )
-CPU_GET_INFO( m6502 );
-#define CPU_M6502 CPU_GET_INFO_NAME( m6502 )
-CPU_GET_INFO( m65c02 );
-#define CPU_M65C02 CPU_GET_INFO_NAME( m65c02 )
-CPU_GET_INFO( m65sc02 );
-#define CPU_M65SC02 CPU_GET_INFO_NAME( m65sc02 )
-CPU_GET_INFO( m65ce02 );
-#define CPU_M65CE02 CPU_GET_INFO_NAME( m65ce02 )
-CPU_GET_INFO( m6509 );
-#define CPU_M6509 CPU_GET_INFO_NAME( m6509 )
-CPU_GET_INFO( m6510 );
-#define CPU_M6510 CPU_GET_INFO_NAME( m6510 )
-CPU_GET_INFO( m6510t );
-#define CPU_M6510T CPU_GET_INFO_NAME( m6510t )
-CPU_GET_INFO( m7501 );
-#define CPU_M7501 CPU_GET_INFO_NAME( m7501 )
-CPU_GET_INFO( m8502 );
-#define CPU_M8502 CPU_GET_INFO_NAME( m8502 )
-CPU_GET_INFO( n2a03 );
-#define CPU_N2A03 CPU_GET_INFO_NAME( n2a03 )
-CPU_GET_INFO( deco16 );
-#define CPU_DECO16 CPU_GET_INFO_NAME( deco16 )
-CPU_GET_INFO( m4510 );
-#define CPU_M4510 CPU_GET_INFO_NAME( m4510 )
-CPU_GET_INFO( h6280 );
-#define CPU_H6280 CPU_GET_INFO_NAME( h6280 )
-CPU_GET_INFO( i8086 );
-#define CPU_I8086 CPU_GET_INFO_NAME( i8086 )
-CPU_GET_INFO( i8088 );
-#define CPU_I8088 CPU_GET_INFO_NAME( i8088 )
-CPU_GET_INFO( i80186 );
-#define CPU_I80186 CPU_GET_INFO_NAME( i80186 )
-CPU_GET_INFO( i80188 );
-#define CPU_I80188 CPU_GET_INFO_NAME( i80188 )
-CPU_GET_INFO( i80286 );
-#define CPU_I80286 CPU_GET_INFO_NAME( i80286 )
-CPU_GET_INFO( v20 );
-#define CPU_V20 CPU_GET_INFO_NAME( v20 )
-CPU_GET_INFO( v25 );
-#define CPU_V25 CPU_GET_INFO_NAME( v25 )
-CPU_GET_INFO( v30 );
-#define CPU_V30 CPU_GET_INFO_NAME( v30 )
-CPU_GET_INFO( v33 );
-#define CPU_V33 CPU_GET_INFO_NAME( v33 )
-CPU_GET_INFO( v35 );
-#define CPU_V35 CPU_GET_INFO_NAME( v35 )
-CPU_GET_INFO( v60 );
-#define CPU_V60 CPU_GET_INFO_NAME( v60 )
-CPU_GET_INFO( v70 );
-#define CPU_V70 CPU_GET_INFO_NAME( v70 )
-CPU_GET_INFO( i8035 );
-#define CPU_I8035 CPU_GET_INFO_NAME( i8035 )
-CPU_GET_INFO( i8048 );
-#define CPU_I8048 CPU_GET_INFO_NAME( i8048 )
-CPU_GET_INFO( i8648 );
-#define CPU_I8648 CPU_GET_INFO_NAME( i8648 )
-CPU_GET_INFO( i8748 );
-#define CPU_I8748 CPU_GET_INFO_NAME( i8748 )
-CPU_GET_INFO( mb8884 );
-#define CPU_MB8884 CPU_GET_INFO_NAME( mb8884 )
-CPU_GET_INFO( n7751 );
-#define CPU_N7751 CPU_GET_INFO_NAME( n7751 )
-CPU_GET_INFO( i8039 );
-#define CPU_I8039 CPU_GET_INFO_NAME( i8039 )
-CPU_GET_INFO( i8049 );
-#define CPU_I8049 CPU_GET_INFO_NAME( i8049 )
-CPU_GET_INFO( i8749 );
-#define CPU_I8749 CPU_GET_INFO_NAME( i8749 )
-CPU_GET_INFO( m58715 );
-#define CPU_M58715 CPU_GET_INFO_NAME( m58715 )
-CPU_GET_INFO( i8041 );
-#define CPU_I8041 CPU_GET_INFO_NAME( i8041 )
-CPU_GET_INFO( i8741 );
-#define CPU_I8741 CPU_GET_INFO_NAME( i8741 )
-CPU_GET_INFO( i8042 );
-#define CPU_I8042 CPU_GET_INFO_NAME( i8042 )
-CPU_GET_INFO( i8242 );
-#define CPU_I8242 CPU_GET_INFO_NAME( i8242 )
-CPU_GET_INFO( i8742 );
-#define CPU_I8742 CPU_GET_INFO_NAME( i8742 )
-CPU_GET_INFO( i8031 );
-#define CPU_I8031 CPU_GET_INFO_NAME( i8031 )
-CPU_GET_INFO( i8032 );
-#define CPU_I8032 CPU_GET_INFO_NAME( i8032 )
-CPU_GET_INFO( i8051 );
-#define CPU_I8051 CPU_GET_INFO_NAME( i8051 )
-CPU_GET_INFO( i8052 );
-#define CPU_I8052 CPU_GET_INFO_NAME( i8052 )
-CPU_GET_INFO( i8751 );
-#define CPU_I8751 CPU_GET_INFO_NAME( i8751 )
-CPU_GET_INFO( i8752 );
-#define CPU_I8752 CPU_GET_INFO_NAME( i8752 )
-CPU_GET_INFO( i80c31 );
-#define CPU_I80C31 CPU_GET_INFO_NAME( i80c31 )
-CPU_GET_INFO( i80c32 );
-#define CPU_I80C32 CPU_GET_INFO_NAME( i80c32 )
-CPU_GET_INFO( i80c51 );
-#define CPU_I80C51 CPU_GET_INFO_NAME( i80c51 )
-CPU_GET_INFO( i80c52 );
-#define CPU_I80C52 CPU_GET_INFO_NAME( i80c52 )
-CPU_GET_INFO( i87c51 );
-#define CPU_I87C51 CPU_GET_INFO_NAME( i87c51 )
-CPU_GET_INFO( i87c52 );
-#define CPU_I87C52 CPU_GET_INFO_NAME( i87c52 )
-CPU_GET_INFO( at89c4051 );
-#define CPU_AT89C4051 CPU_GET_INFO_NAME( at89c4051 )
-CPU_GET_INFO( ds5002fp );
-#define CPU_DS5002FP CPU_GET_INFO_NAME( ds5002fp )
-CPU_GET_INFO( m6800 );
-#define CPU_M6800 CPU_GET_INFO_NAME( m6800 )
-CPU_GET_INFO( m6801 );
-#define CPU_M6801 CPU_GET_INFO_NAME( m6801 )
-CPU_GET_INFO( m6802 );
-#define CPU_M6802 CPU_GET_INFO_NAME( m6802 )
-CPU_GET_INFO( m6803 );
-#define CPU_M6803 CPU_GET_INFO_NAME( m6803 )
-CPU_GET_INFO( m6808 );
-#define CPU_M6808 CPU_GET_INFO_NAME( m6808 )
-CPU_GET_INFO( hd63701 );
-#define CPU_HD63701 CPU_GET_INFO_NAME( hd63701 )
-CPU_GET_INFO( nsc8105 );
-#define CPU_NSC8105 CPU_GET_INFO_NAME( nsc8105 )
-CPU_GET_INFO( m6805 );
-#define CPU_M6805 CPU_GET_INFO_NAME( m6805 )
-CPU_GET_INFO( m68705 );
-#define CPU_M68705 CPU_GET_INFO_NAME( m68705 )
-CPU_GET_INFO( hd63705 );
-#define CPU_HD63705 CPU_GET_INFO_NAME( hd63705 )
-CPU_GET_INFO( hd6309 );
-#define CPU_HD6309 CPU_GET_INFO_NAME( hd6309 )
-CPU_GET_INFO( m6809 );
-#define CPU_M6809 CPU_GET_INFO_NAME( m6809 )
-CPU_GET_INFO( m6809e );
-#define CPU_M6809E CPU_GET_INFO_NAME( m6809e )
-CPU_GET_INFO( konami );
-#define CPU_KONAMI CPU_GET_INFO_NAME( konami )
-CPU_GET_INFO( m68000 );
-#define CPU_M68000 CPU_GET_INFO_NAME( m68000 )
-CPU_GET_INFO( m68008 );
-#define CPU_M68008 CPU_GET_INFO_NAME( m68008 )
-CPU_GET_INFO( m68010 );
-#define CPU_M68010 CPU_GET_INFO_NAME( m68010 )
-CPU_GET_INFO( m68ec020 );
-#define CPU_M68EC020 CPU_GET_INFO_NAME( m68ec020 )
-CPU_GET_INFO( m68020 );
-#define CPU_M68020 CPU_GET_INFO_NAME( m68020 )
-CPU_GET_INFO( m68040 );
-#define CPU_M68040 CPU_GET_INFO_NAME( m68040 )
-CPU_GET_INFO( t11 );
-#define CPU_T11 CPU_GET_INFO_NAME( t11 )
-CPU_GET_INFO( s2650 );
-#define CPU_S2650 CPU_GET_INFO_NAME( s2650 )
-CPU_GET_INFO( tms34010 );
-#define CPU_TMS34010 CPU_GET_INFO_NAME( tms34010 )
-CPU_GET_INFO( tms34020 );
-#define CPU_TMS34020 CPU_GET_INFO_NAME( tms34020 )
-CPU_GET_INFO( ti990_10 );
-#define CPU_TI990_10 CPU_GET_INFO_NAME( ti990_10 )
-CPU_GET_INFO( tms9900 );
-#define CPU_TMS9900 CPU_GET_INFO_NAME( tms9900 )
-CPU_GET_INFO( tms9980a );
-#define CPU_TMS9980 CPU_GET_INFO_NAME( tms9980a )
-CPU_GET_INFO( tms9995 );
-#define CPU_TMS9995 CPU_GET_INFO_NAME( tms9995 )
-CPU_GET_INFO( z8000 );
-#define CPU_Z8000 CPU_GET_INFO_NAME( z8000 )
-CPU_GET_INFO( tms32010 );
-#define CPU_TMS32010 CPU_GET_INFO_NAME( tms32010 )
-CPU_GET_INFO( tms32025 );
-#define CPU_TMS32025 CPU_GET_INFO_NAME( tms32025 )
-CPU_GET_INFO( tms32026 );
-#define CPU_TMS32026 CPU_GET_INFO_NAME( tms32026 )
-CPU_GET_INFO( tms32031 );
-#define CPU_TMS32031 CPU_GET_INFO_NAME( tms32031 )
-CPU_GET_INFO( tms32032 );
-#define CPU_TMS32032 CPU_GET_INFO_NAME( tms32032 )
-CPU_GET_INFO( tms32051 );
-#define CPU_TMS32051 CPU_GET_INFO_NAME( tms32051 )
-CPU_GET_INFO( ccpu );
-#define CPU_CCPU CPU_GET_INFO_NAME( ccpu )
-CPU_GET_INFO( adsp2100 );
-#define CPU_ADSP2100 CPU_GET_INFO_NAME( adsp2100 )
- CPU_GET_INFO( adsp2101 );
-#define CPU_ADSP2101 CPU_GET_INFO_NAME( adsp2101 )
-CPU_GET_INFO( adsp2104 );
-#define CPU_ADSP2104 CPU_GET_INFO_NAME( adsp2104 )
-CPU_GET_INFO( adsp2105 );
-#define CPU_ADSP2105 CPU_GET_INFO_NAME( adsp2105 )
-CPU_GET_INFO( adsp2115 );
-#define CPU_ADSP2115 CPU_GET_INFO_NAME( adsp2115 )
-CPU_GET_INFO( adsp2181 );
-#define CPU_ADSP2181 CPU_GET_INFO_NAME( adsp2181 )
-CPU_GET_INFO( psxcpu );
-#define CPU_PSXCPU CPU_GET_INFO_NAME( psxcpu )
-CPU_GET_INFO( asap );
-#define CPU_ASAP CPU_GET_INFO_NAME( asap )
-CPU_GET_INFO( upd7810 );
-#define CPU_UPD7810 CPU_GET_INFO_NAME( upd7810 )
-CPU_GET_INFO( upd7807 );
-#define CPU_UPD7807 CPU_GET_INFO_NAME( upd7807 )
-CPU_GET_INFO( upd7801 );
-#define CPU_UPD7801 CPU_GET_INFO_NAME( upd7801 )
-CPU_GET_INFO( upd78C05 );
-#define CPU_UPD78C05 CPU_GET_INFO_NAME( upd78C05 )
-CPU_GET_INFO( upd78C06 );
-#define CPU_UPD78C06 CPU_GET_INFO_NAME( upd78C06 )
-CPU_GET_INFO( jaguargpu );
-#define CPU_JAGUARGPU CPU_GET_INFO_NAME( jaguargpu )
-CPU_GET_INFO( jaguardsp );
-#define CPU_JAGUARDSP CPU_GET_INFO_NAME( jaguardsp )
-CPU_GET_INFO( cquestsnd );
-#define CPU_CQUESTSND CPU_GET_INFO_NAME( cquestsnd )
-CPU_GET_INFO( cquestrot );
-#define CPU_CQUESTROT CPU_GET_INFO_NAME( cquestrot )
-CPU_GET_INFO( cquestlin );
-#define CPU_CQUESTLIN CPU_GET_INFO_NAME( cquestlin )
-CPU_GET_INFO( r3000be );
-#define CPU_R3000BE CPU_GET_INFO_NAME( r3000be )
-CPU_GET_INFO( r3000le );
-#define CPU_R3000LE CPU_GET_INFO_NAME( r3000le )
-CPU_GET_INFO( r3041be );
-#define CPU_R3041BE CPU_GET_INFO_NAME( r3041be )
-CPU_GET_INFO( r3041le );
-#define CPU_R3041LE CPU_GET_INFO_NAME( r3041le )
-CPU_GET_INFO( r4600be );
-#define CPU_R4600BE CPU_GET_INFO_NAME( r4600be )
-CPU_GET_INFO( r4600le );
-#define CPU_R4600LE CPU_GET_INFO_NAME( r4600le )
-CPU_GET_INFO( r4650be );
-#define CPU_R4650BE CPU_GET_INFO_NAME( r4650be )
-CPU_GET_INFO( r4650le );
-#define CPU_R4650LE CPU_GET_INFO_NAME( r4650le )
-CPU_GET_INFO( r4700be );
-#define CPU_R4700BE CPU_GET_INFO_NAME( r4700be )
-CPU_GET_INFO( r4700le );
-#define CPU_R4700LE CPU_GET_INFO_NAME( r4700le )
-CPU_GET_INFO( r5000be );
-#define CPU_R5000BE CPU_GET_INFO_NAME( r5000be )
-CPU_GET_INFO( r5000le );
-#define CPU_R5000LE CPU_GET_INFO_NAME( r5000le )
-CPU_GET_INFO( qed5271be );
-#define CPU_QED5271BE CPU_GET_INFO_NAME( qed5271be )
-CPU_GET_INFO( qed5271le );
-#define CPU_QED5271LE CPU_GET_INFO_NAME( qed5271le )
-CPU_GET_INFO( rm7000be );
-#define CPU_RM7000BE CPU_GET_INFO_NAME( rm7000be )
-CPU_GET_INFO( rm7000le );
-#define CPU_RM7000LE CPU_GET_INFO_NAME( rm7000le )
-CPU_GET_INFO( arm );
-#define CPU_ARM CPU_GET_INFO_NAME( arm )
-CPU_GET_INFO( arm7 );
-#define CPU_ARM7 CPU_GET_INFO_NAME( arm7 )
-CPU_GET_INFO( sh1 );
-#define CPU_SH1 CPU_GET_INFO_NAME( sh1 )
-CPU_GET_INFO( sh2 );
-#define CPU_SH2 CPU_GET_INFO_NAME( sh2 )
-CPU_GET_INFO( sh4 );
-#define CPU_SH4 CPU_GET_INFO_NAME( sh4 )
-CPU_GET_INFO( dsp32c );
-#define CPU_DSP32C CPU_GET_INFO_NAME( dsp32c )
-CPU_GET_INFO( pic16c54 );
-#define CPU_PIC16C54 CPU_GET_INFO_NAME( pic16c54 )
-CPU_GET_INFO( pic16c55 );
-#define CPU_PIC16C55 CPU_GET_INFO_NAME( pic16c55 )
-CPU_GET_INFO( pic16c56 );
-#define CPU_PIC16C56 CPU_GET_INFO_NAME( pic16c56 )
-CPU_GET_INFO( pic16c57 );
-#define CPU_PIC16C57 CPU_GET_INFO_NAME( pic16c57 )
-CPU_GET_INFO( pic16c58 );
-#define CPU_PIC16C58 CPU_GET_INFO_NAME( pic16c58 )
-CPU_GET_INFO( g65816 );
-#define CPU_G65816 CPU_GET_INFO_NAME( g65816 )
-CPU_GET_INFO( spc700 );
-#define CPU_SPC700 CPU_GET_INFO_NAME( spc700 )
-CPU_GET_INFO( e116t );
-#define CPU_E116T CPU_GET_INFO_NAME( e116t )
-CPU_GET_INFO( e116xt );
-#define CPU_E116XT CPU_GET_INFO_NAME( e116xt )
-CPU_GET_INFO( e116xs );
-#define CPU_E116XS CPU_GET_INFO_NAME( e116xs )
-CPU_GET_INFO( e116xsr );
-#define CPU_E116XSR CPU_GET_INFO_NAME( e116xsr )
-CPU_GET_INFO( e132n );
-#define CPU_E132N CPU_GET_INFO_NAME( e132n )
-CPU_GET_INFO( e132t );
-#define CPU_E132T CPU_GET_INFO_NAME( e132t )
-CPU_GET_INFO( e132xn );
-#define CPU_E132XN CPU_GET_INFO_NAME( e132xn )
-CPU_GET_INFO( e132xt );
-#define CPU_E132XT CPU_GET_INFO_NAME( e132xt )
-CPU_GET_INFO( e132xs );
-#define CPU_E132XS CPU_GET_INFO_NAME( e132xs )
-CPU_GET_INFO( e132xsr );
-#define CPU_E132XSR CPU_GET_INFO_NAME( e132xsr )
-CPU_GET_INFO( gms30c2116 );
-#define CPU_GMS30C2116 CPU_GET_INFO_NAME( gms30c2116 )
-CPU_GET_INFO( gms30c2132 );
-#define CPU_GMS30C2132 CPU_GET_INFO_NAME( gms30c2132 )
-CPU_GET_INFO( gms30c2216 );
-#define CPU_GMS30C2216 CPU_GET_INFO_NAME( gms30c2216 )
-CPU_GET_INFO( gms30c2232 );
-#define CPU_GMS30C2232 CPU_GET_INFO_NAME( gms30c2232 )
-CPU_GET_INFO( i386 );
-#define CPU_I386 CPU_GET_INFO_NAME( i386 )
-CPU_GET_INFO( i486 );
-#define CPU_I486 CPU_GET_INFO_NAME( i486 )
-CPU_GET_INFO( pentium );
-#define CPU_PENTIUM CPU_GET_INFO_NAME( pentium )
-CPU_GET_INFO( mediagx );
-#define CPU_MEDIAGX CPU_GET_INFO_NAME( mediagx )
-CPU_GET_INFO( i960 );
-#define CPU_I960 CPU_GET_INFO_NAME( i960 )
-CPU_GET_INFO( h8_3002 );
-#define CPU_H83002 CPU_GET_INFO_NAME( h8_3002 )
-CPU_GET_INFO( h8_3007 );
-#define CPU_H83007 CPU_GET_INFO_NAME( h8_3007 )
-CPU_GET_INFO( h8_3044 );
-#define CPU_H83044 CPU_GET_INFO_NAME( h8_3044 )
-CPU_GET_INFO( h8_3334 );
-#define CPU_H83334 CPU_GET_INFO_NAME( h8_3334 )
-CPU_GET_INFO( v810 );
-#define CPU_V810 CPU_GET_INFO_NAME( v810 )
-CPU_GET_INFO( m37702 );
-#define CPU_M37702 CPU_GET_INFO_NAME( m37702 )
-CPU_GET_INFO( m37710 );
-#define CPU_M37710 CPU_GET_INFO_NAME( m37710 )
-CPU_GET_INFO( ppc403ga );
-#define CPU_PPC403GA CPU_GET_INFO_NAME( ppc403ga )
-CPU_GET_INFO( ppc403gcx );
-#define CPU_PPC403GCX CPU_GET_INFO_NAME( ppc403gcx )
-CPU_GET_INFO( ppc601 );
-#define CPU_PPC601 CPU_GET_INFO_NAME( ppc601 )
-CPU_GET_INFO( ppc602 );
-#define CPU_PPC602 CPU_GET_INFO_NAME( ppc602 )
-CPU_GET_INFO( ppc603 );
-#define CPU_PPC603 CPU_GET_INFO_NAME( ppc603 )
-CPU_GET_INFO( ppc603e );
-#define CPU_PPC603E CPU_GET_INFO_NAME( ppc603e )
-CPU_GET_INFO( ppc603r );
-#define CPU_PPC603R CPU_GET_INFO_NAME( ppc603r )
-CPU_GET_INFO( ppc604 );
-#define CPU_PPC604 CPU_GET_INFO_NAME( ppc604 )
-CPU_GET_INFO( mpc8240 );
-#define CPU_MPC8240 CPU_GET_INFO_NAME( mpc8240 )
-CPU_GET_INFO( se3208 );
-#define CPU_SE3208 CPU_GET_INFO_NAME( se3208 )
-CPU_GET_INFO( mc68hc11 );
-#define CPU_MC68HC11 CPU_GET_INFO_NAME( mc68hc11 )
-CPU_GET_INFO( adsp21062 );
-#define CPU_ADSP21062 CPU_GET_INFO_NAME( adsp21062 )
-CPU_GET_INFO( dsp56k );
-#define CPU_DSP56156 CPU_GET_INFO_NAME( dsp56k )
-CPU_GET_INFO( rsp );
-#define CPU_RSP CPU_GET_INFO_NAME( rsp )
-CPU_GET_INFO( alpha8201 );
-#define CPU_ALPHA8201 CPU_GET_INFO_NAME( alpha8201 )
-CPU_GET_INFO( alpha8301 );
-#define CPU_ALPHA8301 CPU_GET_INFO_NAME( alpha8301 )
-CPU_GET_INFO( cdp1802 );
-#define CPU_CDP1802 CPU_GET_INFO_NAME( cdp1802 )
-CPU_GET_INFO( cop401 );
-#define CPU_COP401 CPU_GET_INFO_NAME( cop401 )
-CPU_GET_INFO( cop410 );
-#define CPU_COP410 CPU_GET_INFO_NAME( cop410 )
-CPU_GET_INFO( cop411 );
-#define CPU_COP411 CPU_GET_INFO_NAME( cop411 )
-CPU_GET_INFO( cop402 );
-#define CPU_COP402 CPU_GET_INFO_NAME( cop402 )
-CPU_GET_INFO( cop420 );
-#define CPU_COP420 CPU_GET_INFO_NAME( cop420 )
-CPU_GET_INFO( cop421 );
-#define CPU_COP421 CPU_GET_INFO_NAME( cop421 )
-CPU_GET_INFO( cop422 );
-#define CPU_COP422 CPU_GET_INFO_NAME( cop422 )
-CPU_GET_INFO( cop404 );
-#define CPU_COP404 CPU_GET_INFO_NAME( cop404 )
-CPU_GET_INFO( cop424 );
-#define CPU_COP424 CPU_GET_INFO_NAME( cop424 )
-CPU_GET_INFO( cop425 );
-#define CPU_COP425 CPU_GET_INFO_NAME( cop425 )
-CPU_GET_INFO( cop426 );
-#define CPU_COP426 CPU_GET_INFO_NAME( cop426 )
-CPU_GET_INFO( cop444 );
-#define CPU_COP444 CPU_GET_INFO_NAME( cop444 )
-CPU_GET_INFO( cop445 );
-#define CPU_COP445 CPU_GET_INFO_NAME( cop445 )
-CPU_GET_INFO( tmp90840 );
-#define CPU_TMP90840 CPU_GET_INFO_NAME( tmp90840 )
-CPU_GET_INFO( tmp90841 );
-#define CPU_TMP90841 CPU_GET_INFO_NAME( tmp90841 )
-CPU_GET_INFO( tmp91640 );
-#define CPU_TMP91640 CPU_GET_INFO_NAME( tmp91640 )
-CPU_GET_INFO( tmp91641 );
-#define CPU_TMP91641 CPU_GET_INFO_NAME( tmp91641 )
-CPU_GET_INFO( apexc );
-#define CPU_APEXC CPU_GET_INFO_NAME( apexc )
-CPU_GET_INFO( cp1610 );
-#define CPU_CP1610 CPU_GET_INFO_NAME( cp1610 )
-CPU_GET_INFO( f8 );
-#define CPU_F8 CPU_GET_INFO_NAME( f8 )
-CPU_GET_INFO( lh5801 );
-#define CPU_LH5801 CPU_GET_INFO_NAME( lh5801 )
-CPU_GET_INFO( pdp1 );
-#define CPU_PDP1 CPU_GET_INFO_NAME( pdp1 )
-CPU_GET_INFO( saturn );
-#define CPU_SATURN CPU_GET_INFO_NAME( saturn )
-CPU_GET_INFO( sc61860 );
-#define CPU_SC61860 CPU_GET_INFO_NAME( sc61860 )
-CPU_GET_INFO( tx0_64kw );
-#define CPU_TX0_64KW CPU_GET_INFO_NAME( tx0_64kw )
-CPU_GET_INFO( tx0_8kw );
-#define CPU_TX0_8KW CPU_GET_INFO_NAME( tx0_8kw )
-CPU_GET_INFO( lrR35902 );
-#define CPU_LR35902 CPU_GET_INFO_NAME( lr35902 )
-CPU_GET_INFO( tms7000 );
-#define CPU_TMS7000 CPU_GET_INFO_NAME( tms7000 )
-CPU_GET_INFO( tms7000_EXL );
-#define CPU_TMS7000_EXL CPU_GET_INFO_NAME( tms7000_EXL )
-CPU_GET_INFO( SM8500 );
-#define CPU_sm8500 CPU_GET_INFO_NAME( sm8500 )
-CPU_GET_INFO( v30mz );
-#define CPU_V30MZ CPU_GET_INFO_NAME( v30mz )
-CPU_GET_INFO( mb8841 );
-#define CPU_MB8841 CPU_GET_INFO_NAME( mb8841 )
-CPU_GET_INFO( mb8842 );
-#define CPU_MB8842 CPU_GET_INFO_NAME( mb8842 )
-CPU_GET_INFO( mb8843 );
-#define CPU_MB8843 CPU_GET_INFO_NAME( mb8843 )
-CPU_GET_INFO( mb8844 );
-#define CPU_MB8844 CPU_GET_INFO_NAME( mb8844 )
-CPU_GET_INFO( mb86233 );
-#define CPU_MB86233 CPU_GET_INFO_NAME( mb86233 )
-CPU_GET_INFO( ssp1601 );
-#define CPU_SSP1601 CPU_GET_INFO_NAME( ssp1601 )
-CPU_GET_INFO( minx );
-#define CPU_MINX CPU_GET_INFO_NAME( minx )
-CPU_GET_INFO( cxd8661r );
-#define CPU_CXD8661R CPU_GET_INFO_NAME( cxd8661r )
-
 
 
 /***************************************************************************
diff --git a/src/emu/machine/ldv1000.c b/src/emu/machine/ldv1000.c
index ceeea0ff6cb..a6dc651994c 100644
--- a/src/emu/machine/ldv1000.c
+++ b/src/emu/machine/ldv1000.c
@@ -19,6 +19,7 @@
 #include "ldcore.h"
 #include "machine/8255ppi.h"
 #include "machine/z80ctc.h"
+#include "cpu/z80/z80.h"
 #include "cpu/z80/z80daisy.h"
 
 
diff --git a/src/mame/audio/cinemat.c b/src/mame/audio/cinemat.c
index 638acacf08d..1fae5d2da6a 100644
--- a/src/mame/audio/cinemat.c
+++ b/src/mame/audio/cinemat.c
@@ -17,6 +17,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "deprecat.h"
 #include "cpu/ccpu/ccpu.h"
 #include "cpu/z80/z80daisy.h"
diff --git a/src/mame/audio/exidy.c b/src/mame/audio/exidy.c
index be5b8b9421c..753dcd94d49 100644
--- a/src/mame/audio/exidy.c
+++ b/src/mame/audio/exidy.c
@@ -5,6 +5,7 @@
 *************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "machine/rescap.h"
 #include "streams.h"
 #include "cpu/m6502/m6502.h"
diff --git a/src/mame/audio/exidy440.c b/src/mame/audio/exidy440.c
index fecf1d54bbc..f7ff013fd03 100644
--- a/src/mame/audio/exidy440.c
+++ b/src/mame/audio/exidy440.c
@@ -8,6 +8,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/m6809/m6809.h"
 #include "streams.h"
 #include "exidy440.h"
 
diff --git a/src/mame/audio/mario.c b/src/mame/audio/mario.c
index 62a6b66b31c..f010f249272 100644
--- a/src/mame/audio/mario.c
+++ b/src/mame/audio/mario.c
@@ -1,4 +1,5 @@
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "cpu/mcs48/mcs48.h"
 #include "sound/dac.h"
 #include "sound/ay8910.h"
diff --git a/src/mame/audio/mcr.c b/src/mame/audio/mcr.c
index 2c6c56db25b..bc05c419708 100644
--- a/src/mame/audio/mcr.c
+++ b/src/mame/audio/mcr.c
@@ -7,6 +7,8 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
+#include "cpu/m68000/m68000.h"
 #include "deprecat.h"
 #include "audio/mcr.h"
 #include "audio/williams.h"
diff --git a/src/mame/audio/namcoc7x.c b/src/mame/audio/namcoc7x.c
index 41f00ba882c..4c36e3e7b8a 100644
--- a/src/mame/audio/namcoc7x.c
+++ b/src/mame/audio/namcoc7x.c
@@ -27,6 +27,7 @@
 */
 
 #include "driver.h"
+#include "cpu/m37710/m37710.h"
 #include "deprecat.h"
 #include "audio/namcoc7x.h"
 
diff --git a/src/mame/audio/qix.c b/src/mame/audio/qix.c
index 6daf0c2d3c1..c57a9a9820f 100644
--- a/src/mame/audio/qix.c
+++ b/src/mame/audio/qix.c
@@ -4,6 +4,7 @@
 
 *************************************************************************/
 #include "driver.h"
+#include "cpu/m6800/m6800.h"
 #include "qix.h"
 #include "machine/6821pia.h"
 #include "sound/sn76496.h"
diff --git a/src/mame/audio/redalert.c b/src/mame/audio/redalert.c
index 4fe8e9ba6e6..fb555f4c3d9 100644
--- a/src/mame/audio/redalert.c
+++ b/src/mame/audio/redalert.c
@@ -8,6 +8,8 @@
 ****************************************************************************/
 
 #include "driver.h"
+#include "cpu/m6800/m6800.h"
+#include "cpu/m6502/m6502.h"
 #include "machine/rescap.h"
 #include "cpu/i8085/i8085.h"
 #include "machine/6821pia.h"
diff --git a/src/mame/audio/seibu.h b/src/mame/audio/seibu.h
index 56591bf6f40..a2ccceaecc2 100644
--- a/src/mame/audio/seibu.h
+++ b/src/mame/audio/seibu.h
@@ -23,6 +23,7 @@
 
 ***************************************************************************/
 
+#include "cpu/z80/z80.h"
 #include "sound/3812intf.h"
 #include "sound/2151intf.h"
 #include "sound/2203intf.h"
diff --git a/src/mame/audio/taito_en.h b/src/mame/audio/taito_en.h
index cad837692e1..4abad770e08 100644
--- a/src/mame/audio/taito_en.h
+++ b/src/mame/audio/taito_en.h
@@ -1,3 +1,4 @@
+#include "cpu/m68000/m68000.h"
 #include "sound/es5506.h"
 
 READ16_HANDLER(f3_68000_share_r);
diff --git a/src/mame/audio/timeplt.c b/src/mame/audio/timeplt.c
index 7d66bdf06a7..6a0bd9f13f2 100644
--- a/src/mame/audio/timeplt.c
+++ b/src/mame/audio/timeplt.c
@@ -11,6 +11,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "sound/ay8910.h"
 #include "sound/flt_rc.h"
 #include "timeplt.h"
diff --git a/src/mame/drivers/1942.c b/src/mame/drivers/1942.c
index b8ce906b2da..6cce86778d4 100644
--- a/src/mame/drivers/1942.c
+++ b/src/mame/drivers/1942.c
@@ -77,6 +77,7 @@ There are no static local variables.
 #define AUDIO_CLOCK		(XTAL_12MHz/8) /* 12MHz is the only OSC on the PCB */
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "deprecat.h"
 #include "sound/ay8910.h"
 
diff --git a/src/mame/drivers/1945kiii.c b/src/mame/drivers/1945kiii.c
index 0a013e16ff5..e81acfc5a04 100644
--- a/src/mame/drivers/1945kiii.c
+++ b/src/mame/drivers/1945kiii.c
@@ -54,6 +54,7 @@ There are no static local variables.
 */
 
 #include "driver.h"
+#include "cpu/m68000/m68000.h"
 #include "sound/okim6295.h"
 
 static UINT16* k3_spriteram_1;
diff --git a/src/mame/drivers/20pacgal.c b/src/mame/drivers/20pacgal.c
index 05f4546cb1f..915d66d49cc 100644
--- a/src/mame/drivers/20pacgal.c
+++ b/src/mame/drivers/20pacgal.c
@@ -36,6 +36,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z180/z180.h"
 #include "machine/eeprom.h"
 #include "sound/namco.h"
 #include "sound/dac.h"
diff --git a/src/mame/drivers/2mindril.c b/src/mame/drivers/2mindril.c
index 604348cf5f2..17c2dc6440b 100644
--- a/src/mame/drivers/2mindril.c
+++ b/src/mame/drivers/2mindril.c
@@ -53,6 +53,7 @@ DAC               -26.6860Mhz
 */
 
 #include "driver.h"
+#include "cpu/m68000/m68000.h"
 #include "sound/2610intf.h"
 
 static UINT16 *unkram;
diff --git a/src/mame/drivers/4roses.c b/src/mame/drivers/4roses.c
index b066dcc99f9..676457229cf 100644
--- a/src/mame/drivers/4roses.c
+++ b/src/mame/drivers/4roses.c
@@ -173,6 +173,7 @@
 #define MASTER_CLOCK	XTAL_16MHz
 
 #include "driver.h"
+#include "cpu/m6502/m6502.h"
 #include "video/mc6845.h"
 #include "sound/ay8910.h"
 
diff --git a/src/mame/drivers/8080bw.c b/src/mame/drivers/8080bw.c
index 0e66b10f8d0..5b567d4524a 100644
--- a/src/mame/drivers/8080bw.c
+++ b/src/mame/drivers/8080bw.c
@@ -87,6 +87,8 @@
 /****************************************************************************/
 
 #include "driver.h"
+#include "cpu/m6800/m6800.h"
+#include "cpu/i8085/i8085.h"
 #include "deprecat.h"
 #include "8080bw.h"
 #include "mw8080bw.h"
diff --git a/src/mame/drivers/ace.c b/src/mame/drivers/ace.c
index 9672fc67762..37eba099370 100644
--- a/src/mame/drivers/ace.c
+++ b/src/mame/drivers/ace.c
@@ -38,6 +38,7 @@ A1                   2101            2101
 ****************************************************************************/
 
 #include "driver.h"
+#include "cpu/i8085/i8085.h"
 
 #define MASTER_CLOCK XTAL_18MHz
 
diff --git a/src/mame/drivers/acommand.c b/src/mame/drivers/acommand.c
index 390e3dc8f4b..3929283cfd9 100644
--- a/src/mame/drivers/acommand.c
+++ b/src/mame/drivers/acommand.c
@@ -56,6 +56,7 @@ JALCF1   BIN     1,048,576  02-07-99  1:11a JALCF1.BIN
 *******************************************************************************************/
 
 #include "driver.h"
+#include "cpu/m68000/m68000.h"
 #include "deprecat.h"
 #include "sound/okim6295.h"
 
diff --git a/src/mame/drivers/adp.c b/src/mame/drivers/adp.c
index 51942bd1b96..440e20a8510 100644
--- a/src/mame/drivers/adp.c
+++ b/src/mame/drivers/adp.c
@@ -144,6 +144,7 @@ Video board has additional chips:
 */
 
 #include "driver.h"
+#include "cpu/m68000/m68000.h"
 #include "sound/ay8910.h"
 #include "video/hd63484.h"
 #include "machine/microtch.h"
diff --git a/src/mame/drivers/aeroboto.c b/src/mame/drivers/aeroboto.c
index c7d20dfc715..04ac97ff8fd 100644
--- a/src/mame/drivers/aeroboto.c
+++ b/src/mame/drivers/aeroboto.c
@@ -23,6 +23,7 @@ Revisions:
 ****************************************************************************/
 
 #include "driver.h"
+#include "cpu/m6809/m6809.h"
 #include "sound/ay8910.h"
 
 
diff --git a/src/mame/drivers/aerofgt.c b/src/mame/drivers/aerofgt.c
index 6c7a90fb7e3..de29bb3a251 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 "cpu/m68000/m68000.h"
 #include "cpu/z80/z80.h"
 #include "sound/2610intf.h"
 #include "sound/3812intf.h"
diff --git a/src/mame/drivers/ajax.c b/src/mame/drivers/ajax.c
index cdb43902578..2adbd2c7d34 100644
--- a/src/mame/drivers/ajax.c
+++ b/src/mame/drivers/ajax.c
@@ -11,6 +11,9 @@ TO DO:
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
+#include "cpu/m6809/m6809.h"
+#include "cpu/konami/konami.h"
 #include "video/konamiic.h"
 #include "sound/2151intf.h"
 #include "sound/k007232.h"
diff --git a/src/mame/drivers/aleck64.c b/src/mame/drivers/aleck64.c
index 334505d11ae..a59745919de 100644
--- a/src/mame/drivers/aleck64.c
+++ b/src/mame/drivers/aleck64.c
@@ -166,6 +166,7 @@ Notes:
 */
 
 #include "driver.h"
+#include "cpu/rsp/rsp.h"
 #include "cpu/mips/mips3.h"
 #include "streams.h"
 #include "sound/custom.h"
diff --git a/src/mame/drivers/alg.c b/src/mame/drivers/alg.c
index 904415f730d..097afd70039 100644
--- a/src/mame/drivers/alg.c
+++ b/src/mame/drivers/alg.c
@@ -21,6 +21,7 @@
 **************************************************************************************/
 
 #include "driver.h"
+#include "cpu/m68000/m68000.h"
 #include "render.h"
 #include "includes/amiga.h"
 #include "machine/laserdsc.h"
diff --git a/src/mame/drivers/aliens.c b/src/mame/drivers/aliens.c
index 6446941d337..2901da987e9 100644
--- a/src/mame/drivers/aliens.c
+++ b/src/mame/drivers/aliens.c
@@ -8,6 +8,7 @@ Preliminary driver by:
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.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 0ddea9c924e..2599f1a4264 100644
--- a/src/mame/drivers/alpha68k.c
+++ b/src/mame/drivers/alpha68k.c
@@ -183,6 +183,7 @@ DIP locations verified from manuals for:
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/m68000/m68000.h"
 #include "deprecat.h"
 #include "cpu/z80/z80.h"
 #include "sound/ay8910.h"
diff --git a/src/mame/drivers/ambush.c b/src/mame/drivers/ambush.c
index f20fb05bb52..24cfc79616e 100644
--- a/src/mame/drivers/ambush.c
+++ b/src/mame/drivers/ambush.c
@@ -34,6 +34,7 @@ TODO:
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "sound/ay8910.h"
 
 
diff --git a/src/mame/drivers/ampoker2.c b/src/mame/drivers/ampoker2.c
index d260fe4b3a2..17308e2e08b 100644
--- a/src/mame/drivers/ampoker2.c
+++ b/src/mame/drivers/ampoker2.c
@@ -356,6 +356,7 @@
 #define MASTER_CLOCK	XTAL_6MHz
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "sound/ay8910.h"
 #include "ampoker2.lh"
 #include "sigmapkr.lh"
diff --git a/src/mame/drivers/amspdwy.c b/src/mame/drivers/amspdwy.c
index dbce9b6c9de..23021292cd7 100644
--- a/src/mame/drivers/amspdwy.c
+++ b/src/mame/drivers/amspdwy.c
@@ -14,6 +14,7 @@ Sound:  YM2151
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "sound/2151intf.h"
 
 /* Variables & functions defined in video: */
diff --git a/src/mame/drivers/appoooh.c b/src/mame/drivers/appoooh.c
index b74768fc984..aff21cdbd84 100644
--- a/src/mame/drivers/appoooh.c
+++ b/src/mame/drivers/appoooh.c
@@ -48,6 +48,7 @@ Credits:
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "appoooh.h"
 #include "machine/segacrpt.h"
 #include "sound/msm5205.h"
diff --git a/src/mame/drivers/aquarium.c b/src/mame/drivers/aquarium.c
index 28fa2b13929..a9dd2f3a9c7 100644
--- a/src/mame/drivers/aquarium.c
+++ b/src/mame/drivers/aquarium.c
@@ -50,6 +50,8 @@ Stephh's notes (based on the game M68000 code and some tests) :
 
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
+#include "cpu/m68000/m68000.h"
 #include "sound/2151intf.h"
 #include "sound/okim6295.h"
 #include "includes/aquarium.h"
diff --git a/src/mame/drivers/arabian.c b/src/mame/drivers/arabian.c
index 93371c14828..85f64c0524c 100644
--- a/src/mame/drivers/arabian.c
+++ b/src/mame/drivers/arabian.c
@@ -67,6 +67,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "arabian.h"
 #include "sound/ay8910.h"
 
diff --git a/src/mame/drivers/arcadecl.c b/src/mame/drivers/arcadecl.c
index 3712b78ef58..ede4da6b78f 100644
--- a/src/mame/drivers/arcadecl.c
+++ b/src/mame/drivers/arcadecl.c
@@ -67,6 +67,7 @@
 
 
 #include "driver.h"
+#include "cpu/m68000/m68000.h"
 #include "machine/atarigen.h"
 #include "arcadecl.h"
 #include "sound/okim6295.h"
diff --git a/src/mame/drivers/arcadia.c b/src/mame/drivers/arcadia.c
index 534e82f4fc9..81d4a1c24b9 100644
--- a/src/mame/drivers/arcadia.c
+++ b/src/mame/drivers/arcadia.c
@@ -48,6 +48,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/m68000/m68000.h"
 #include "sound/custom.h"
 #include "includes/amiga.h"
 #include "machine/6526cia.h"
diff --git a/src/mame/drivers/argus.c b/src/mame/drivers/argus.c
index 5905259b5c7..29b299e08a0 100644
--- a/src/mame/drivers/argus.c
+++ b/src/mame/drivers/argus.c
@@ -87,6 +87,7 @@ Known issues :
 
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "deprecat.h"
 #include "sound/2203intf.h"
 #include "includes/argus.h"
diff --git a/src/mame/drivers/arkanoid.c b/src/mame/drivers/arkanoid.c
index a1247c7e545..2d6b6d55c9c 100644
--- a/src/mame/drivers/arkanoid.c
+++ b/src/mame/drivers/arkanoid.c
@@ -469,6 +469,7 @@ DIP locations verified for:
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "arkanoid.h"
 #include "sound/ay8910.h"
 #include "cpu/m6805/m6805.h"
diff --git a/src/mame/drivers/artmagic.c b/src/mame/drivers/artmagic.c
index 1a89ed86519..9e1b6ea044b 100644
--- a/src/mame/drivers/artmagic.c
+++ b/src/mame/drivers/artmagic.c
@@ -22,6 +22,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/m68000/m68000.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 5e5796a03eb..786de5502ad 100644
--- a/src/mame/drivers/ashnojoe.c
+++ b/src/mame/drivers/ashnojoe.c
@@ -73,6 +73,8 @@ Coin B is not used
 *************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
+#include "cpu/m68000/m68000.h"
 #include "sound/2203intf.h"
 #include "sound/msm5205.h"
 
diff --git a/src/mame/drivers/asterix.c b/src/mame/drivers/asterix.c
index 0c46f524862..5290638fd3f 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 "cpu/m68000/m68000.h"
 #include "video/konamiic.h"
 #include "cpu/z80/z80.h"
 #include "machine/eeprom.h"
diff --git a/src/mame/drivers/asteroid.c b/src/mame/drivers/asteroid.c
index 6f72d8af991..cfc81a27fe1 100644
--- a/src/mame/drivers/asteroid.c
+++ b/src/mame/drivers/asteroid.c
@@ -166,6 +166,7 @@ Kits are available immediately from your Atari Distributor.  To determine which
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/m6502/m6502.h"
 #include "rendlay.h"
 #include "video/vector.h"
 #include "video/avgdvg.h"
diff --git a/src/mame/drivers/astinvad.c b/src/mame/drivers/astinvad.c
index b30c1e9fa34..c21de11bd15 100644
--- a/src/mame/drivers/astinvad.c
+++ b/src/mame/drivers/astinvad.c
@@ -17,6 +17,7 @@ DIP locations verified for:
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "machine/8255ppi.h"
 #include "sound/samples.h"
 
diff --git a/src/mame/drivers/astrocde.c b/src/mame/drivers/astrocde.c
index a15d855f877..b34148a3627 100644
--- a/src/mame/drivers/astrocde.c
+++ b/src/mame/drivers/astrocde.c
@@ -110,6 +110,7 @@
 ****************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "cpu/z80/z80daisy.h"
 #include "includes/astrocde.h"
 #include "machine/z80ctc.h"
diff --git a/src/mame/drivers/astrocorp.c b/src/mame/drivers/astrocorp.c
index a6e19b9f4eb..b678332ffa3 100644
--- a/src/mame/drivers/astrocorp.c
+++ b/src/mame/drivers/astrocorp.c
@@ -12,6 +12,7 @@ OTHER:  ASTRO 0001B, EEPROM
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/m68000/m68000.h"
 #include "machine/eeprom.h"
 #include "sound/okim6295.h"
 
diff --git a/src/mame/drivers/astrof.c b/src/mame/drivers/astrof.c
index 067efc54eab..c70bba6d000 100644
--- a/src/mame/drivers/astrof.c
+++ b/src/mame/drivers/astrof.c
@@ -47,6 +47,7 @@
 
 
 #include "driver.h"
+#include "cpu/m6502/m6502.h"
 #include "astrof.h"
 
 
diff --git a/src/mame/drivers/asuka.c b/src/mame/drivers/asuka.c
index fcfef9f5787..42bc54f20a4 100644
--- a/src/mame/drivers/asuka.c
+++ b/src/mame/drivers/asuka.c
@@ -213,6 +213,8 @@ DIP locations verified for:
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
+#include "cpu/m68000/m68000.h"
 #include "taitoipt.h"
 #include "video/taitoic.h"
 #include "audio/taitosnd.h"
diff --git a/src/mame/drivers/atarifb.c b/src/mame/drivers/atarifb.c
index f6629197b8d..9b2eafd9366 100644
--- a/src/mame/drivers/atarifb.c
+++ b/src/mame/drivers/atarifb.c
@@ -103,6 +103,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/m6502/m6502.h"
 #include "deprecat.h"
 #include "atarifb.h"
 #include "sound/discrete.h"
diff --git a/src/mame/drivers/atarig1.c b/src/mame/drivers/atarig1.c
index 92c5f7ceb22..9640aa9102f 100644
--- a/src/mame/drivers/atarig1.c
+++ b/src/mame/drivers/atarig1.c
@@ -19,6 +19,7 @@
 
 
 #include "driver.h"
+#include "cpu/m68000/m68000.h"
 #include "machine/atarigen.h"
 #include "audio/atarijsa.h"
 #include "video/atarirle.h"
diff --git a/src/mame/drivers/atarig42.c b/src/mame/drivers/atarig42.c
index 46f336788fd..997b176edfc 100644
--- a/src/mame/drivers/atarig42.c
+++ b/src/mame/drivers/atarig42.c
@@ -19,6 +19,7 @@
 
 
 #include "driver.h"
+#include "cpu/m68000/m68000.h"
 #include "machine/atarigen.h"
 #include "machine/asic65.h"
 #include "audio/atarijsa.h"
diff --git a/src/mame/drivers/atarigx2.c b/src/mame/drivers/atarigx2.c
index 35e9bac5383..8f49b46d5e6 100644
--- a/src/mame/drivers/atarigx2.c
+++ b/src/mame/drivers/atarigx2.c
@@ -20,6 +20,7 @@
 
 
 #include "driver.h"
+#include "cpu/m68000/m68000.h"
 #include "machine/atarigen.h"
 #include "audio/atarijsa.h"
 #include "video/atarirle.h"
diff --git a/src/mame/drivers/atarisy1.c b/src/mame/drivers/atarisy1.c
index 1e847c66182..e0453fa0d0b 100644
--- a/src/mame/drivers/atarisy1.c
+++ b/src/mame/drivers/atarisy1.c
@@ -117,6 +117,8 @@
 
 
 #include "driver.h"
+#include "cpu/m68000/m68000.h"
+#include "cpu/m6502/m6502.h"
 #include "machine/atarigen.h"
 #include "machine/6522via.h"
 #include "atarisy1.h"
diff --git a/src/mame/drivers/atarisy2.c b/src/mame/drivers/atarisy2.c
index 29c76cc3292..479082472e3 100644
--- a/src/mame/drivers/atarisy2.c
+++ b/src/mame/drivers/atarisy2.c
@@ -124,6 +124,7 @@
 
 
 #include "driver.h"
+#include "cpu/m6502/m6502.h"
 #include "cpu/t11/t11.h"
 #include "machine/atarigen.h"
 #include "slapstic.h"
diff --git a/src/mame/drivers/ataxx.c b/src/mame/drivers/ataxx.c
index 92313f8ef5b..739494463b8 100644
--- a/src/mame/drivers/ataxx.c
+++ b/src/mame/drivers/ataxx.c
@@ -26,6 +26,7 @@
 
 
 #include "driver.h"
+#include "cpu/i86/i186intf.h"
 #include "machine/eeprom.h"
 #include "cpu/z80/z80.h"
 #include "leland.h"
diff --git a/src/mame/drivers/attckufo.c b/src/mame/drivers/attckufo.c
index 1872ce6b9ac..6f5c543f4b6 100644
--- a/src/mame/drivers/attckufo.c
+++ b/src/mame/drivers/attckufo.c
@@ -43,6 +43,7 @@ LOIPOIO-B
 ****************************************/
 
 #include "driver.h"
+#include "cpu/m6502/m6502.h"
 #include "includes/attckufo.h"
 
 
diff --git a/src/mame/drivers/avalnche.c b/src/mame/drivers/avalnche.c
index 13d55c4d208..443e9321987 100644
--- a/src/mame/drivers/avalnche.c
+++ b/src/mame/drivers/avalnche.c
@@ -28,6 +28,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/m6502/m6502.h"
 #include "deprecat.h"
 #include "sound/discrete.h"
 #include "avalnche.h"
diff --git a/src/mame/drivers/aztarac.c b/src/mame/drivers/aztarac.c
index 28476b0d58b..2221492bde9 100644
--- a/src/mame/drivers/aztarac.c
+++ b/src/mame/drivers/aztarac.c
@@ -14,6 +14,8 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
+#include "cpu/m68000/m68000.h"
 #include "video/vector.h"
 #include "aztarac.h"
 #include "sound/ay8910.h"
diff --git a/src/mame/drivers/badlands.c b/src/mame/drivers/badlands.c
index 7d32bf70728..36725f65d71 100644
--- a/src/mame/drivers/badlands.c
+++ b/src/mame/drivers/badlands.c
@@ -93,6 +93,9 @@
 
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
+#include "cpu/m68000/m68000.h"
+#include "cpu/m6502/m6502.h"
 #include "machine/atarigen.h"
 #include "badlands.h"
 #include "sound/2151intf.h"
diff --git a/src/mame/drivers/bagman.c b/src/mame/drivers/bagman.c
index c563a1b4065..750e6add835 100644
--- a/src/mame/drivers/bagman.c
+++ b/src/mame/drivers/bagman.c
@@ -61,6 +61,7 @@ DIP locations verified for:
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "deprecat.h"
 #include "sound/ay8910.h"
 #include "sound/5110intf.h"
diff --git a/src/mame/drivers/balsente.c b/src/mame/drivers/balsente.c
index 5890b0e8f86..d0002f82f81 100644
--- a/src/mame/drivers/balsente.c
+++ b/src/mame/drivers/balsente.c
@@ -220,6 +220,9 @@ DIP locations verified for:
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
+#include "cpu/m6809/m6809.h"
+#include "cpu/m68000/m68000.h"
 #include "balsente.h"
 #include "sound/cem3394.h"
 
diff --git a/src/mame/drivers/bankp.c b/src/mame/drivers/bankp.c
index 7308ab042f4..2d104be0aae 100644
--- a/src/mame/drivers/bankp.c
+++ b/src/mame/drivers/bankp.c
@@ -96,6 +96,7 @@ write:
 
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "sound/sn76496.h"
 
 
diff --git a/src/mame/drivers/baraduke.c b/src/mame/drivers/baraduke.c
index 15d6e89a3f7..b77f025b6c1 100644
--- a/src/mame/drivers/baraduke.c
+++ b/src/mame/drivers/baraduke.c
@@ -105,6 +105,7 @@ DIP locations verified for:
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/m6809/m6809.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 366d2791c9d..55ebe95fc96 100644
--- a/src/mame/drivers/batman.c
+++ b/src/mame/drivers/batman.c
@@ -18,6 +18,7 @@
 
 
 #include "driver.h"
+#include "cpu/m68000/m68000.h"
 #include "machine/atarigen.h"
 #include "audio/atarijsa.h"
 #include "batman.h"
diff --git a/src/mame/drivers/battlex.c b/src/mame/drivers/battlex.c
index a2f28369eeb..424c8fd5ff1 100644
--- a/src/mame/drivers/battlex.c
+++ b/src/mame/drivers/battlex.c
@@ -41,6 +41,7 @@ XTAL: 10.0 MHz
 
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "deprecat.h"
 #include "sound/ay8910.h"
 
diff --git a/src/mame/drivers/bbusters.c b/src/mame/drivers/bbusters.c
index d9c60bf8e5a..93f783dd54f 100644
--- a/src/mame/drivers/bbusters.c
+++ b/src/mame/drivers/bbusters.c
@@ -198,6 +198,8 @@ the entire size of the screen.
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
+#include "cpu/m68000/m68000.h"
 #include "sound/2608intf.h"
 #include "sound/2610intf.h"
 
diff --git a/src/mame/drivers/beaminv.c b/src/mame/drivers/beaminv.c
index 317335dbf03..874abb840e6 100644
--- a/src/mame/drivers/beaminv.c
+++ b/src/mame/drivers/beaminv.c
@@ -52,6 +52,7 @@ Stephh's notes (based on the games Z80 code and some tests) :
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 
 
 static UINT8 *beaminv_videoram;
diff --git a/src/mame/drivers/berzerk.c b/src/mame/drivers/berzerk.c
index b91558b54a0..b991f1784cf 100644
--- a/src/mame/drivers/berzerk.c
+++ b/src/mame/drivers/berzerk.c
@@ -9,6 +9,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "exidy.h"
 #include "machine/74181.h"
 #include "sound/s14001a.h"
diff --git a/src/mame/drivers/bestleag.c b/src/mame/drivers/bestleag.c
index 38522bf4409..683ac99ac32 100644
--- a/src/mame/drivers/bestleag.c
+++ b/src/mame/drivers/bestleag.c
@@ -20,6 +20,7 @@ Dip Locations added according to Service Mode
 *******************************************************************************************/
 
 #include "driver.h"
+#include "cpu/m68000/m68000.h"
 #include "sound/okim6295.h"
 
 /* Video Handling */
diff --git a/src/mame/drivers/bigevglf.c b/src/mame/drivers/bigevglf.c
index ad7d26a9ce1..eed935bfc44 100644
--- a/src/mame/drivers/bigevglf.c
+++ b/src/mame/drivers/bigevglf.c
@@ -56,6 +56,7 @@ J1100072A
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "deprecat.h"
 #include "sound/ay8910.h"
 #include "sound/msm5232.h"
diff --git a/src/mame/drivers/bigfghtr.c b/src/mame/drivers/bigfghtr.c
index 76d4e15bd86..3e9e96725aa 100644
--- a/src/mame/drivers/bigfghtr.c
+++ b/src/mame/drivers/bigfghtr.c
@@ -109,6 +109,8 @@ Notes:
 
 **********************************************************************/
 #include "driver.h"
+#include "cpu/z80/z80.h"
+#include "cpu/m68000/m68000.h"
 #include "deprecat.h"
 #include "sound/dac.h"
 #include "sound/okim6295.h"
diff --git a/src/mame/drivers/bigstrkb.c b/src/mame/drivers/bigstrkb.c
index 3f51d7725a2..f62f4b8696d 100644
--- a/src/mame/drivers/bigstrkb.c
+++ b/src/mame/drivers/bigstrkb.c
@@ -13,6 +13,7 @@
 */
 
 #include "driver.h"
+#include "cpu/m68000/m68000.h"
 #include "sound/okim6295.h"
 
 /*
diff --git a/src/mame/drivers/bionicc.c b/src/mame/drivers/bionicc.c
index 8e260f46d5a..b0775fb7950 100644
--- a/src/mame/drivers/bionicc.c
+++ b/src/mame/drivers/bionicc.c
@@ -55,6 +55,8 @@ ToDo:
 ********************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
+#include "cpu/m68000/m68000.h"
 #include "deprecat.h"
 #include "sound/2151intf.h"
 
diff --git a/src/mame/drivers/bking.c b/src/mame/drivers/bking.c
index 80f3829e2f6..d9526410d4c 100644
--- a/src/mame/drivers/bking.c
+++ b/src/mame/drivers/bking.c
@@ -16,6 +16,7 @@ DIP Locations verified for:
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "cpu/m6805/m6805.h"
 #include "sound/ay8910.h"
 #include "sound/dac.h"
diff --git a/src/mame/drivers/blackt96.c b/src/mame/drivers/blackt96.c
index 5cd6921b5dd..ea2b1d4d70d 100644
--- a/src/mame/drivers/blackt96.c
+++ b/src/mame/drivers/blackt96.c
@@ -45,6 +45,8 @@ Added Dip Locations based on Service Mode
 */
 
 #include "driver.h"
+#include "cpu/pic16c5x/pic16c5x.h"
+#include "cpu/m68000/m68000.h"
 #include "sound/okim6295.h"
 
 static VIDEO_START( blackt96 )
diff --git a/src/mame/drivers/blmbycar.c b/src/mame/drivers/blmbycar.c
index e7e9af7dbd4..753c4df2282 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 "cpu/m68000/m68000.h"
 #include "sound/okim6295.h"
 
 /* Variables defined in video: */
diff --git a/src/mame/drivers/blockade.c b/src/mame/drivers/blockade.c
index 3e956dd3e86..2cfd25fb65b 100644
--- a/src/mame/drivers/blockade.c
+++ b/src/mame/drivers/blockade.c
@@ -29,6 +29,7 @@ Notes:  Support is complete with the exception of the noise generator.
 ****************************************************************************/
 
 #include "driver.h"
+#include "cpu/i8085/i8085.h"
 #include "includes/blockade.h"
 #include "sound/samples.h"
 #include "sound/discrete.h"
diff --git a/src/mame/drivers/blockhl.c b/src/mame/drivers/blockhl.c
index e9606e0beb8..6854b971e26 100644
--- a/src/mame/drivers/blockhl.c
+++ b/src/mame/drivers/blockhl.c
@@ -20,6 +20,7 @@ found it.
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.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 f8fcf2ed2b1..9c2cb516bbc 100644
--- a/src/mame/drivers/blockout.c
+++ b/src/mame/drivers/blockout.c
@@ -10,6 +10,7 @@ DIP locations verified for:
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/m68000/m68000.h"
 #include "deprecat.h"
 #include "cpu/z80/z80.h"
 #include "sound/2151intf.h"
diff --git a/src/mame/drivers/bloodbro.c b/src/mame/drivers/bloodbro.c
index 96bba1e1eaf..7515bcfc529 100644
--- a/src/mame/drivers/bloodbro.c
+++ b/src/mame/drivers/bloodbro.c
@@ -108,6 +108,7 @@ DIP locations verified for:
 **************************************************************************/
 
 #include "driver.h"
+#include "cpu/m68000/m68000.h"
 #include "audio/seibu.h"
 #include "cpu/z80/z80.h"
 #include "sound/3812intf.h"
diff --git a/src/mame/drivers/blstroid.c b/src/mame/drivers/blstroid.c
index 783f4add8b6..1015f8bd203 100644
--- a/src/mame/drivers/blstroid.c
+++ b/src/mame/drivers/blstroid.c
@@ -18,6 +18,7 @@
 
 
 #include "driver.h"
+#include "cpu/m68000/m68000.h"
 #include "machine/atarigen.h"
 #include "audio/atarijsa.h"
 #include "blstroid.h"
diff --git a/src/mame/drivers/bnstars.c b/src/mame/drivers/bnstars.c
index 958382d6fb7..87c7cb89c52 100644
--- a/src/mame/drivers/bnstars.c
+++ b/src/mame/drivers/bnstars.c
@@ -87,6 +87,8 @@ ROMs    : MR96004-10.1  [125661cd] (IC5 - Samples)
 */
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
+#include "cpu/v60/v60.h"
 #include "deprecat.h"
 #include "sound/ymf271.h"
 #include "rendlay.h"
diff --git a/src/mame/drivers/bombjack.c b/src/mame/drivers/bombjack.c
index fd59edbeb1c..bbcb8a06025 100644
--- a/src/mame/drivers/bombjack.c
+++ b/src/mame/drivers/bombjack.c
@@ -96,6 +96,7 @@ Dip Locations and factory settings verified with manual
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "sound/ay8910.h"
 
 
diff --git a/src/mame/drivers/bottom9.c b/src/mame/drivers/bottom9.c
index 0c50cc3770f..cf270a1f0c6 100644
--- a/src/mame/drivers/bottom9.c
+++ b/src/mame/drivers/bottom9.c
@@ -13,6 +13,7 @@ To be verified for Main Stadium
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "deprecat.h"
 #include "cpu/m6809/m6809.h"
 #include "video/konamiic.h"
diff --git a/src/mame/drivers/boxer.c b/src/mame/drivers/boxer.c
index cdf5650e2f5..4785a2ac7f2 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 "cpu/m6502/m6502.h"
 
 #define MASTER_CLOCK XTAL_12_096MHz
 
diff --git a/src/mame/drivers/brasil.c b/src/mame/drivers/brasil.c
index 40e3061d5aa..3e92ad1c2f8 100644
--- a/src/mame/drivers/brasil.c
+++ b/src/mame/drivers/brasil.c
@@ -22,6 +22,8 @@ TODO:
 *************************************************************************************************/
 
 #include "driver.h"
+#include "cpu/nec/necintrf.h"
+#include "cpu/i86/i186intf.h"
 #include "fashion.lh"
 
 static UINT16 *blit_ram;
diff --git a/src/mame/drivers/bsktball.c b/src/mame/drivers/bsktball.c
index ccb3b85c787..7dcd66dd82a 100644
--- a/src/mame/drivers/bsktball.c
+++ b/src/mame/drivers/bsktball.c
@@ -24,6 +24,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/m6502/m6502.h"
 #include "deprecat.h"
 #include "bsktball.h"
 #include "sound/discrete.h"
diff --git a/src/mame/drivers/btoads.c b/src/mame/drivers/btoads.c
index 6055be4190a..bd17b0f67a3 100644
--- a/src/mame/drivers/btoads.c
+++ b/src/mame/drivers/btoads.c
@@ -7,6 +7,7 @@
 **************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.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 f9dc357ea0f..4b8c531b3dc 100644
--- a/src/mame/drivers/bublbobl.c
+++ b/src/mame/drivers/bublbobl.c
@@ -269,6 +269,8 @@ TODO:
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
+#include "cpu/m6800/m6800.h"
 #include "deprecat.h"
 #include "sound/2203intf.h"
 #include "sound/3812intf.h"
diff --git a/src/mame/drivers/bwidow.c b/src/mame/drivers/bwidow.c
index 4d5b62a6e2c..26c80e17350 100644
--- a/src/mame/drivers/bwidow.c
+++ b/src/mame/drivers/bwidow.c
@@ -217,6 +217,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/m6502/m6502.h"
 #include "video/vector.h"
 #include "video/avgdvg.h"
 #include "machine/atari_vg.h"
diff --git a/src/mame/drivers/bzone.c b/src/mame/drivers/bzone.c
index 3405bd51adf..2be56c621c7 100644
--- a/src/mame/drivers/bzone.c
+++ b/src/mame/drivers/bzone.c
@@ -201,6 +201,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/m6502/m6502.h"
 #include "video/vector.h"
 #include "video/avgdvg.h"
 #include "machine/mathbox.h"
diff --git a/src/mame/drivers/cabal.c b/src/mame/drivers/cabal.c
index 4677feb5a96..076cabf46c4 100644
--- a/src/mame/drivers/cabal.c
+++ b/src/mame/drivers/cabal.c
@@ -45,6 +45,7 @@ Dip locations verified with Fabtek manual for the trackball version
 ******************************************************************/
 
 #include "driver.h"
+#include "cpu/m68000/m68000.h"
 #include "cpu/z80/z80.h"
 #include "audio/seibu.h"
 #include "sound/2151intf.h"
diff --git a/src/mame/drivers/calomega.c b/src/mame/drivers/calomega.c
index 3f78f6fb5c4..51a3234a1b9 100644
--- a/src/mame/drivers/calomega.c
+++ b/src/mame/drivers/calomega.c
@@ -616,6 +616,7 @@
 #define SND_CLOCK	(MASTER_CLOCK/8)
 
 #include "driver.h"
+#include "cpu/m6502/m6502.h"
 #include "video/mc6845.h"
 #include "machine/6821pia.h"
 #include "machine/6850acia.h"
diff --git a/src/mame/drivers/calorie.c b/src/mame/drivers/calorie.c
index 3064b35beb1..15488d04303 100644
--- a/src/mame/drivers/calorie.c
+++ b/src/mame/drivers/calorie.c
@@ -78,6 +78,7 @@ Notes:
 */
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "machine/segacrpt.h"
 #include "sound/ay8910.h"
 
diff --git a/src/mame/drivers/canyon.c b/src/mame/drivers/canyon.c
index b3faad13a3b..89d53c197cd 100644
--- a/src/mame/drivers/canyon.c
+++ b/src/mame/drivers/canyon.c
@@ -37,6 +37,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/m6502/m6502.h"
 #include "canyon.h"
 #include "sound/discrete.h"
 
diff --git a/src/mame/drivers/carjmbre.c b/src/mame/drivers/carjmbre.c
index d4fd7326639..7df22e8d037 100644
--- a/src/mame/drivers/carjmbre.c
+++ b/src/mame/drivers/carjmbre.c
@@ -41,6 +41,7 @@ Notes:
 */
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "sound/ay8910.h"
 
 WRITE8_HANDLER( carjmbre_flipscreen_w );
diff --git a/src/mame/drivers/carpolo.c b/src/mame/drivers/carpolo.c
index 4553c32f144..af7eefd29ae 100644
--- a/src/mame/drivers/carpolo.c
+++ b/src/mame/drivers/carpolo.c
@@ -17,6 +17,7 @@
 ****************************************************************************/
 
 #include "driver.h"
+#include "cpu/m6502/m6502.h"
 #include "machine/6821pia.h"
 #include "carpolo.h"
 
diff --git a/src/mame/drivers/carrera.c b/src/mame/drivers/carrera.c
index 759929c5539..03336c9ab0f 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 "cpu/z80/z80.h"
 #include "sound/ay8910.h"
 #include "video/mc6845.h"
 
diff --git a/src/mame/drivers/cave.c b/src/mame/drivers/cave.c
index 5d6ec871dfb..a0c9135dd4d 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 "cpu/m68000/m68000.h"
 #include "machine/eeprom.h"
 #include "machine/nmk112.h"
 #include "cpu/z80/z80.h"
diff --git a/src/mame/drivers/cb2001.c b/src/mame/drivers/cb2001.c
index d649ac53037..8f49de88caa 100644
--- a/src/mame/drivers/cb2001.c
+++ b/src/mame/drivers/cb2001.c
@@ -40,6 +40,7 @@ In test mode (c) is 2000
 *************************************************************************************************/
 
 #include "driver.h"
+#include "cpu/nec/necintrf.h"
 #include "cpu/nec/nec.h"
 
 #define xxxx 0x90 /* Unknown */
diff --git a/src/mame/drivers/cball.c b/src/mame/drivers/cball.c
index e7daff41867..9fd361896fd 100644
--- a/src/mame/drivers/cball.c
+++ b/src/mame/drivers/cball.c
@@ -5,6 +5,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/m6800/m6800.h"
 
 static UINT8* cball_video_ram;
 
diff --git a/src/mame/drivers/cbasebal.c b/src/mame/drivers/cbasebal.c
index 5f91ea0745f..bc1d4de4813 100644
--- a/src/mame/drivers/cbasebal.c
+++ b/src/mame/drivers/cbasebal.c
@@ -13,6 +13,7 @@ TODO:
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "includes/cps1.h"
 #include "machine/eeprom.h"
 #include "sound/okim6295.h"
diff --git a/src/mame/drivers/cbuster.c b/src/mame/drivers/cbuster.c
index 00fc6c01c53..4963e2ef52a 100644
--- a/src/mame/drivers/cbuster.c
+++ b/src/mame/drivers/cbuster.c
@@ -17,6 +17,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/m68000/m68000.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 68f4f89d6e5..177381a15fa 100644
--- a/src/mame/drivers/ccastles.c
+++ b/src/mame/drivers/ccastles.c
@@ -120,6 +120,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/m6502/m6502.h"
 #include "sound/pokey.h"
 #include "ccastles.h"
 
diff --git a/src/mame/drivers/cchasm.c b/src/mame/drivers/cchasm.c
index f9f3deac473..2b560aa5af2 100644
--- a/src/mame/drivers/cchasm.c
+++ b/src/mame/drivers/cchasm.c
@@ -13,6 +13,8 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
+#include "cpu/m68000/m68000.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 7b3997ce48e..be45be46333 100644
--- a/src/mame/drivers/cclimber.c
+++ b/src/mame/drivers/cclimber.c
@@ -194,6 +194,7 @@ Dip location verified from manual for: cclimber, guzzler, swimmer
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "machine/segacrpt.h"
 #include "sound/ay8910.h"
 #include "sound/samples.h"
diff --git a/src/mame/drivers/centiped.c b/src/mame/drivers/centiped.c
index b8efe76e880..8fd6a816c07 100644
--- a/src/mame/drivers/centiped.c
+++ b/src/mame/drivers/centiped.c
@@ -417,6 +417,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/m6502/m6502.h"
 #include "cpu/s2650/s2650.h"
 #include "machine/atari_vg.h"
 #include "centiped.h"
diff --git a/src/mame/drivers/chaknpop.c b/src/mame/drivers/chaknpop.c
index 7c9327ca2bb..691509944e9 100644
--- a/src/mame/drivers/chaknpop.c
+++ b/src/mame/drivers/chaknpop.c
@@ -6,6 +6,7 @@
  */
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "sound/ay8910.h"
 #include "includes/chaknpop.h"
 
diff --git a/src/mame/drivers/champbas.c b/src/mame/drivers/champbas.c
index 1da29a60198..abbfc5a732c 100644
--- a/src/mame/drivers/champbas.c
+++ b/src/mame/drivers/champbas.c
@@ -81,6 +81,8 @@ TODO:
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
+#include "cpu/alph8201/alph8201.h"
 #include "sound/ay8910.h"
 #include "sound/dac.h"
 
diff --git a/src/mame/drivers/champbwl.c b/src/mame/drivers/champbwl.c
index 7e985609632..c0c98093e81 100644
--- a/src/mame/drivers/champbwl.c
+++ b/src/mame/drivers/champbwl.c
@@ -151,6 +151,7 @@ Notes:
 */
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "sound/x1_010.h"
 #include "includes/tnzs.h"
 
diff --git a/src/mame/drivers/chanbara.c b/src/mame/drivers/chanbara.c
index 161d68deb29..5ee19d41c45 100644
--- a/src/mame/drivers/chanbara.c
+++ b/src/mame/drivers/chanbara.c
@@ -47,6 +47,7 @@ ToDo:
 ****************************************************************************************/
 
 #include "driver.h"
+#include "cpu/m6809/m6809.h"
 #include "sound/2203intf.h"
 
 static tilemap *bg_tilemap;
diff --git a/src/mame/drivers/cheekyms.c b/src/mame/drivers/cheekyms.c
index 00618c28b38..5bea22de24b 100644
--- a/src/mame/drivers/cheekyms.c
+++ b/src/mame/drivers/cheekyms.c
@@ -7,6 +7,7 @@
 **************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "sound/dac.h"
 
 
diff --git a/src/mame/drivers/cherrym2.c b/src/mame/drivers/cherrym2.c
index 1982a7728f7..8cd9bb9b748 100644
--- a/src/mame/drivers/cherrym2.c
+++ b/src/mame/drivers/cherrym2.c
@@ -25,6 +25,7 @@
 */
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "sound/ay8910.h"
 /* video */
 
diff --git a/src/mame/drivers/chinagat.c b/src/mame/drivers/chinagat.c
index e24dc7d67f9..0a4fd82a4e8 100644
--- a/src/mame/drivers/chinagat.c
+++ b/src/mame/drivers/chinagat.c
@@ -70,6 +70,7 @@ Dip locations and factory settings verified with China Gate US manual.
 
 
 #include "driver.h"
+#include "cpu/hd6309/hd6309.h"
 #include "cpu/m6809/m6809.h"
 #include "cpu/z80/z80.h"
 #include "cpu/mcs48/mcs48.h"
diff --git a/src/mame/drivers/chinsan.c b/src/mame/drivers/chinsan.c
index 97d0bbdfcc1..9624df4293c 100644
--- a/src/mame/drivers/chinsan.c
+++ b/src/mame/drivers/chinsan.c
@@ -40,6 +40,7 @@ MM63.10N
 */
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "machine/mc8123.h"
 #include "sound/2203intf.h"
 
diff --git a/src/mame/drivers/circus.c b/src/mame/drivers/circus.c
index 7c2d757d83d..5961f8df77c 100644
--- a/src/mame/drivers/circus.c
+++ b/src/mame/drivers/circus.c
@@ -34,6 +34,7 @@ D000      Paddle Position and Interrupt Reset
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/m6502/m6502.h"
 #include "deprecat.h"
 #include "sound/samples.h"
 #include "circus.h"
diff --git a/src/mame/drivers/circusc.c b/src/mame/drivers/circusc.c
index a86847bb6c6..2f479bf51c6 100644
--- a/src/mame/drivers/circusc.c
+++ b/src/mame/drivers/circusc.c
@@ -48,6 +48,7 @@ To enter service mode, keep 1&2 pressed on reset
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "machine/konami1.h"
 #include "cpu/m6809/m6809.h"
 #include "sound/dac.h"
diff --git a/src/mame/drivers/cischeat.c b/src/mame/drivers/cischeat.c
index 405f1eb93af..ea730d371f7 100644
--- a/src/mame/drivers/cischeat.c
+++ b/src/mame/drivers/cischeat.c
@@ -168,6 +168,7 @@ Cisco Heat.
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/m68000/m68000.h"
 #include "deprecat.h"
 #include "megasys1.h"
 #include "sound/2151intf.h"
diff --git a/src/mame/drivers/citycon.c b/src/mame/drivers/citycon.c
index 25b5ecd2e1d..f0700a7f28e 100644
--- a/src/mame/drivers/citycon.c
+++ b/src/mame/drivers/citycon.c
@@ -7,6 +7,7 @@ Dip locations added from dip listing at crazykong.com
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/m6809/m6809.h"
 #include "sound/ay8910.h"
 #include "sound/2203intf.h"
 
diff --git a/src/mame/drivers/clayshoo.c b/src/mame/drivers/clayshoo.c
index 2fb585e2f24..6ba37711ed4 100644
--- a/src/mame/drivers/clayshoo.c
+++ b/src/mame/drivers/clayshoo.c
@@ -13,6 +13,7 @@
 ****************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "machine/8255ppi.h"
 
 
diff --git a/src/mame/drivers/cliffhgr.c b/src/mame/drivers/cliffhgr.c
index bda613369cb..b55cc4183c8 100644
--- a/src/mame/drivers/cliffhgr.c
+++ b/src/mame/drivers/cliffhgr.c
@@ -74,6 +74,7 @@ Side 2 = 0x8F7DDD (or 0x880000 | ( 0x77 << 12 ) | 0x0DDD)
 *********************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "render.h"
 #include "machine/laserdsc.h"
 #include "video/tms9928a.h"
diff --git a/src/mame/drivers/cloak.c b/src/mame/drivers/cloak.c
index 8017e416119..75c4e2b25da 100644
--- a/src/mame/drivers/cloak.c
+++ b/src/mame/drivers/cloak.c
@@ -112,6 +112,7 @@
 */
 
 #include "driver.h"
+#include "cpu/m6502/m6502.h"
 #include "deprecat.h"
 #include "sound/pokey.h"
 #include "includes/cloak.h"
diff --git a/src/mame/drivers/cloud9.c b/src/mame/drivers/cloud9.c
index 2a6d5eea64d..5817f8d7128 100644
--- a/src/mame/drivers/cloud9.c
+++ b/src/mame/drivers/cloud9.c
@@ -91,6 +91,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/m6502/m6502.h"
 #include "sound/pokey.h"
 #include "cloud9.h"
 
diff --git a/src/mame/drivers/clshroad.c b/src/mame/drivers/clshroad.c
index 7210dfdc52e..ce88405598e 100644
--- a/src/mame/drivers/clshroad.c
+++ b/src/mame/drivers/clshroad.c
@@ -18,6 +18,7 @@ XTAL        :   18.432 MHz
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "sound/custom.h"
 
 /* Variables & functions defined in video: */
diff --git a/src/mame/drivers/cninja.c b/src/mame/drivers/cninja.c
index 56d706f5870..664ee2004f7 100644
--- a/src/mame/drivers/cninja.c
+++ b/src/mame/drivers/cninja.c
@@ -41,6 +41,8 @@ Note about version levels using Mutant Fighter as the example:
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
+#include "cpu/m68000/m68000.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 9ee57ed75f2..ee7e0cf6513 100644
--- a/src/mame/drivers/cntsteer.c
+++ b/src/mame/drivers/cntsteer.c
@@ -26,6 +26,7 @@
 *******************************************************************************/
 
 #include "driver.h"
+#include "cpu/m6502/m6502.h"
 #include "deprecat.h"
 #include "cpu/m6809/m6809.h"
 #include "sound/ay8910.h"
diff --git a/src/mame/drivers/coinmstr.c b/src/mame/drivers/coinmstr.c
index 1fb68890c02..1819660f20a 100644
--- a/src/mame/drivers/coinmstr.c
+++ b/src/mame/drivers/coinmstr.c
@@ -23,6 +23,7 @@
 
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "machine/6821pia.h"
 #include "video/mc6845.h"
 #include "sound/ay8910.h"
diff --git a/src/mame/drivers/cojag.c b/src/mame/drivers/cojag.c
index 9b068ab2b61..74ee624f778 100644
--- a/src/mame/drivers/cojag.c
+++ b/src/mame/drivers/cojag.c
@@ -289,6 +289,7 @@ Notes:
 
 
 #include "driver.h"
+#include "cpu/m68000/m68000.h"
 #include "cpu/mips/r3000.h"
 #include "cpu/jaguar/jaguar.h"
 #include "machine/idectrl.h"
diff --git a/src/mame/drivers/combatsc.c b/src/mame/drivers/combatsc.c
index 55b43c87043..4d50056320e 100644
--- a/src/mame/drivers/combatsc.c
+++ b/src/mame/drivers/combatsc.c
@@ -122,6 +122,7 @@ Dip location and recommended settings verified with the US manual
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/hd6309/hd6309.h"
 #include "cpu/z80/z80.h"
 #include "sound/2203intf.h"
 #include "sound/upd7759.h"
diff --git a/src/mame/drivers/comebaby.c b/src/mame/drivers/comebaby.c
index d6bc6a87e3b..14b02c27efa 100644
--- a/src/mame/drivers/comebaby.c
+++ b/src/mame/drivers/comebaby.c
@@ -57,6 +57,7 @@
 */
 
 #include "driver.h"
+#include "cpu/i386/i386intf.h"
 
 static VIDEO_START(comebaby)
 {
diff --git a/src/mame/drivers/commando.c b/src/mame/drivers/commando.c
index 136c377daa3..9c247fcd555 100644
--- a/src/mame/drivers/commando.c
+++ b/src/mame/drivers/commando.c
@@ -43,6 +43,7 @@ Note : there is an ingame typo bug that doesn't display the bonus life values
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "deprecat.h"
 #include "sound/2203intf.h"
 
diff --git a/src/mame/drivers/compgolf.c b/src/mame/drivers/compgolf.c
index ffbc7342a65..ef1ddc33de8 100644
--- a/src/mame/drivers/compgolf.c
+++ b/src/mame/drivers/compgolf.c
@@ -11,6 +11,7 @@ as well.
 ****************************************************************************************/
 
 #include "driver.h"
+#include "cpu/m6809/m6809.h"
 #include "sound/2203intf.h"
 
 extern UINT8 *compgolf_bg_ram;
diff --git a/src/mame/drivers/coolpool.c b/src/mame/drivers/coolpool.c
index b3a33b72806..ad952e7842d 100644
--- a/src/mame/drivers/coolpool.c
+++ b/src/mame/drivers/coolpool.c
@@ -25,6 +25,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/tms32010/tms32010.h"
 #include "cpu/tms34010/tms34010.h"
 #include "cpu/tms32025/tms32025.h"
 #include "video/tlc34076.h"
diff --git a/src/mame/drivers/coolridr.c b/src/mame/drivers/coolridr.c
index 15b47606f23..b04bdad42c4 100644
--- a/src/mame/drivers/coolridr.c
+++ b/src/mame/drivers/coolridr.c
@@ -50,6 +50,8 @@ SEGA CUSTOM IC :
 */
 
 #include "driver.h"
+#include "cpu/sh2/sh2.h"
+#include "cpu/m68000/m68000.h"
 #include "deprecat.h"
 #include "sound/scsp.h"
 
diff --git a/src/mame/drivers/cop01.c b/src/mame/drivers/cop01.c
index 3a52be25ace..406a855609c 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 "cpu/z80/z80.h"
 #include "sound/ay8910.h"
 #include "sound/3812intf.h"
 
diff --git a/src/mame/drivers/copsnrob.c b/src/mame/drivers/copsnrob.c
index c5a0272cb0b..ab255cc17e2 100644
--- a/src/mame/drivers/copsnrob.c
+++ b/src/mame/drivers/copsnrob.c
@@ -56,6 +56,7 @@ Added Dip locations according to manual.
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/m6502/m6502.h"
 #include "copsnrob.h"
 #include "copsnrob.lh"
 
diff --git a/src/mame/drivers/cosmic.c b/src/mame/drivers/cosmic.c
index 47a1299232b..3b77f73cd0e 100644
--- a/src/mame/drivers/cosmic.c
+++ b/src/mame/drivers/cosmic.c
@@ -27,6 +27,7 @@ a physical DSW B but only read when SWA:3,4 are both set to OFF. Currently,
 
 
 #include "driver.h"
+#include "cpu/tms9900/tms9900.h"
 #include "deprecat.h"
 #include "cpu/z80/z80.h"
 #include "sound/samples.h"
diff --git a/src/mame/drivers/cowrace.c b/src/mame/drivers/cowrace.c
index 4a9b1075664..a4576aba09c 100644
--- a/src/mame/drivers/cowrace.c
+++ b/src/mame/drivers/cowrace.c
@@ -7,6 +7,7 @@
 *************************************************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "sound/okim6295.h"
 #include "sound/2203intf.h"
 
diff --git a/src/mame/drivers/cps1.c b/src/mame/drivers/cps1.c
index b1c87c8f5cb..103145ccd6a 100644
--- a/src/mame/drivers/cps1.c
+++ b/src/mame/drivers/cps1.c
@@ -230,6 +230,9 @@ Stephh's log (2006.09.20) :
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
+#include "cpu/pic16c5x/pic16c5x.h"
+#include "cpu/m68000/m68000.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 a0efeda0a4a..6d7f2d62875 100644
--- a/src/mame/drivers/cps2.c
+++ b/src/mame/drivers/cps2.c
@@ -584,6 +584,7 @@ Stephh's inputs notes (based on some tests on the "parent" set) :
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "deprecat.h"
 #include "machine/eeprom.h"
 #include "cpu/m68000/m68000.h"
diff --git a/src/mame/drivers/crbaloon.c b/src/mame/drivers/crbaloon.c
index 83347fa3497..420174732b5 100644
--- a/src/mame/drivers/crbaloon.c
+++ b/src/mame/drivers/crbaloon.c
@@ -15,6 +15,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "crbaloon.h"
 
 
diff --git a/src/mame/drivers/crgolf.c b/src/mame/drivers/crgolf.c
index 2e90b0a284c..8a5e22f67a0 100644
--- a/src/mame/drivers/crgolf.c
+++ b/src/mame/drivers/crgolf.c
@@ -30,6 +30,7 @@ Dip locations and factory settings verified with manual
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.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 10afa4edab7..2e4945c65f4 100644
--- a/src/mame/drivers/crimfght.c
+++ b/src/mame/drivers/crimfght.c
@@ -12,6 +12,7 @@ Dip locations verified with manual (US)
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.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 dc7b961363e..fe3541fc2b7 100644
--- a/src/mame/drivers/crospang.c
+++ b/src/mame/drivers/crospang.c
@@ -29,6 +29,8 @@
 */
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
+#include "cpu/m68000/m68000.h"
 #include "sound/okim6295.h"
 #include "sound/3812intf.h"
 
diff --git a/src/mame/drivers/crshrace.c b/src/mame/drivers/crshrace.c
index e2bea5cb62f..093f063313b 100644
--- a/src/mame/drivers/crshrace.c
+++ b/src/mame/drivers/crshrace.c
@@ -127,6 +127,8 @@ Dip locations verified with Service Mode.
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
+#include "cpu/m68000/m68000.h"
 #include "video/konamiic.h"
 #include "sound/2610intf.h"
 #include "crshrace.h"
diff --git a/src/mame/drivers/cshooter.c b/src/mame/drivers/cshooter.c
index 956df082b22..086b1001005 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 "cpu/z80/z80.h"
 #include "deprecat.h"
 #include "audio/seibu.h"
 
diff --git a/src/mame/drivers/cubeqst.c b/src/mame/drivers/cubeqst.c
index 9a0c03fcb33..ee1b0dacd71 100644
--- a/src/mame/drivers/cubeqst.c
+++ b/src/mame/drivers/cubeqst.c
@@ -18,6 +18,7 @@
 ****************************************************************************/
 
 #include "driver.h"
+#include "cpu/m68000/m68000.h"
 #include "cpu/cubeqcpu/cubeqcpu.h"
 #include "sound/dac.h"
 #include "sound/custom.h"
diff --git a/src/mame/drivers/cubocd32.c b/src/mame/drivers/cubocd32.c
index 5b3dd081f9d..6f38a18f820 100644
--- a/src/mame/drivers/cubocd32.c
+++ b/src/mame/drivers/cubocd32.c
@@ -45,6 +45,7 @@
 */
 
 #include "driver.h"
+#include "cpu/m68000/m68000.h"
 #include "sound/custom.h"
 #include "includes/amiga.h"
 #include "includes/cubocd32.h"
diff --git a/src/mame/drivers/cultures.c b/src/mame/drivers/cultures.c
index da20cbda6a5..aaef89e45b7 100644
--- a/src/mame/drivers/cultures.c
+++ b/src/mame/drivers/cultures.c
@@ -9,6 +9,7 @@
 */
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "sound/okim6295.h"
 
 #define MCLK 16000000
diff --git a/src/mame/drivers/cyberbal.c b/src/mame/drivers/cyberbal.c
index c463bea4380..dfc1fcc1f77 100644
--- a/src/mame/drivers/cyberbal.c
+++ b/src/mame/drivers/cyberbal.c
@@ -20,6 +20,8 @@
 
 
 #include "driver.h"
+#include "cpu/m68000/m68000.h"
+#include "cpu/m6502/m6502.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 2e46498f909..ae7546dc0e6 100644
--- a/src/mame/drivers/cybertnk.c
+++ b/src/mame/drivers/cybertnk.c
@@ -170,6 +170,8 @@ lev 7 : 0x7c : 0000 07e0 - input device clear?
 *******************************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
+#include "cpu/m68000/m68000.h"
 #include "deprecat.h"
 #include "sound/3812intf.h"
 
diff --git a/src/mame/drivers/dacholer.c b/src/mame/drivers/dacholer.c
index 7c8da4d26f9..3dc563e3785 100644
--- a/src/mame/drivers/dacholer.c
+++ b/src/mame/drivers/dacholer.c
@@ -19,6 +19,7 @@ Mods by Tomasz Slanina (2008.06.12):
 ******************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "sound/dac.h"
 #include "sound/msm5205.h"
 #include "sound/ay8910.h"
diff --git a/src/mame/drivers/darius.c b/src/mame/drivers/darius.c
index 98e9e500a89..0a8b6255070 100644
--- a/src/mame/drivers/darius.c
+++ b/src/mame/drivers/darius.c
@@ -127,6 +127,7 @@ sounds.
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/m68000/m68000.h"
 #include "video/taitoic.h"
 #include "cpu/z80/z80.h"
 #include "audio/taitosnd.h"
diff --git a/src/mame/drivers/darkhors.c b/src/mame/drivers/darkhors.c
index 24b5bca1d69..5867c66c58c 100644
--- a/src/mame/drivers/darkhors.c
+++ b/src/mame/drivers/darkhors.c
@@ -55,6 +55,7 @@ To do:
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/m68000/m68000.h"
 #include "deprecat.h"
 #include "machine/eeprom.h"
 #include "sound/okim6295.h"
diff --git a/src/mame/drivers/darkmist.c b/src/mame/drivers/darkmist.c
index 625d3fd68b1..8ba4bc5f7d3 100644
--- a/src/mame/drivers/darkmist.c
+++ b/src/mame/drivers/darkmist.c
@@ -24,6 +24,7 @@ TODO:
 */
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "deprecat.h"
 #include "audio/t5182.h"
 
diff --git a/src/mame/drivers/darkseal.c b/src/mame/drivers/darkseal.c
index 2b6360dd784..3bdf64a18f8 100644
--- a/src/mame/drivers/darkseal.c
+++ b/src/mame/drivers/darkseal.c
@@ -14,6 +14,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/m68000/m68000.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 aeec54b0699..16031b9ddac 100644
--- a/src/mame/drivers/dassault.c
+++ b/src/mame/drivers/dassault.c
@@ -122,6 +122,7 @@ Dip locations verified with US conversion kit manual.
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/m68000/m68000.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 371c211448a..54dba5e5e8c 100644
--- a/src/mame/drivers/dblewing.c
+++ b/src/mame/drivers/dblewing.c
@@ -17,6 +17,7 @@ Protection TODO:
 */
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "cpu/m68000/m68000.h"
 #include "decocrpt.h"
 #include "deco16ic.h"
diff --git a/src/mame/drivers/dcheese.c b/src/mame/drivers/dcheese.c
index 3cac3829ca6..c8c123620d7 100644
--- a/src/mame/drivers/dcheese.c
+++ b/src/mame/drivers/dcheese.c
@@ -29,6 +29,8 @@
 
 
 #include "driver.h"
+#include "cpu/m6809/m6809.h"
+#include "cpu/m68000/m68000.h"
 #include "machine/eeprom.h"
 #include "machine/ticket.h"
 #include "sound/bsmt2000.h"
diff --git a/src/mame/drivers/dcon.c b/src/mame/drivers/dcon.c
index 53d99173c44..09ef5eb8270 100644
--- a/src/mame/drivers/dcon.c
+++ b/src/mame/drivers/dcon.c
@@ -13,6 +13,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/m68000/m68000.h"
 #include "cpu/z80/z80.h"
 #include "audio/seibu.h"
 
diff --git a/src/mame/drivers/dday.c b/src/mame/drivers/dday.c
index 12166c12e31..db179dd1447 100644
--- a/src/mame/drivers/dday.c
+++ b/src/mame/drivers/dday.c
@@ -50,6 +50,7 @@ write:
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "sound/ay8910.h"
 
 extern UINT8 *dday_bgvideoram;
diff --git a/src/mame/drivers/ddayjlc.c b/src/mame/drivers/ddayjlc.c
index 86f7adc27d7..ba3ca191b9d 100644
--- a/src/mame/drivers/ddayjlc.c
+++ b/src/mame/drivers/ddayjlc.c
@@ -52,6 +52,7 @@ $842f = lives
 */
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "sound/ay8910.h"
 
 static INT32 char_bank = 0;
diff --git a/src/mame/drivers/ddenlovr.c b/src/mame/drivers/ddenlovr.c
index 52fbc9baac8..d9166c3d528 100644
--- a/src/mame/drivers/ddenlovr.c
+++ b/src/mame/drivers/ddenlovr.c
@@ -85,6 +85,7 @@ TODO:
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/m68000/m68000.h"
 #include "deprecat.h"
 #include "cpu/z80/z80.h"
 #include "sound/ay8910.h"
diff --git a/src/mame/drivers/ddragon.c b/src/mame/drivers/ddragon.c
index 28b900ee04e..2adfa71396a 100644
--- a/src/mame/drivers/ddragon.c
+++ b/src/mame/drivers/ddragon.c
@@ -69,6 +69,7 @@ Dip locations verified with manual for ddragon & ddragon2
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/hd6309/hd6309.h"
 #include "cpu/m6800/m6800.h"
 #include "cpu/m6805/m6805.h"
 #include "cpu/m6809/m6809.h"
diff --git a/src/mame/drivers/deadang.c b/src/mame/drivers/deadang.c
index 675a2ccd1a9..2760bd1e36e 100644
--- a/src/mame/drivers/deadang.c
+++ b/src/mame/drivers/deadang.c
@@ -37,6 +37,7 @@ Dip locations and factory settings verified with US manual
 */
 
 #include "driver.h"
+#include "cpu/nec/necintrf.h"
 #include "deprecat.h"
 #include "audio/seibu.h"
 #include "sound/2203intf.h"
diff --git a/src/mame/drivers/dec0.c b/src/mame/drivers/dec0.c
index 907df65f120..2f76f93691a 100644
--- a/src/mame/drivers/dec0.c
+++ b/src/mame/drivers/dec0.c
@@ -43,6 +43,7 @@ ToDo:
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/m68000/m68000.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 00cc6050c2b..70b50edbb63 100644
--- a/src/mame/drivers/dec8.c
+++ b/src/mame/drivers/dec8.c
@@ -38,6 +38,7 @@ To do:
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/hd6309/hd6309.h"
 #include "cpu/m6809/m6809.h"
 #include "cpu/m6502/m6502.h"
 #include "sound/2203intf.h"
diff --git a/src/mame/drivers/deco32.c b/src/mame/drivers/deco32.c
index 53d8c95f4e8..a5ee8c4a063 100644
--- a/src/mame/drivers/deco32.c
+++ b/src/mame/drivers/deco32.c
@@ -224,6 +224,7 @@ Notes:
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "deprecat.h"
 #include "cpu/arm/arm.h"
 #include "cpu/h6280/h6280.h"
diff --git a/src/mame/drivers/decocass.c b/src/mame/drivers/decocass.c
index 66549556cb4..d23b292a735 100644
--- a/src/mame/drivers/decocass.c
+++ b/src/mame/drivers/decocass.c
@@ -53,6 +53,8 @@
  ***********************************************************************/
 
 #include "driver.h"
+#include "cpu/m6502/m6502.h"
+#include "cpu/i8x41/i8x41.h"
 #include "machine/decocass.h"
 #include "sound/ay8910.h"
 
diff --git a/src/mame/drivers/deniam.c b/src/mame/drivers/deniam.c
index 1b18dcd61db..5ec73854606 100644
--- a/src/mame/drivers/deniam.c
+++ b/src/mame/drivers/deniam.c
@@ -32,6 +32,7 @@ Notes:
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/m68000/m68000.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 b1de04de9e1..6204b16da2a 100644
--- a/src/mame/drivers/destroyr.c
+++ b/src/mame/drivers/destroyr.c
@@ -5,6 +5,7 @@ Atari Destroyer Driver
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/m6800/m6800.h"
 #include "deprecat.h"
 
 extern VIDEO_UPDATE( destroyr );
diff --git a/src/mame/drivers/dgpix.c b/src/mame/drivers/dgpix.c
index 075528880cf..55fab038966 100644
--- a/src/mame/drivers/dgpix.c
+++ b/src/mame/drivers/dgpix.c
@@ -50,6 +50,7 @@
 *********************************************************************/
 
 #include "driver.h"
+#include "cpu/e132xs/e132xs.h"
 
 static UINT32 *vram;
 static int vbuffer = 0;
diff --git a/src/mame/drivers/dietgo.c b/src/mame/drivers/dietgo.c
index b4af9269066..1613e343194 100644
--- a/src/mame/drivers/dietgo.c
+++ b/src/mame/drivers/dietgo.c
@@ -5,6 +5,7 @@
 */
 
 #include "driver.h"
+#include "cpu/m68000/m68000.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 e669fc926be..d317f46b591 100644
--- a/src/mame/drivers/discoboy.c
+++ b/src/mame/drivers/discoboy.c
@@ -36,6 +36,7 @@ Notes:
 
 
 #include "driver.h"
+#include "cpu/z80/z80.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 a4c2ecf3ceb..852301589fb 100644
--- a/src/mame/drivers/diverboy.c
+++ b/src/mame/drivers/diverboy.c
@@ -47,6 +47,8 @@
 */
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
+#include "cpu/m68000/m68000.h"
 #include "sound/okim6295.h"
 
 extern UINT16 *diverboy_spriteram;
diff --git a/src/mame/drivers/dkong.c b/src/mame/drivers/dkong.c
index 65d0098ed0f..91cdd480500 100644
--- a/src/mame/drivers/dkong.c
+++ b/src/mame/drivers/dkong.c
@@ -299,6 +299,7 @@ Donkey Kong Junior Notes
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "cpu/s2650/s2650.h"
 #include "cpu/m6502/m6502.h"
 #include "includes/dkong.h"
diff --git a/src/mame/drivers/dlair.c b/src/mame/drivers/dlair.c
index 666e1837b6f..66fda4756ed 100644
--- a/src/mame/drivers/dlair.c
+++ b/src/mame/drivers/dlair.c
@@ -33,6 +33,7 @@
 *************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "render.h"
 #include "cpu/z80/z80daisy.h"
 #include "machine/laserdsc.h"
diff --git a/src/mame/drivers/dmndrby.c b/src/mame/drivers/dmndrby.c
index 8f5e730a98a..8e232dea056 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 "cpu/z80/z80.h"
 
 static UINT8* dderby_vid;
 
diff --git a/src/mame/drivers/docastle.c b/src/mame/drivers/docastle.c
index 0dbd3f75843..feed08a6629 100644
--- a/src/mame/drivers/docastle.c
+++ b/src/mame/drivers/docastle.c
@@ -153,6 +153,7 @@ Dip locations verified with manual for docastle, dorunrun and dowild.
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "deprecat.h"
 #include "sound/msm5205.h"
 #include "sound/sn76496.h"
diff --git a/src/mame/drivers/dogfgt.c b/src/mame/drivers/dogfgt.c
index 497df86b929..3c71f2491af 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 "cpu/m6502/m6502.h"
 #include "deprecat.h"
 #include "dogfgt.h"
 #include "sound/ay8910.h"
diff --git a/src/mame/drivers/dooyong.c b/src/mame/drivers/dooyong.c
index 7040e7108f6..a4c85802082 100644
--- a/src/mame/drivers/dooyong.c
+++ b/src/mame/drivers/dooyong.c
@@ -50,6 +50,8 @@ Flying Tiger
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
+#include "cpu/m68000/m68000.h"
 #include "deprecat.h"
 #include "sound/2203intf.h"
 #include "sound/2151intf.h"
diff --git a/src/mame/drivers/dorachan.c b/src/mame/drivers/dorachan.c
index 22d6e03a53e..d38e848da24 100644
--- a/src/mame/drivers/dorachan.c
+++ b/src/mame/drivers/dorachan.c
@@ -9,6 +9,7 @@ Todo:
 */
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "deprecat.h"
 
 
diff --git a/src/mame/drivers/dragrace.c b/src/mame/drivers/dragrace.c
index cb5a7d47680..841fa8ff6f9 100644
--- a/src/mame/drivers/dragrace.c
+++ b/src/mame/drivers/dragrace.c
@@ -5,6 +5,7 @@ Atari Drag Race Driver
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/m6800/m6800.h"
 #include "deprecat.h"
 #include "dragrace.h"
 #include "sound/discrete.h"
diff --git a/src/mame/drivers/dreamwld.c b/src/mame/drivers/dreamwld.c
index 4d25a518742..f5e17509560 100644
--- a/src/mame/drivers/dreamwld.c
+++ b/src/mame/drivers/dreamwld.c
@@ -82,6 +82,7 @@ Stephh's notes (based on the game M68EC020 code and some tests) :
 */
 
 #include "driver.h"
+#include "cpu/m68000/m68000.h"
 #include "sound/okim6295.h"
 
 #define MASTER_CLOCK 32000000
diff --git a/src/mame/drivers/drgnmst.c b/src/mame/drivers/drgnmst.c
index b49a05a66da..f450dc4fb76 100644
--- a/src/mame/drivers/drgnmst.c
+++ b/src/mame/drivers/drgnmst.c
@@ -35,6 +35,7 @@ Notes:
 */
 
 #include "driver.h"
+#include "cpu/m68000/m68000.h"
 #include "cpu/pic16c5x/pic16c5x.h"
 #include "sound/okim6295.h"
 #include "includes/drgnmst.h"
diff --git a/src/mame/drivers/dribling.c b/src/mame/drivers/dribling.c
index de390d5875e..ed1648363ca 100644
--- a/src/mame/drivers/dribling.c
+++ b/src/mame/drivers/dribling.c
@@ -26,6 +26,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "machine/8255ppi.h"
 #include "dribling.h"
 
diff --git a/src/mame/drivers/drmicro.c b/src/mame/drivers/drmicro.c
index 69ae21a50ca..10996dbb157 100644
--- a/src/mame/drivers/drmicro.c
+++ b/src/mame/drivers/drmicro.c
@@ -9,6 +9,7 @@ Quite similar to Appoooh
 *****************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "sound/msm5205.h"
 #include "sound/sn76496.h"
 
diff --git a/src/mame/drivers/drtomy.c b/src/mame/drivers/drtomy.c
index 9e6602fada6..cc567e2c243 100644
--- a/src/mame/drivers/drtomy.c
+++ b/src/mame/drivers/drtomy.c
@@ -8,6 +8,7 @@ similar hardware.
 */
 
 #include "driver.h"
+#include "cpu/m68000/m68000.h"
 #include "sound/okim6295.h"
 
 static UINT16 *drtomy_spriteram;
diff --git a/src/mame/drivers/dunhuang.c b/src/mame/drivers/dunhuang.c
index 0e4dfc18e18..93d206cffc2 100644
--- a/src/mame/drivers/dunhuang.c
+++ b/src/mame/drivers/dunhuang.c
@@ -50,6 +50,7 @@ Notes:
 *********************************************************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "sound/ay8910.h"
 #include "sound/okim6295.h"
 #include "sound/2413intf.h"
diff --git a/src/mame/drivers/dynadice.c b/src/mame/drivers/dynadice.c
index 3bcf4757a78..0b9ad5ea1f3 100644
--- a/src/mame/drivers/dynadice.c
+++ b/src/mame/drivers/dynadice.c
@@ -32,6 +32,8 @@ dy_6.bin (near Z80)
 */
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
+#include "cpu/i8085/i8085.h"
 #include "sound/ay8910.h"
 
 static tilemap *bg_tilemap,*top_tilemap;
diff --git a/src/mame/drivers/dynax.c b/src/mame/drivers/dynax.c
index a007a840128..a6a0aff5fb7 100644
--- a/src/mame/drivers/dynax.c
+++ b/src/mame/drivers/dynax.c
@@ -71,6 +71,7 @@ TODO:
 *********************************************************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "deprecat.h"
 #include "includes/dynax.h"
 #include "cpu/tlcs90/tlcs90.h"
diff --git a/src/mame/drivers/dynduke.c b/src/mame/drivers/dynduke.c
index 143a4654946..8cdc9fbaa43 100644
--- a/src/mame/drivers/dynduke.c
+++ b/src/mame/drivers/dynduke.c
@@ -63,6 +63,7 @@ Also, implemented conditional port for Coin Mode (SW1:1)
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/nec/necintrf.h"
 #include "cpu/z80/z80.h"
 #include "audio/seibu.h"
 #include "sound/3812intf.h"
diff --git a/src/mame/drivers/egghunt.c b/src/mame/drivers/egghunt.c
index fbc54d10394..7ed506e7061 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 "cpu/z80/z80.h"
 #include "sound/okim6295.h"
 
 static UINT8 *egghunt_bgram;
diff --git a/src/mame/drivers/enigma2.c b/src/mame/drivers/enigma2.c
index 7e4e361bdfb..5601dd21c13 100644
--- a/src/mame/drivers/enigma2.c
+++ b/src/mame/drivers/enigma2.c
@@ -19,6 +19,8 @@ TODO:
 *********************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
+#include "cpu/i8085/i8085.h"
 #include "deprecat.h"
 #include "sound/ay8910.h"
 
diff --git a/src/mame/drivers/eolith.c b/src/mame/drivers/eolith.c
index eaf6302bc9c..109dd8b4a2f 100644
--- a/src/mame/drivers/eolith.c
+++ b/src/mame/drivers/eolith.c
@@ -52,6 +52,7 @@
  *********************************************************************/
 
 #include "driver.h"
+#include "cpu/e132xs/e132xs.h"
 #include "deprecat.h"
 #include "machine/eeprom.h"
 
diff --git a/src/mame/drivers/eolith16.c b/src/mame/drivers/eolith16.c
index 7569d71fc1d..23c8380cc3f 100644
--- a/src/mame/drivers/eolith16.c
+++ b/src/mame/drivers/eolith16.c
@@ -10,6 +10,7 @@
 **********************************************************************/
 
 #include "driver.h"
+#include "cpu/e132xs/e132xs.h"
 #include "deprecat.h"
 #include "machine/eeprom.h"
 #include "sound/okim6295.h"
diff --git a/src/mame/drivers/epos.c b/src/mame/drivers/epos.c
index 94d4c64ee5b..f217d5dfe63 100644
--- a/src/mame/drivers/epos.c
+++ b/src/mame/drivers/epos.c
@@ -29,6 +29,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "machine/8255ppi.h"
 #include "sound/ay8910.h"
 #include "epos.h"
diff --git a/src/mame/drivers/eprom.c b/src/mame/drivers/eprom.c
index ff01860ea29..07b8ce82dd9 100644
--- a/src/mame/drivers/eprom.c
+++ b/src/mame/drivers/eprom.c
@@ -24,6 +24,7 @@
 
 
 #include "driver.h"
+#include "cpu/m68000/m68000.h"
 #include "machine/atarigen.h"
 #include "audio/atarijsa.h"
 #include "eprom.h"
diff --git a/src/mame/drivers/equites.c b/src/mame/drivers/equites.c
index 0e887d1f89b..a1ebf019131 100644
--- a/src/mame/drivers/equites.c
+++ b/src/mame/drivers/equites.c
@@ -364,6 +364,8 @@ D
 // Directives
 
 #include "driver.h"
+#include "cpu/m68000/m68000.h"
+#include "cpu/alph8201/alph8201.h"
 #include "deprecat.h"
 #include "cpu/i8085/i8085.h"
 #include "sound/ay8910.h"
diff --git a/src/mame/drivers/esd16.c b/src/mame/drivers/esd16.c
index 6fbbbc338f9..00e232499cc 100644
--- a/src/mame/drivers/esd16.c
+++ b/src/mame/drivers/esd16.c
@@ -41,6 +41,8 @@ Head Panic
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
+#include "cpu/m68000/m68000.h"
 #include "deprecat.h"
 #include "machine/eeprom.h"
 #include "sound/okim6295.h"
diff --git a/src/mame/drivers/esh.c b/src/mame/drivers/esh.c
index 0e424c5dfe9..79bfb7e0e74 100644
--- a/src/mame/drivers/esh.c
+++ b/src/mame/drivers/esh.c
@@ -23,6 +23,7 @@ Todo:
 */
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "machine/laserdsc.h"
 
 /* From daphne */
diff --git a/src/mame/drivers/ettrivia.c b/src/mame/drivers/ettrivia.c
index 8797e6f7a9c..69581fdd9de 100644
--- a/src/mame/drivers/ettrivia.c
+++ b/src/mame/drivers/ettrivia.c
@@ -25,6 +25,7 @@ Notes:
 */
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "sound/ay8910.h"
 
 /* it uses the same palette layout as in naughtyb */
diff --git a/src/mame/drivers/exedexes.c b/src/mame/drivers/exedexes.c
index 8ecfa20856f..0941abe61a8 100644
--- a/src/mame/drivers/exedexes.c
+++ b/src/mame/drivers/exedexes.c
@@ -10,6 +10,7 @@ Notes:
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "deprecat.h"
 #include "sound/ay8910.h"
 #include "sound/sn76496.h"
diff --git a/src/mame/drivers/exerion.c b/src/mame/drivers/exerion.c
index 2b4e1df5934..1f3f553b88e 100644
--- a/src/mame/drivers/exerion.c
+++ b/src/mame/drivers/exerion.c
@@ -14,6 +14,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "exerion.h"
 #include "sound/ay8910.h"
 
diff --git a/src/mame/drivers/exidy.c b/src/mame/drivers/exidy.c
index 8c7772d0658..fc2a7abb64b 100644
--- a/src/mame/drivers/exidy.c
+++ b/src/mame/drivers/exidy.c
@@ -126,6 +126,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/m6502/m6502.h"
 #include "deprecat.h"
 #include "exidy.h"
 #include "targ.h"
diff --git a/src/mame/drivers/exidy440.c b/src/mame/drivers/exidy440.c
index 463abe469a7..c98a357b0c0 100644
--- a/src/mame/drivers/exidy440.c
+++ b/src/mame/drivers/exidy440.c
@@ -215,6 +215,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/m6809/m6809.h"
 #include "exidy440.h"
 
 
diff --git a/src/mame/drivers/expro02.c b/src/mame/drivers/expro02.c
index 588cba2445b..bce99bc9165 100644
--- a/src/mame/drivers/expro02.c
+++ b/src/mame/drivers/expro02.c
@@ -145,6 +145,7 @@ the layer is misplaced however, different scroll regs?
 */
 
 #include "driver.h"
+#include "cpu/m68000/m68000.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 04e423abf27..3a4f053b9a5 100644
--- a/src/mame/drivers/exprraid.c
+++ b/src/mame/drivers/exprraid.c
@@ -209,6 +209,7 @@ Stephh's notes (based on the games M6502 code and some tests) :
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/m6502/m6502.h"
 #include "cpu/m6809/m6809.h"
 #include "sound/2203intf.h"
 #include "sound/3812intf.h"
diff --git a/src/mame/drivers/exzisus.c b/src/mame/drivers/exzisus.c
index 31f6464ef86..a755613e74d 100644
--- a/src/mame/drivers/exzisus.c
+++ b/src/mame/drivers/exzisus.c
@@ -28,6 +28,7 @@ TODO:
 ****************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "taitoipt.h"
 #include "audio/taitosnd.h"
 #include "sound/2151intf.h"
diff --git a/src/mame/drivers/f-32.c b/src/mame/drivers/f-32.c
index 32b33450fd1..724c2b2976c 100644
--- a/src/mame/drivers/f-32.c
+++ b/src/mame/drivers/f-32.c
@@ -12,6 +12,7 @@
 *********************************************************************/
 
 #include "driver.h"
+#include "cpu/e132xs/e132xs.h"
 #include "machine/eeprom.h"
 #include "sound/2151intf.h"
 #include "sound/okim6295.h"
diff --git a/src/mame/drivers/f1gp.c b/src/mame/drivers/f1gp.c
index ce6f4c55c28..97992bb21a2 100644
--- a/src/mame/drivers/f1gp.c
+++ b/src/mame/drivers/f1gp.c
@@ -20,6 +20,8 @@ f1gp2:
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
+#include "cpu/m68000/m68000.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 50aa9c58cd4..e1317ca66cd 100644
--- a/src/mame/drivers/fantland.c
+++ b/src/mame/drivers/fantland.c
@@ -44,6 +44,10 @@ Year + Game             Main CPU    Sound CPU    Sound            Video
 ***************************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
+#include "cpu/nec/necintrf.h"
+#include "cpu/i86/i88intf.h"
+#include "cpu/i86/i86intf.h"
 #include "sound/2151intf.h"
 #include "sound/3812intf.h"
 #include "sound/dac.h"
diff --git a/src/mame/drivers/fastfred.c b/src/mame/drivers/fastfred.c
index 8c81868030e..9b34d141f52 100644
--- a/src/mame/drivers/fastfred.c
+++ b/src/mame/drivers/fastfred.c
@@ -6,6 +6,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "deprecat.h"
 #include "fastfred.h"
 #include "sound/ay8910.h"
diff --git a/src/mame/drivers/fcombat.c b/src/mame/drivers/fcombat.c
index 790982babda..6530191750e 100644
--- a/src/mame/drivers/fcombat.c
+++ b/src/mame/drivers/fcombat.c
@@ -29,6 +29,7 @@ inputs + notes by stephh
 */
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "sound/ay8910.h"
 
 
diff --git a/src/mame/drivers/fcrash.c b/src/mame/drivers/fcrash.c
index 543e738a123..938fb388e59 100644
--- a/src/mame/drivers/fcrash.c
+++ b/src/mame/drivers/fcrash.c
@@ -33,6 +33,7 @@ from 2.bin to 9.bin program eproms
 */
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "cpu/m68000/m68000.h"
 #include "cps1.h"
 #include "sound/2203intf.h"
diff --git a/src/mame/drivers/fgoal.c b/src/mame/drivers/fgoal.c
index b69319b12f3..992319e9162 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 "cpu/m6800/m6800.h"
 #include "includes/fgoal.h"
 
 UINT8* fgoal_video_ram;
diff --git a/src/mame/drivers/filetto.c b/src/mame/drivers/filetto.c
index ed94c658cad..7c7cd63ad9f 100644
--- a/src/mame/drivers/filetto.c
+++ b/src/mame/drivers/filetto.c
@@ -64,6 +64,7 @@ AH
 ******************************************************************************************/
 
 #include "driver.h"
+#include "cpu/i86/i88intf.h"
 #include "video/generic.h"
 #include "machine/pit8253.h"
 #include "machine/8255ppi.h"
diff --git a/src/mame/drivers/findout.c b/src/mame/drivers/findout.c
index 3361d961f2d..4c0d97cafbc 100644
--- a/src/mame/drivers/findout.c
+++ b/src/mame/drivers/findout.c
@@ -13,6 +13,7 @@ replaced by a 6th button to start games. This is a feature of the PCB for privat
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "machine/8255ppi.h"
 #include "machine/ticket.h"
 #include "sound/dac.h"
diff --git a/src/mame/drivers/firebeat.c b/src/mame/drivers/firebeat.c
index d534177a3d5..daa113ff041 100644
--- a/src/mame/drivers/firebeat.c
+++ b/src/mame/drivers/firebeat.c
@@ -109,6 +109,7 @@
 */
 
 #include "driver.h"
+#include "cpu/m68000/m68000.h"
 #include "deprecat.h"
 #include "cpu/powerpc/ppc.h"
 #include "machine/intelfsh.h"
diff --git a/src/mame/drivers/firetrap.c b/src/mame/drivers/firetrap.c
index 260d61b3e34..5b3796f0140 100644
--- a/src/mame/drivers/firetrap.c
+++ b/src/mame/drivers/firetrap.c
@@ -57,6 +57,7 @@ write:
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "deprecat.h"
 #include "cpu/m6502/m6502.h"
 #include "sound/3812intf.h"
diff --git a/src/mame/drivers/firetrk.c b/src/mame/drivers/firetrk.c
index cddeffc0364..efabcf07748 100644
--- a/src/mame/drivers/firetrk.c
+++ b/src/mame/drivers/firetrk.c
@@ -6,6 +6,7 @@ Atari Fire Truck + Super Bug + Monte Carlo driver
 
 
 #include "driver.h"
+#include "cpu/m6800/m6800.h"
 #include "firetrk.h"
 #include "sound/discrete.h"
 
diff --git a/src/mame/drivers/fitfight.c b/src/mame/drivers/fitfight.c
index 65efe07d282..46036fd10b0 100644
--- a/src/mame/drivers/fitfight.c
+++ b/src/mame/drivers/fitfight.c
@@ -82,6 +82,7 @@ Stephh's notes :
 */
 
 #include "driver.h"
+#include "cpu/m68000/m68000.h"
 #include "cpu/upd7810/upd7810.h"
 #include "sound/okim6295.h"
 #include "includes/fitfight.h"
diff --git a/src/mame/drivers/flower.c b/src/mame/drivers/flower.c
index 0f2cff1cdaf..d2728eb21a3 100644
--- a/src/mame/drivers/flower.c
+++ b/src/mame/drivers/flower.c
@@ -70,6 +70,7 @@ CHIP #  POSITION   TYPE
 */
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "deprecat.h"
 #include "includes/flower.h"
 
diff --git a/src/mame/drivers/flyball.c b/src/mame/drivers/flyball.c
index 4780ba46a8c..f89ff316fe0 100644
--- a/src/mame/drivers/flyball.c
+++ b/src/mame/drivers/flyball.c
@@ -5,6 +5,7 @@ Atari Flyball Driver
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/m6502/m6502.h"
 
 #define MASTER_CLOCK ( XTAL_12_096MHz )
 
diff --git a/src/mame/drivers/foodf.c b/src/mame/drivers/foodf.c
index b4d6f953f7d..a6183bb1ac9 100644
--- a/src/mame/drivers/foodf.c
+++ b/src/mame/drivers/foodf.c
@@ -74,6 +74,7 @@
 
 
 #include "driver.h"
+#include "cpu/m68000/m68000.h"
 #include "machine/atarigen.h"
 #include "sound/pokey.h"
 #include "foodf.h"
diff --git a/src/mame/drivers/fortecar.c b/src/mame/drivers/fortecar.c
index 717807c8bf0..5364add8835 100644
--- a/src/mame/drivers/fortecar.c
+++ b/src/mame/drivers/fortecar.c
@@ -24,6 +24,7 @@ dip 1X8
 */
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "machine/eeprom.h"
 #include "sound/ay8910.h"
 #include "machine/8255ppi.h"
diff --git a/src/mame/drivers/freekick.c b/src/mame/drivers/freekick.c
index 14e915e5a55..01a990548ae 100644
--- a/src/mame/drivers/freekick.c
+++ b/src/mame/drivers/freekick.c
@@ -26,6 +26,7 @@ TODO:
 */
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "machine/8255ppi.h"
 #include "machine/mc8123.h"
 #include "sound/sn76496.h"
diff --git a/src/mame/drivers/funkybee.c b/src/mame/drivers/funkybee.c
index 20b78010809..84a55e45e9c 100644
--- a/src/mame/drivers/funkybee.c
+++ b/src/mame/drivers/funkybee.c
@@ -72,6 +72,7 @@ Stephh's notes (based on the games Z80 code and some tests) :
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "sound/ay8910.h"
 
 
diff --git a/src/mame/drivers/funkyjet.c b/src/mame/drivers/funkyjet.c
index c97739f8172..ccad7b4e2f5 100644
--- a/src/mame/drivers/funkyjet.c
+++ b/src/mame/drivers/funkyjet.c
@@ -88,6 +88,7 @@ Notes:
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/m68000/m68000.h"
 #include "cpu/h6280/h6280.h"
 #include "sound/2151intf.h"
 #include "sound/okim6295.h"
diff --git a/src/mame/drivers/funworld.c b/src/mame/drivers/funworld.c
index 505048e8761..27acd328f8f 100644
--- a/src/mame/drivers/funworld.c
+++ b/src/mame/drivers/funworld.c
@@ -1020,6 +1020,7 @@
 #define MASTER_CLOCK	XTAL_16MHz
 
 #include "driver.h"
+#include "cpu/m6502/m6502.h"
 #include "video/mc6845.h"
 #include "machine/6821pia.h"
 #include "sound/ay8910.h"
diff --git a/src/mame/drivers/funybubl.c b/src/mame/drivers/funybubl.c
index 142e6102625..72c261291cd 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 "cpu/z80/z80.h"
 #include "sound/okim6295.h"
 
 /* video/funybubl.c */
diff --git a/src/mame/drivers/fuukifg2.c b/src/mame/drivers/fuukifg2.c
index e1c8d03147a..a0f42191c23 100644
--- a/src/mame/drivers/fuukifg2.c
+++ b/src/mame/drivers/fuukifg2.c
@@ -35,6 +35,8 @@ To Do:
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
+#include "cpu/m68000/m68000.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 b1fb1c62058..9ecd9cdea82 100644
--- a/src/mame/drivers/fuukifg3.c
+++ b/src/mame/drivers/fuukifg3.c
@@ -158,6 +158,8 @@ FG-3J ROM-J 507KA0301P04       Rev:1.3
 
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
+#include "cpu/m68000/m68000.h"
 #include "sound/262intf.h"
 #include "sound/ymf278b.h"
 
diff --git a/src/mame/drivers/gaelco3d.c b/src/mame/drivers/gaelco3d.c
index 87e99863ec6..4f469f42d58 100644
--- a/src/mame/drivers/gaelco3d.c
+++ b/src/mame/drivers/gaelco3d.c
@@ -143,6 +143,7 @@ REF. 970429
 **************************************************************************/
 
 #include "driver.h"
+#include "cpu/m68000/m68000.h"
 #include "gaelco3d.h"
 #include "cpu/tms32031/tms32031.h"
 #include "cpu/adsp2100/adsp2100.h"
diff --git a/src/mame/drivers/gal3.c b/src/mame/drivers/gal3.c
index f568f9227f8..fbcd650df7b 100644
--- a/src/mame/drivers/gal3.c
+++ b/src/mame/drivers/gal3.c
@@ -68,6 +68,7 @@ better notes (complete chip lists) for each board still needed
 */
 
 #include "driver.h"
+#include "cpu/m68000/m68000.h"
 
 VIDEO_START(gal3)
 {
diff --git a/src/mame/drivers/galaga.c b/src/mame/drivers/galaga.c
index 7dce653bd37..671144ab8dd 100644
--- a/src/mame/drivers/galaga.c
+++ b/src/mame/drivers/galaga.c
@@ -695,6 +695,8 @@ TODO:
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
+#include "cpu/mb88xx/mb88xx.h"
 #include "machine/atari_vg.h"
 #include "machine/namcoio.h"
 #include "machine/namco50.h"
diff --git a/src/mame/drivers/galaxi.c b/src/mame/drivers/galaxi.c
index 812726d410f..d5ba7d94478 100644
--- a/src/mame/drivers/galaxi.c
+++ b/src/mame/drivers/galaxi.c
@@ -40,6 +40,7 @@ Notes:
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/m68000/m68000.h"
 #include "sound/okim6295.h"
 #include "galaxi.lh"
 
diff --git a/src/mame/drivers/galivan.c b/src/mame/drivers/galivan.c
index 9dc4574837f..4883453143f 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 "cpu/z80/z80.h"
 #include "sound/dac.h"
 #include "sound/3812intf.h"
 
diff --git a/src/mame/drivers/galpani2.c b/src/mame/drivers/galpani2.c
index 9b2ac9112a1..85dfe030ddf 100644
--- a/src/mame/drivers/galpani2.c
+++ b/src/mame/drivers/galpani2.c
@@ -22,6 +22,7 @@ To Do:
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/m68000/m68000.h"
 #include "deprecat.h"
 #include "machine/eeprom.h"
 #include "kaneko16.h"
diff --git a/src/mame/drivers/galpani3.c b/src/mame/drivers/galpani3.c
index 2a8ce0549b2..e0c632ebf76 100644
--- a/src/mame/drivers/galpani3.c
+++ b/src/mame/drivers/galpani3.c
@@ -64,6 +64,7 @@ Dumped by Uki
 */
 
 #include "driver.h"
+#include "cpu/m68000/m68000.h"
 #include "deprecat.h"
 #include "sound/ymz280b.h"
 #include "includes/suprnova.h"
diff --git a/src/mame/drivers/galpanic.c b/src/mame/drivers/galpanic.c
index ff02fdfc4e2..6dbef3d4cad 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 "cpu/m68000/m68000.h"
 #include "deprecat.h"
 #include "includes/kaneko16.h"
 #include "sound/okim6295.h"
diff --git a/src/mame/drivers/galspnbl.c b/src/mame/drivers/galspnbl.c
index 64f5be91e17..2d96b82343c 100644
--- a/src/mame/drivers/galspnbl.c
+++ b/src/mame/drivers/galspnbl.c
@@ -19,6 +19,7 @@ TODO:
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/m68000/m68000.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 92d0cc7e1fd..8092570f885 100644
--- a/src/mame/drivers/gamecstl.c
+++ b/src/mame/drivers/gamecstl.c
@@ -60,6 +60,7 @@
 */
 
 #include "driver.h"
+#include "cpu/i386/i386intf.h"
 #include "memconv.h"
 #include "devconv.h"
 #include "deprecat.h"
diff --git a/src/mame/drivers/gameplan.c b/src/mame/drivers/gameplan.c
index e58943da2e4..bf2688675f5 100644
--- a/src/mame/drivers/gameplan.c
+++ b/src/mame/drivers/gameplan.c
@@ -64,6 +64,7 @@ TODO:
 ****************************************************************************/
 
 #include "driver.h"
+#include "cpu/m6502/m6502.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 a5f25286d9b..1853975fbc9 100644
--- a/src/mame/drivers/gaplus.c
+++ b/src/mame/drivers/gaplus.c
@@ -150,6 +150,7 @@ TODO:
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/m6809/m6809.h"
 #include "machine/namcoio.h"
 #include "sound/namco.h"
 #include "sound/samples.h"
diff --git a/src/mame/drivers/gatron.c b/src/mame/drivers/gatron.c
index 9d7b1ad1586..da951aced2d 100644
--- a/src/mame/drivers/gatron.c
+++ b/src/mame/drivers/gatron.c
@@ -227,6 +227,7 @@
 #define MASTER_CLOCK	XTAL_16MHz
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "sound/sn76496.h"
 #include "machine/8255ppi.h"
 
diff --git a/src/mame/drivers/gauntlet.c b/src/mame/drivers/gauntlet.c
index 4ba8dc3a374..4a3dbb8c123 100644
--- a/src/mame/drivers/gauntlet.c
+++ b/src/mame/drivers/gauntlet.c
@@ -119,6 +119,8 @@
 
 
 #include "driver.h"
+#include "cpu/m68000/m68000.h"
+#include "cpu/m6502/m6502.h"
 #include "machine/atarigen.h"
 #include "sound/5220intf.h"
 #include "sound/2151intf.h"
diff --git a/src/mame/drivers/gberet.c b/src/mame/drivers/gberet.c
index 26dbf3e3d49..e99ff6078a3 100644
--- a/src/mame/drivers/gberet.c
+++ b/src/mame/drivers/gberet.c
@@ -66,6 +66,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "deprecat.h"
 #include "sound/sn76496.h"
 
diff --git a/src/mame/drivers/gbusters.c b/src/mame/drivers/gbusters.c
index 6ea39e2dd98..1aabad338ed 100644
--- a/src/mame/drivers/gbusters.c
+++ b/src/mame/drivers/gbusters.c
@@ -8,6 +8,7 @@ Preliminary driver by:
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.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 229ceb71250..77b21d69b7a 100644
--- a/src/mame/drivers/genesis.c
+++ b/src/mame/drivers/genesis.c
@@ -12,6 +12,8 @@ segac2.c
 */
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
+#include "cpu/m68000/m68000.h"
 #include "genesis.h"
 
 #define MASTER_CLOCK		53693100
diff --git a/src/mame/drivers/getrivia.c b/src/mame/drivers/getrivia.c
index b6718092d71..8c515d7f310 100644
--- a/src/mame/drivers/getrivia.c
+++ b/src/mame/drivers/getrivia.c
@@ -79,6 +79,7 @@ NOTE: Series 8 and above are version 1.03a (currently in findout.c)
 */
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "machine/8255ppi.h"
 #include "machine/ticket.h"
 #include "sound/dac.h"
diff --git a/src/mame/drivers/ghosteo.c b/src/mame/drivers/ghosteo.c
index 37efe6463f4..7e5fd4ac170 100644
--- a/src/mame/drivers/ghosteo.c
+++ b/src/mame/drivers/ghosteo.c
@@ -52,6 +52,7 @@ Hopper, Ticket Counter, Prize System (Option)
 */
 
 #include "driver.h"
+#include "cpu/arm7/arm7.h"
 #include "cpu/arm7/arm7core.h"
 
 static UINT32 *system_memory;
diff --git a/src/mame/drivers/gijoe.c b/src/mame/drivers/gijoe.c
index f0fa0d65a2e..8b95904425e 100644
--- a/src/mame/drivers/gijoe.c
+++ b/src/mame/drivers/gijoe.c
@@ -37,6 +37,7 @@ Known Issues
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/m68000/m68000.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 3e95c275a98..a26c38050ca 100644
--- a/src/mame/drivers/ginganin.c
+++ b/src/mame/drivers/ginganin.c
@@ -49,6 +49,8 @@ f5d6    print 7 digit BCD number: d0.l to (a1)+ color $3000
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/m6809/m6809.h"
+#include "cpu/m68000/m68000.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 83b5b434c88..6f82a3f637b 100644
--- a/src/mame/drivers/gladiatr.c
+++ b/src/mame/drivers/gladiatr.c
@@ -182,6 +182,7 @@ TODO:
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/m6809/m6809.h"
 #include "machine/tait8741.h"
 #include "cpu/z80/z80.h"
 #include "sound/2203intf.h"
diff --git a/src/mame/drivers/gng.c b/src/mame/drivers/gng.c
index 94cdda4b66d..e29e0fe75e5 100644
--- a/src/mame/drivers/gng.c
+++ b/src/mame/drivers/gng.c
@@ -21,6 +21,7 @@ Notes:
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "deprecat.h"
 #include "cpu/m6809/m6809.h"
 #include "sound/2203intf.h"
diff --git a/src/mame/drivers/go2000.c b/src/mame/drivers/go2000.c
index 7684c5e9a62..c406114f3ef 100644
--- a/src/mame/drivers/go2000.c
+++ b/src/mame/drivers/go2000.c
@@ -22,6 +22,7 @@ Added Dips and Dip locations based on Service Mode.
 */
 
 #include "driver.h"
+#include "cpu/m68000/m68000.h"
 
 static UINT16* go2000_video;
 static UINT16* go2000_video2;
diff --git a/src/mame/drivers/goal92.c b/src/mame/drivers/goal92.c
index 8cfe0073ddb..868058f4869 100644
--- a/src/mame/drivers/goal92.c
+++ b/src/mame/drivers/goal92.c
@@ -8,6 +8,8 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
+#include "cpu/m68000/m68000.h"
 #include "sound/2203intf.h"
 #include "sound/okim6295.h"
 #include "sound/msm5205.h"
diff --git a/src/mame/drivers/goindol.c b/src/mame/drivers/goindol.c
index 385845370bd..6af5e3e71e4 100644
--- a/src/mame/drivers/goindol.c
+++ b/src/mame/drivers/goindol.c
@@ -18,6 +18,7 @@ Notes:
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "deprecat.h"
 #include "sound/2203intf.h"
 
diff --git a/src/mame/drivers/goldnpkr.c b/src/mame/drivers/goldnpkr.c
index 35acce80189..54061b7c3a1 100644
--- a/src/mame/drivers/goldnpkr.c
+++ b/src/mame/drivers/goldnpkr.c
@@ -594,6 +594,7 @@
 #define CPU_CLOCK		(MASTER_CLOCK/16)
 
 #include "driver.h"
+#include "cpu/m6502/m6502.h"
 #include "video/mc6845.h"
 #include "machine/6821pia.h"
 #include "sound/discrete.h"
diff --git a/src/mame/drivers/goldstar.c b/src/mame/drivers/goldstar.c
index 2c2ebdf7b6f..4b155caa52b 100644
--- a/src/mame/drivers/goldstar.c
+++ b/src/mame/drivers/goldstar.c
@@ -11,6 +11,7 @@ driver by Mirko Buffoni
 
 ***************************************************************************/
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "sound/ay8910.h"
 #include "sound/okim6295.h"
 
diff --git a/src/mame/drivers/good.c b/src/mame/drivers/good.c
index 1c9580edf55..353ba578af5 100644
--- a/src/mame/drivers/good.c
+++ b/src/mame/drivers/good.c
@@ -31,6 +31,7 @@ voice.rom - VOICE ROM
 */
 
 #include "driver.h"
+#include "cpu/m68000/m68000.h"
 #include "sound/okim6295.h"
 
 static tilemap *bg_tilemap;
diff --git a/src/mame/drivers/goodejan.c b/src/mame/drivers/goodejan.c
index 7c198b5a258..beb5c6733db 100644
--- a/src/mame/drivers/goodejan.c
+++ b/src/mame/drivers/goodejan.c
@@ -52,6 +52,7 @@ Notes:
 *******************************************************************************************/
 
 #include "driver.h"
+#include "cpu/nec/necintrf.h"
 #include "deprecat.h"
 #include "audio/seibu.h"
 #include "sound/3812intf.h"
diff --git a/src/mame/drivers/gotcha.c b/src/mame/drivers/gotcha.c
index 41d8df92493..756b54a7c6b 100644
--- a/src/mame/drivers/gotcha.c
+++ b/src/mame/drivers/gotcha.c
@@ -58,6 +58,8 @@ Notes:
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
+#include "cpu/m68000/m68000.h"
 #include "sound/2151intf.h"
 #include "sound/okim6295.h"
 
diff --git a/src/mame/drivers/gottlieb.c b/src/mame/drivers/gottlieb.c
index d6a98c63e76..c3616bb0f93 100644
--- a/src/mame/drivers/gottlieb.c
+++ b/src/mame/drivers/gottlieb.c
@@ -177,6 +177,7 @@ VBlank duration: 1/VSYNC * (16/256) = 1017.6 us
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/i86/i88intf.h"
 #include "machine/6532riot.h"
 #include "machine/laserdsc.h"
 #include "sound/ay8910.h"
diff --git a/src/mame/drivers/gotya.c b/src/mame/drivers/gotya.c
index 9ddd7149106..34f0683303c 100644
--- a/src/mame/drivers/gotya.c
+++ b/src/mame/drivers/gotya.c
@@ -34,6 +34,7 @@ TODO: Emulated sound
 ****************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "sound/samples.h"
 #include "includes/gotya.h"
 
diff --git a/src/mame/drivers/gpworld.c b/src/mame/drivers/gpworld.c
index 59a22096629..346f7bfeda8 100644
--- a/src/mame/drivers/gpworld.c
+++ b/src/mame/drivers/gpworld.c
@@ -40,6 +40,7 @@ Dumping Notes:
 
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "machine/laserdsc.h"
 
 /* Assumed to be the same as segald hardware */
diff --git a/src/mame/drivers/gstream.c b/src/mame/drivers/gstream.c
index 03f83fe8cc8..76f06472cd8 100644
--- a/src/mame/drivers/gstream.c
+++ b/src/mame/drivers/gstream.c
@@ -95,6 +95,7 @@
 *********************************************************************/
 
 #include "driver.h"
+#include "cpu/e132xs/e132xs.h"
 #include "sound/okim6295.h"
 
 static UINT32 *gstream_vram;
diff --git a/src/mame/drivers/gstriker.c b/src/mame/drivers/gstriker.c
index 77d0be978d4..0a0e1c0e49d 100644
--- a/src/mame/drivers/gstriker.c
+++ b/src/mame/drivers/gstriker.c
@@ -33,6 +33,8 @@ Merge with other Video System games ?
 ******************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
+#include "cpu/m68000/m68000.h"
 #include "gstriker.h"
 #include "sound/2610intf.h"
 
diff --git a/src/mame/drivers/gticlub.c b/src/mame/drivers/gticlub.c
index aa810dceb68..ae1583f9f9a 100644
--- a/src/mame/drivers/gticlub.c
+++ b/src/mame/drivers/gticlub.c
@@ -219,6 +219,7 @@ Hang Pilot (uses an unknown but similar video board)                12W
 */
 
 #include "driver.h"
+#include "cpu/m68000/m68000.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 a5af9866d76..71ea2aa6add 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 "cpu/z80/z80.h"
 
 static VIDEO_START(gtipoker)
 {
diff --git a/src/mame/drivers/guab.c b/src/mame/drivers/guab.c
index 7d2c7ff0f63..244fe7e64fd 100644
--- a/src/mame/drivers/guab.c
+++ b/src/mame/drivers/guab.c
@@ -20,6 +20,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/m68000/m68000.h"
 #include "machine/6840ptm.h"
 #include "video/tms34061.h"
 #include "sound/sn76496.h"
diff --git a/src/mame/drivers/gumbo.c b/src/mame/drivers/gumbo.c
index c66c54c57de..1473729237d 100644
--- a/src/mame/drivers/gumbo.c
+++ b/src/mame/drivers/gumbo.c
@@ -42,6 +42,7 @@ PCB Layout
 */
 
 #include "driver.h"
+#include "cpu/m68000/m68000.h"
 #include "sound/okim6295.h"
 
 UINT16 *gumbo_bg_videoram;
diff --git a/src/mame/drivers/gundealr.c b/src/mame/drivers/gundealr.c
index efd37716102..502525983bd 100644
--- a/src/mame/drivers/gundealr.c
+++ b/src/mame/drivers/gundealr.c
@@ -47,6 +47,7 @@ Runs in interrupt mode 0, the interrupt vectors are 0xcf (RST 08h) and
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "deprecat.h"
 #include "sound/2203intf.h"
 
diff --git a/src/mame/drivers/gunpey.c b/src/mame/drivers/gunpey.c
index 36704f43435..0916b8e0572 100644
--- a/src/mame/drivers/gunpey.c
+++ b/src/mame/drivers/gunpey.c
@@ -46,6 +46,7 @@ Notes:
 */
 
 #include "driver.h"
+#include "cpu/nec/necintrf.h"
 
 static UINT16 *unkram;
 static UINT16 *mainram;
diff --git a/src/mame/drivers/gunsmoke.c b/src/mame/drivers/gunsmoke.c
index 15e3c653984..e33f15780c8 100644
--- a/src/mame/drivers/gunsmoke.c
+++ b/src/mame/drivers/gunsmoke.c
@@ -67,6 +67,7 @@ Stephh's notes (based on the games Z80 code and some tests) :
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "deprecat.h"
 #include "sound/2203intf.h"
 
diff --git a/src/mame/drivers/gyruss.c b/src/mame/drivers/gyruss.c
index a95e6fc09af..98d9afa0cd1 100644
--- a/src/mame/drivers/gyruss.c
+++ b/src/mame/drivers/gyruss.c
@@ -56,6 +56,8 @@ and 1 SFX channel controlled by an 8039:
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
+#include "cpu/m6809/m6809.h"
 #include "machine/konami1.h"
 #include "cpu/mcs48/mcs48.h"
 #include "sound/ay8910.h"
diff --git a/src/mame/drivers/halleys.c b/src/mame/drivers/halleys.c
index 1c06fc92d0c..946530e5f8d 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 "cpu/z80/z80.h"
 #include "taitoipt.h"
 #include "deprecat.h"
 #include "cpu/m6809/m6809.h"
diff --git a/src/mame/drivers/hanaawas.c b/src/mame/drivers/hanaawas.c
index 8a1a1fae453..c99fc04b116 100644
--- a/src/mame/drivers/hanaawas.c
+++ b/src/mame/drivers/hanaawas.c
@@ -26,6 +26,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "sound/ay8910.h"
 
 
diff --git a/src/mame/drivers/hanaroku.c b/src/mame/drivers/hanaroku.c
index 1a6388a7f49..24498a35487 100644
--- a/src/mame/drivers/hanaroku.c
+++ b/src/mame/drivers/hanaroku.c
@@ -11,6 +11,7 @@ TODO:
 */
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "sound/ay8910.h"
 
 /* video */
diff --git a/src/mame/drivers/harddriv.c b/src/mame/drivers/harddriv.c
index 76fba256cee..25a2155259f 100644
--- a/src/mame/drivers/harddriv.c
+++ b/src/mame/drivers/harddriv.c
@@ -204,6 +204,7 @@ A046491
 
 
 #include "driver.h"
+#include "cpu/m68000/m68000.h"
 #include "cpu/tms34010/tms34010.h"
 #include "cpu/tms32010/tms32010.h"
 #include "cpu/adsp2100/adsp2100.h"
diff --git a/src/mame/drivers/hexa.c b/src/mame/drivers/hexa.c
index 989adf29ecd..55b0fdd1fe7 100644
--- a/src/mame/drivers/hexa.c
+++ b/src/mame/drivers/hexa.c
@@ -47,6 +47,7 @@ ROMs x4
 *************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "sound/ay8910.h"
 
 
diff --git a/src/mame/drivers/hexion.c b/src/mame/drivers/hexion.c
index 0a8f8de8611..bf9d10eff12 100644
--- a/src/mame/drivers/hexion.c
+++ b/src/mame/drivers/hexion.c
@@ -79,6 +79,7 @@ Notes:
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "deprecat.h"
 #include "sound/okim6295.h"
 #include "sound/k051649.h"
diff --git a/src/mame/drivers/higemaru.c b/src/mame/drivers/higemaru.c
index b33d1efcb95..d60879a3ebd 100644
--- a/src/mame/drivers/higemaru.c
+++ b/src/mame/drivers/higemaru.c
@@ -11,6 +11,7 @@ Use Player 1 joystick and button, then press START1 to go to next screen.
 ****************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "deprecat.h"
 #include "sound/ay8910.h"
 
diff --git a/src/mame/drivers/hitme.c b/src/mame/drivers/hitme.c
index 38a4e8bcb9e..30fa9d74e4b 100644
--- a/src/mame/drivers/hitme.c
+++ b/src/mame/drivers/hitme.c
@@ -15,6 +15,7 @@
 */
 
 #include "driver.h"
+#include "cpu/i8085/i8085.h"
 #include "hitme.h"
 #include "sound/discrete.h"
 
diff --git a/src/mame/drivers/hnayayoi.c b/src/mame/drivers/hnayayoi.c
index 033966e488e..c2d224649bf 100644
--- a/src/mame/drivers/hnayayoi.c
+++ b/src/mame/drivers/hnayayoi.c
@@ -33,6 +33,7 @@ TODO:
 ****************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "sound/2203intf.h"
 #include "sound/msm5205.h"
 
diff --git a/src/mame/drivers/hng64.c b/src/mame/drivers/hng64.c
index 60134f8d8c6..ba76f6b5381 100644
--- a/src/mame/drivers/hng64.c
+++ b/src/mame/drivers/hng64.c
@@ -458,6 +458,8 @@ or Fatal Fury for example).
 
 #define MASTER_CLOCK	50000000
 #include "driver.h"
+#include "cpu/z80/z80.h"
+#include "cpu/nec/necintrf.h"
 #include "deprecat.h"
 #include "cpu/mips/mips3.h"
 
diff --git a/src/mame/drivers/holeland.c b/src/mame/drivers/holeland.c
index 849480d2ea4..b1ee26ff837 100644
--- a/src/mame/drivers/holeland.c
+++ b/src/mame/drivers/holeland.c
@@ -12,6 +12,7 @@ TODO:
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "sound/ay8910.h"
 
 VIDEO_START( holeland );
diff --git a/src/mame/drivers/homedata.c b/src/mame/drivers/homedata.c
index 33454c8c6c5..7403d63685e 100644
--- a/src/mame/drivers/homedata.c
+++ b/src/mame/drivers/homedata.c
@@ -217,6 +217,7 @@ Custom: GX61A01
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "cpu/m6809/m6809.h"
 #include "cpu/upd7810/upd7810.h"
 #include "homedata.h"
diff --git a/src/mame/drivers/homerun.c b/src/mame/drivers/homerun.c
index e1a50180685..9bc462f09ba 100644
--- a/src/mame/drivers/homerun.c
+++ b/src/mame/drivers/homerun.c
@@ -16,6 +16,7 @@ Todo :
 */
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "machine/8255ppi.h"
 #include "sound/2203intf.h"
 
diff --git a/src/mame/drivers/hornet.c b/src/mame/drivers/hornet.c
index cb98be40f42..7f046d2e563 100644
--- a/src/mame/drivers/hornet.c
+++ b/src/mame/drivers/hornet.c
@@ -308,6 +308,7 @@
 */
 
 #include "driver.h"
+#include "cpu/m68000/m68000.h"
 #include "deprecat.h"
 #include "cpu/powerpc/ppc.h"
 #include "cpu/sharc/sharc.h"
diff --git a/src/mame/drivers/hotblock.c b/src/mame/drivers/hotblock.c
index 9ce74beee51..740768c89c5 100644
--- a/src/mame/drivers/hotblock.c
+++ b/src/mame/drivers/hotblock.c
@@ -42,6 +42,7 @@ so it could be by them instead
 */
 
 #include "driver.h"
+#include "cpu/i86/i88intf.h"
 #include "sound/ay8910.h"
 
 static UINT8 *hotblock_ram;
diff --git a/src/mame/drivers/hshavoc.c b/src/mame/drivers/hshavoc.c
index 0f714e7f3ad..e64abd59fe1 100644
--- a/src/mame/drivers/hshavoc.c
+++ b/src/mame/drivers/hshavoc.c
@@ -35,6 +35,8 @@ Unfortunately it's read protected.
 
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
+#include "cpu/m68000/m68000.h"
 #include "genesis.h"
 
 #define MASTER_CLOCK		53693100
diff --git a/src/mame/drivers/hyhoo.c b/src/mame/drivers/hyhoo.c
index 29ac1cef9cd..24d7176f30c 100644
--- a/src/mame/drivers/hyhoo.c
+++ b/src/mame/drivers/hyhoo.c
@@ -22,6 +22,7 @@ Memo:
 ******************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "nb1413m3.h"
 #include "sound/ay8910.h"
 #include "sound/dac.h"
diff --git a/src/mame/drivers/hyperspt.c b/src/mame/drivers/hyperspt.c
index 6f70cd90c16..9f122989eb7 100644
--- a/src/mame/drivers/hyperspt.c
+++ b/src/mame/drivers/hyperspt.c
@@ -5,6 +5,7 @@ Based on drivers from Juno First emulator by Chris Hardy (chrish@kcbbs.gen.nz)
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "machine/konami1.h"
 #include "cpu/m6809/m6809.h"
 #include "sound/vlm5030.h"
diff --git a/src/mame/drivers/hyprduel.c b/src/mame/drivers/hyprduel.c
index 34a2710fc60..cf384c12755 100644
--- a/src/mame/drivers/hyprduel.c
+++ b/src/mame/drivers/hyprduel.c
@@ -38,6 +38,7 @@ fix comms so it boots, it's a bit of a hack for hyperduel at the moment ;-)
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/m68000/m68000.h"
 #include "deprecat.h"
 #include "sound/2151intf.h"
 #include "sound/okim6295.h"
diff --git a/src/mame/drivers/igs_blit.c b/src/mame/drivers/igs_blit.c
index b31be8ccc13..935fa028534 100644
--- a/src/mame/drivers/igs_blit.c
+++ b/src/mame/drivers/igs_blit.c
@@ -41,6 +41,7 @@ Notes:
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/m68000/m68000.h"
 #include "deprecat.h"
 #include "sound/okim6295.h"
 #include "sound/2413intf.h"
diff --git a/src/mame/drivers/igs_m027.c b/src/mame/drivers/igs_m027.c
index 090c79a0c52..63581f8b1ff 100644
--- a/src/mame/drivers/igs_m027.c
+++ b/src/mame/drivers/igs_m027.c
@@ -15,6 +15,7 @@
 */
 
 #include "driver.h"
+#include "cpu/arm7/arm7.h"
 #include "cpu/arm7/arm7core.h"
 
 
diff --git a/src/mame/drivers/igs_m68.c b/src/mame/drivers/igs_m68.c
index 378d22cb7f3..341c47af7b4 100644
--- a/src/mame/drivers/igs_m68.c
+++ b/src/mame/drivers/igs_m68.c
@@ -14,6 +14,7 @@ IGS029
 */
 
 #include "driver.h"
+#include "cpu/m68000/m68000.h"
 #include "sound/okim6295.h"
 
 static VIDEO_START(igs_m68)
diff --git a/src/mame/drivers/ikki.c b/src/mame/drivers/ikki.c
index d4b0c7183b5..59526846f8a 100644
--- a/src/mame/drivers/ikki.c
+++ b/src/mame/drivers/ikki.c
@@ -9,6 +9,7 @@ Ikki (c) 1985 Sun Electronics
 *****************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "deprecat.h"
 #include "sound/sn76496.h"
 
diff --git a/src/mame/drivers/intrscti.c b/src/mame/drivers/intrscti.c
index 8c38919715f..d5f05564f4c 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 "cpu/z80/z80.h"
 
 static READ8_HANDLER( unk_r )
 {
diff --git a/src/mame/drivers/iqblock.c b/src/mame/drivers/iqblock.c
index 2a359d8371d..63f50554375 100644
--- a/src/mame/drivers/iqblock.c
+++ b/src/mame/drivers/iqblock.c
@@ -50,6 +50,8 @@ Grndtour:
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
+#include "cpu/z180/z180.h"
 #include "deprecat.h"
 #include "machine/8255ppi.h"
 #include "iqblock.h"
diff --git a/src/mame/drivers/ironhors.c b/src/mame/drivers/ironhors.c
index 0b2ee3c8892..aecf993bf6e 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 "cpu/z80/z80.h"
 #include "deprecat.h"
 #include "cpu/m6809/m6809.h"
 #include "sound/2203intf.h"
diff --git a/src/mame/drivers/istellar.c b/src/mame/drivers/istellar.c
index 6939d52b4d4..baf3d4fc347 100644
--- a/src/mame/drivers/istellar.c
+++ b/src/mame/drivers/istellar.c
@@ -20,6 +20,7 @@ Todo:
 */
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "render.h"
 #include "machine/laserdsc.h"
 
diff --git a/src/mame/drivers/itech32.c b/src/mame/drivers/itech32.c
index 757215e55f4..71a8babab91 100644
--- a/src/mame/drivers/itech32.c
+++ b/src/mame/drivers/itech32.c
@@ -293,6 +293,8 @@ Notes:
 ****************************************************************************/
 
 #include "driver.h"
+#include "cpu/tms32031/tms32031.h"
+#include "cpu/m6800/m6800.h"
 #include "deprecat.h"
 #include "cpu/m6809/m6809.h"
 #include "cpu/m68000/m68000.h"
diff --git a/src/mame/drivers/itech8.c b/src/mame/drivers/itech8.c
index f84779ab660..ebff38a32c7 100644
--- a/src/mame/drivers/itech8.c
+++ b/src/mame/drivers/itech8.c
@@ -495,6 +495,9 @@
 
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
+#include "cpu/m68000/m68000.h"
+#include "cpu/hd6309/hd6309.h"
 #include "cpu/m6809/m6809.h"
 #include "machine/6821pia.h"
 #include "machine/6522via.h"
diff --git a/src/mame/drivers/jackpool.c b/src/mame/drivers/jackpool.c
index 1ac631925ec..93e1f636930 100644
--- a/src/mame/drivers/jackpool.c
+++ b/src/mame/drivers/jackpool.c
@@ -9,6 +9,7 @@ Copyright (C) 1992 HI-TECH Software..Brisbane, QLD Australia
 */
 
 #include "driver.h"
+#include "cpu/m68000/m68000.h"
 #include "deprecat.h"
 #include "sound/okim6295.h"
 
diff --git a/src/mame/drivers/jangou.c b/src/mame/drivers/jangou.c
index afca34f76ff..935874ee717 100644
--- a/src/mame/drivers/jangou.c
+++ b/src/mame/drivers/jangou.c
@@ -63,6 +63,8 @@ JL.3G   color
 *******************************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
+#include "cpu/m6800/m6800.h"
 #include "sound/ay8910.h"
 #include "sound/hc55516.h"
 #include "sound/msm5205.h"
diff --git a/src/mame/drivers/jchan.c b/src/mame/drivers/jchan.c
index cc7129ab1f5..0ecbc72ffeb 100644
--- a/src/mame/drivers/jchan.c
+++ b/src/mame/drivers/jchan.c
@@ -168,6 +168,7 @@ there are 9 PALS on the pcb (not dumped)
 */
 
 #include "driver.h"
+#include "cpu/m68000/m68000.h"
 #include "deprecat.h"
 #include "sound/ymz280b.h"
 #include "includes/suprnova.h"
diff --git a/src/mame/drivers/jokrwild.c b/src/mame/drivers/jokrwild.c
index bfaef01da26..d3732bb1d2a 100644
--- a/src/mame/drivers/jokrwild.c
+++ b/src/mame/drivers/jokrwild.c
@@ -91,6 +91,7 @@
 #define MASTER_CLOCK	XTAL_8MHz	/* guess */
 
 #include "driver.h"
+#include "cpu/m6809/m6809.h"
 #include "video/mc6845.h"
 #include "machine/6821pia.h"
 
diff --git a/src/mame/drivers/jollyjgr.c b/src/mame/drivers/jollyjgr.c
index 52163525a6d..ee0177715b6 100644
--- a/src/mame/drivers/jollyjgr.c
+++ b/src/mame/drivers/jollyjgr.c
@@ -98,6 +98,7 @@ Notes:
 */
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "sound/ay8910.h"
 
 static tilemap *bg_tilemap;
diff --git a/src/mame/drivers/jongkyo.c b/src/mame/drivers/jongkyo.c
index 82eccaf8d53..a07cc11bc83 100644
--- a/src/mame/drivers/jongkyo.c
+++ b/src/mame/drivers/jongkyo.c
@@ -1,5 +1,6 @@
 /* Jongkyo */
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "sound/ay8910.h"
 #include "machine/segacrpt.h"
 
diff --git a/src/mame/drivers/jpmimpct.c b/src/mame/drivers/jpmimpct.c
index e7f3e19af61..e6aede55e09 100644
--- a/src/mame/drivers/jpmimpct.c
+++ b/src/mame/drivers/jpmimpct.c
@@ -78,6 +78,7 @@
 ****************************************************************************/
 
 #include "driver.h"
+#include "cpu/m68000/m68000.h"
 #include "cpu/tms34010/tms34010.h"
 #include "sound/upd7759.h"
 #include "jpmimpct.h"
diff --git a/src/mame/drivers/jrpacman.c b/src/mame/drivers/jrpacman.c
index d76ade86738..8fe3b169388 100644
--- a/src/mame/drivers/jrpacman.c
+++ b/src/mame/drivers/jrpacman.c
@@ -99,6 +99,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "pacman.h"
 #include "sound/namco.h"
 
diff --git a/src/mame/drivers/kaneko16.c b/src/mame/drivers/kaneko16.c
index d47e8306db5..3bf6c9f40f9 100644
--- a/src/mame/drivers/kaneko16.c
+++ b/src/mame/drivers/kaneko16.c
@@ -71,6 +71,8 @@ Dip locations verified from manual for:
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
+#include "cpu/m68000/m68000.h"
 #include "deprecat.h"
 #include "machine/eeprom.h"
 #include "includes/kaneko16.h"
diff --git a/src/mame/drivers/kangaroo.c b/src/mame/drivers/kangaroo.c
index b0d394fdec6..d4e852abf4b 100644
--- a/src/mame/drivers/kangaroo.c
+++ b/src/mame/drivers/kangaroo.c
@@ -154,6 +154,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/mb88xx/mb88xx.h"
 #include "kangaroo.h"
 #include "cpu/z80/z80.h"
 #include "sound/ay8910.h"
diff --git a/src/mame/drivers/karnov.c b/src/mame/drivers/karnov.c
index 764fe020b89..43ec2afcdfa 100644
--- a/src/mame/drivers/karnov.c
+++ b/src/mame/drivers/karnov.c
@@ -38,6 +38,8 @@
 *******************************************************************************/
 
 #include "driver.h"
+#include "cpu/m68000/m68000.h"
+#include "cpu/m6502/m6502.h"
 #include "sound/2203intf.h"
 #include "sound/3812intf.h"
 
diff --git a/src/mame/drivers/kickgoal.c b/src/mame/drivers/kickgoal.c
index 20be401d070..c1140a444b5 100644
--- a/src/mame/drivers/kickgoal.c
+++ b/src/mame/drivers/kickgoal.c
@@ -35,6 +35,7 @@ lev 7 : 0x7c : 0000 0000 - x
 */
 
 #include "driver.h"
+#include "cpu/m68000/m68000.h"
 #include "cpu/pic16c5x/pic16c5x.h"
 #include "machine/eeprom.h"
 #include "sound/okim6295.h"
diff --git a/src/mame/drivers/kingobox.c b/src/mame/drivers/kingobox.c
index 0d4025efed4..28d229eb9e6 100644
--- a/src/mame/drivers/kingobox.c
+++ b/src/mame/drivers/kingobox.c
@@ -16,6 +16,7 @@ Main CPU:
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "sound/ay8910.h"
 #include "sound/dac.h"
 
diff --git a/src/mame/drivers/kingpin.c b/src/mame/drivers/kingpin.c
index 3af707e93f7..f9d165bcddf 100644
--- a/src/mame/drivers/kingpin.c
+++ b/src/mame/drivers/kingpin.c
@@ -20,6 +20,7 @@ Todo:
 */
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "video/tms9928a.h"
 #include "sound/ay8910.h"
 
diff --git a/src/mame/drivers/klax.c b/src/mame/drivers/klax.c
index 6a98573957c..a20fd739e23 100644
--- a/src/mame/drivers/klax.c
+++ b/src/mame/drivers/klax.c
@@ -18,6 +18,7 @@
 
 
 #include "driver.h"
+#include "cpu/m68000/m68000.h"
 #include "machine/atarigen.h"
 #include "klax.h"
 #include "sound/okim6295.h"
diff --git a/src/mame/drivers/kncljoe.c b/src/mame/drivers/kncljoe.c
index 7a9f0ac03d5..8ba5d1773d8 100644
--- a/src/mame/drivers/kncljoe.c
+++ b/src/mame/drivers/kncljoe.c
@@ -26,6 +26,7 @@ Updates:
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "cpu/m6800/m6800.h"
 #include "sound/ay8910.h"
 #include "sound/sn76496.h"
diff --git a/src/mame/drivers/koikoi.c b/src/mame/drivers/koikoi.c
index a9b7e58903f..80896421e58 100644
--- a/src/mame/drivers/koikoi.c
+++ b/src/mame/drivers/koikoi.c
@@ -38,6 +38,7 @@ to prevent disabling inputs.
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "sound/ay8910.h"
 
 static int inputcnt=0;
diff --git a/src/mame/drivers/konamigq.c b/src/mame/drivers/konamigq.c
index f57ec4d32ee..5d0b7b9cc40 100644
--- a/src/mame/drivers/konamigq.c
+++ b/src/mame/drivers/konamigq.c
@@ -46,6 +46,7 @@
 */
 
 #include "driver.h"
+#include "cpu/m68000/m68000.h"
 #include "cpu/mips/psx.h"
 #include "includes/psx.h"
 #include "machine/konamigx.h"
diff --git a/src/mame/drivers/kopunch.c b/src/mame/drivers/kopunch.c
index b99d79ceb82..8930bac0dff 100644
--- a/src/mame/drivers/kopunch.c
+++ b/src/mame/drivers/kopunch.c
@@ -1,4 +1,5 @@
 #include "driver.h"
+#include "cpu/i8085/i8085.h"
 #include "deprecat.h"
 
 extern UINT8 *kopunch_videoram2;
diff --git a/src/mame/drivers/ksayakyu.c b/src/mame/drivers/ksayakyu.c
index 2c42734ba09..446875ced3d 100644
--- a/src/mame/drivers/ksayakyu.c
+++ b/src/mame/drivers/ksayakyu.c
@@ -64,6 +64,7 @@ SRAM:
 */
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "deprecat.h"
 #include "sound/ay8910.h"
 #include "sound/dac.h"
diff --git a/src/mame/drivers/kyugo.c b/src/mame/drivers/kyugo.c
index 390e86b58b5..eb940ca142d 100644
--- a/src/mame/drivers/kyugo.c
+++ b/src/mame/drivers/kyugo.c
@@ -22,6 +22,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "deprecat.h"
 #include "kyugo.h"
 #include "sound/ay8910.h"
diff --git a/src/mame/drivers/ladybug.c b/src/mame/drivers/ladybug.c
index 930b506c94c..0ac8bba721b 100644
--- a/src/mame/drivers/ladybug.c
+++ b/src/mame/drivers/ladybug.c
@@ -59,6 +59,7 @@ TODO:
  */
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "sound/sn76496.h"
 
 
diff --git a/src/mame/drivers/ladyfrog.c b/src/mame/drivers/ladyfrog.c
index 10723acb526..ac0cc573919 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 "cpu/z80/z80.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 3e0bb53904d..c174717287b 100644
--- a/src/mame/drivers/laserbas.c
+++ b/src/mame/drivers/laserbas.c
@@ -17,6 +17,7 @@
 ********************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "deprecat.h"
 
 static UINT8 *vram1,*vram2;
diff --git a/src/mame/drivers/laserbat.c b/src/mame/drivers/laserbat.c
index cc1038e1d81..074241bd1d5 100644
--- a/src/mame/drivers/laserbat.c
+++ b/src/mame/drivers/laserbat.c
@@ -17,6 +17,7 @@ TODO:
 */
 
 #include "driver.h"
+#include "cpu/m6800/m6800.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 38dfc221259..c277346a098 100644
--- a/src/mame/drivers/lasso.c
+++ b/src/mame/drivers/lasso.c
@@ -28,6 +28,7 @@ DIP locations verified for:
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/m6502/m6502.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 b98474ef669..489d8f5b4a9 100644
--- a/src/mame/drivers/lastduel.c
+++ b/src/mame/drivers/lastduel.c
@@ -17,6 +17,8 @@ TODO:
 **************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
+#include "cpu/m68000/m68000.h"
 #include "deprecat.h"
 #include "sound/2203intf.h"
 #include "sound/okim6295.h"
diff --git a/src/mame/drivers/leland.c b/src/mame/drivers/leland.c
index 45cc5376053..c9395b1d550 100644
--- a/src/mame/drivers/leland.c
+++ b/src/mame/drivers/leland.c
@@ -42,6 +42,7 @@
 
 
 #include "driver.h"
+#include "cpu/i86/i186intf.h"
 #include "machine/eeprom.h"
 #include "cpu/z80/z80.h"
 #include "leland.h"
diff --git a/src/mame/drivers/lemmings.c b/src/mame/drivers/lemmings.c
index b44a6787452..2bd22a63b8a 100644
--- a/src/mame/drivers/lemmings.c
+++ b/src/mame/drivers/lemmings.c
@@ -16,6 +16,8 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/m6809/m6809.h"
+#include "cpu/m68000/m68000.h"
 #include "lemmings.h"
 #include "sound/2151intf.h"
 #include "sound/okim6295.h"
diff --git a/src/mame/drivers/lgp.c b/src/mame/drivers/lgp.c
index 2880d5061fe..58954c0f507 100644
--- a/src/mame/drivers/lgp.c
+++ b/src/mame/drivers/lgp.c
@@ -64,6 +64,7 @@ Dumping Notes:
 
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "render.h"
 #include "machine/laserdsc.h"
 
diff --git a/src/mame/drivers/liberatr.c b/src/mame/drivers/liberatr.c
index 20fbccbcf14..9fd70cc1667 100644
--- a/src/mame/drivers/liberatr.c
+++ b/src/mame/drivers/liberatr.c
@@ -134,6 +134,7 @@
 ******************************************************************************************/
 
 #include "driver.h"
+#include "cpu/m6502/m6502.h"
 #include "deprecat.h"
 #include "machine/atari_vg.h"
 #include "sound/pokey.h"
diff --git a/src/mame/drivers/limenko.c b/src/mame/drivers/limenko.c
index 04eb637b589..a4e4223524a 100644
--- a/src/mame/drivers/limenko.c
+++ b/src/mame/drivers/limenko.c
@@ -24,6 +24,7 @@
 */
 
 #include "driver.h"
+#include "cpu/e132xs/e132xs.h"
 #include "machine/eeprom.h"
 #include "sound/okim6295.h"
 #include "cpu/mcs51/mcs51.h"
diff --git a/src/mame/drivers/littlerb.c b/src/mame/drivers/littlerb.c
index e1379aa8d6a..4a868594a48 100644
--- a/src/mame/drivers/littlerb.c
+++ b/src/mame/drivers/littlerb.c
@@ -59,6 +59,7 @@ Dip sw.2
 */
 
 #include "driver.h"
+#include "cpu/m68000/m68000.h"
 
 static UINT16 littlerb_vdp_address_low;
 static UINT16 littlerb_vdp_address_high;
diff --git a/src/mame/drivers/lockon.c b/src/mame/drivers/lockon.c
index 3f237994195..6fee356b921 100644
--- a/src/mame/drivers/lockon.c
+++ b/src/mame/drivers/lockon.c
@@ -10,6 +10,8 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
+#include "cpu/nec/necintrf.h"
 #include "sound/2203intf.h"
 #include "sound/flt_vol.h"
 #include "lockon.h"
diff --git a/src/mame/drivers/looping.c b/src/mame/drivers/looping.c
index a824337582f..1ca4ebefe68 100644
--- a/src/mame/drivers/looping.c
+++ b/src/mame/drivers/looping.c
@@ -53,6 +53,7 @@ L056-6    9A          "      "      VLI-8-4 7A         "
 */
 
 #include "driver.h"
+#include "cpu/tms9900/tms9900.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 4384029f1c1..bb5bd9bbfd8 100644
--- a/src/mame/drivers/lordgun.c
+++ b/src/mame/drivers/lordgun.c
@@ -26,6 +26,8 @@ To do:
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
+#include "cpu/m68000/m68000.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 e158b815734..7fe2e9625f6 100644
--- a/src/mame/drivers/lsasquad.c
+++ b/src/mame/drivers/lsasquad.c
@@ -147,6 +147,7 @@ Notes:
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "cpu/m6805/m6805.h"
 #include "sound/ay8910.h"
 #include "sound/2203intf.h"
diff --git a/src/mame/drivers/ltcasino.c b/src/mame/drivers/ltcasino.c
index ecdd0948055..0c02289fd23 100644
--- a/src/mame/drivers/ltcasino.c
+++ b/src/mame/drivers/ltcasino.c
@@ -14,6 +14,7 @@ etc.
 */
 
 #include "driver.h"
+#include "cpu/m6502/m6502.h"
 #include "sound/ay8910.h"
 
 static UINT8 *ltcasino_tile_num_ram, *ltcasino_tile_atr_ram;
diff --git a/src/mame/drivers/lucky74.c b/src/mame/drivers/lucky74.c
index 37967475d2e..b7e6850f1e6 100644
--- a/src/mame/drivers/lucky74.c
+++ b/src/mame/drivers/lucky74.c
@@ -667,6 +667,7 @@
 
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "sound/ay8910.h"
 #include "sound/sn76496.h"
 #include "sound/msm5205.h"
diff --git a/src/mame/drivers/lucky8.c b/src/mame/drivers/lucky8.c
index 70fb91366b2..cea92317a7f 100644
--- a/src/mame/drivers/lucky8.c
+++ b/src/mame/drivers/lucky8.c
@@ -23,6 +23,7 @@
 */
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "sound/ay8910.h"
 
 /* video */
diff --git a/src/mame/drivers/lvcards.c b/src/mame/drivers/lvcards.c
index 5e70aeb2ea2..4c4c890cfc6 100644
--- a/src/mame/drivers/lvcards.c
+++ b/src/mame/drivers/lvcards.c
@@ -74,6 +74,7 @@ TODO:
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "sound/ay8910.h"
 
 extern WRITE8_HANDLER( lvcards_videoram_w );
diff --git a/src/mame/drivers/lwings.c b/src/mame/drivers/lwings.c
index 6d4081a263a..502a16767a9 100644
--- a/src/mame/drivers/lwings.c
+++ b/src/mame/drivers/lwings.c
@@ -46,6 +46,7 @@ Notes:
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "deprecat.h"
 #include "lwings.h"
 #include "sound/2203intf.h"
diff --git a/src/mame/drivers/m10.c b/src/mame/drivers/m10.c
index ed59889e196..a453bacba6e 100644
--- a/src/mame/drivers/m10.c
+++ b/src/mame/drivers/m10.c
@@ -111,6 +111,7 @@ Notes (couriersud)
 
 ***************************************************************************/
 #include "driver.h"
+#include "cpu/m6502/m6502.h"
 #include "machine/rescap.h"
 #include "sound/samples.h"
 #include "machine/74123.h"
diff --git a/src/mame/drivers/m107.c b/src/mame/drivers/m107.c
index cb5c2a3ac09..a5a2fca1b41 100644
--- a/src/mame/drivers/m107.c
+++ b/src/mame/drivers/m107.c
@@ -24,6 +24,7 @@ confirmed for m107 games as well.
 *******************************************************************************/
 
 #include "driver.h"
+#include "cpu/nec/necintrf.h"
 #include "m107.h"
 #include "iremipt.h"
 #include "machine/irem_cpu.h"
diff --git a/src/mame/drivers/m57.c b/src/mame/drivers/m57.c
index 275badfda66..5fdded1ef51 100644
--- a/src/mame/drivers/m57.c
+++ b/src/mame/drivers/m57.c
@@ -48,6 +48,7 @@
 ****************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "iremipt.h"
 #include "m57.h"
 #include "audio/irem.h"
diff --git a/src/mame/drivers/m58.c b/src/mame/drivers/m58.c
index 8bc052f747b..ac61effbeb4 100644
--- a/src/mame/drivers/m58.c
+++ b/src/mame/drivers/m58.c
@@ -10,6 +10,7 @@
 ****************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "iremipt.h"
 #include "m58.h"
 #include "audio/irem.h"
diff --git a/src/mame/drivers/m62.c b/src/mame/drivers/m62.c
index d332913f991..b84bd2043b0 100644
--- a/src/mame/drivers/m62.c
+++ b/src/mame/drivers/m62.c
@@ -68,6 +68,7 @@ other supported games as well.
 **************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "m62.h"
 #include "iremipt.h"
 #include "audio/irem.h"
diff --git a/src/mame/drivers/m63.c b/src/mame/drivers/m63.c
index f3489a532d7..61b2e139899 100644
--- a/src/mame/drivers/m63.c
+++ b/src/mame/drivers/m63.c
@@ -116,6 +116,7 @@ Dip locations verified for:
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "cpu/mcs48/mcs48.h"
 #include "sound/ay8910.h"
 #include "sound/samples.h"
diff --git a/src/mame/drivers/m72.c b/src/mame/drivers/m72.c
index 780986398d3..491332e1505 100644
--- a/src/mame/drivers/m72.c
+++ b/src/mame/drivers/m72.c
@@ -81,6 +81,8 @@ other supported games as well.
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
+#include "cpu/nec/necintrf.h"
 #include "deprecat.h"
 #include "machine/irem_cpu.h"
 #include "audio/m72.h"
diff --git a/src/mame/drivers/m79amb.c b/src/mame/drivers/m79amb.c
index de0ed60db57..8e93388962c 100644
--- a/src/mame/drivers/m79amb.c
+++ b/src/mame/drivers/m79amb.c
@@ -51,6 +51,7 @@ Ports:
 */
 
 #include "driver.h"
+#include "cpu/i8085/i8085.h"
 
 static UINT8 *ramtek_videoram;
 static UINT8 *mask;
diff --git a/src/mame/drivers/m90.c b/src/mame/drivers/m90.c
index 5a4d7a4b074..532e56f4abc 100644
--- a/src/mame/drivers/m90.c
+++ b/src/mame/drivers/m90.c
@@ -25,6 +25,8 @@ Notes:
 *****************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
+#include "cpu/nec/necintrf.h"
 #include "deprecat.h"
 #include "iremipt.h"
 #include "machine/irem_cpu.h"
diff --git a/src/mame/drivers/m92.c b/src/mame/drivers/m92.c
index c1b5635bbcf..9c71e34d9c6 100644
--- a/src/mame/drivers/m92.c
+++ b/src/mame/drivers/m92.c
@@ -194,6 +194,7 @@ psoldier dip locations still need veritication.
 *****************************************************************************/
 
 #include "driver.h"
+#include "cpu/nec/necintrf.h"
 #include "m92.h"
 #include "iremipt.h"
 #include "machine/irem_cpu.h"
diff --git a/src/mame/drivers/macrossp.c b/src/mame/drivers/macrossp.c
index ecb72726fc5..e76531f4167 100644
--- a/src/mame/drivers/macrossp.c
+++ b/src/mame/drivers/macrossp.c
@@ -37,6 +37,7 @@ TODO:
 ******************************************************************************/
 
 #include "driver.h"
+#include "cpu/m68000/m68000.h"
 #include "sound/es5506.h"
 
 /*** README INFO **************************************************************
diff --git a/src/mame/drivers/madalien.c b/src/mame/drivers/madalien.c
index c746219babf..0b3a88166ed 100644
--- a/src/mame/drivers/madalien.c
+++ b/src/mame/drivers/madalien.c
@@ -7,6 +7,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/m6502/m6502.h"
 #include "sound/ay8910.h"
 #include "video/mc6845.h"
 #include "madalien.h"
diff --git a/src/mame/drivers/madmotor.c b/src/mame/drivers/madmotor.c
index 716e288fe47..4ef65bbe808 100644
--- a/src/mame/drivers/madmotor.c
+++ b/src/mame/drivers/madmotor.c
@@ -13,6 +13,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/m68000/m68000.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 dbfbf20bf10..b7707707de0 100644
--- a/src/mame/drivers/magic10.c
+++ b/src/mame/drivers/magic10.c
@@ -71,6 +71,7 @@
 
 
 #include "driver.h"
+#include "cpu/m68000/m68000.h"
 #include "sound/okim6295.h"
 #include "sgsafari.lh"
 
diff --git a/src/mame/drivers/magicfly.c b/src/mame/drivers/magicfly.c
index d651164e962..71d56e782e1 100644
--- a/src/mame/drivers/magicfly.c
+++ b/src/mame/drivers/magicfly.c
@@ -396,6 +396,7 @@
 #define MASTER_CLOCK	XTAL_10MHz
 
 #include "driver.h"
+#include "cpu/m6502/m6502.h"
 #include "video/mc6845.h"
 #include "sound/dac.h"
 
diff --git a/src/mame/drivers/magmax.c b/src/mame/drivers/magmax.c
index 8d3b401a792..7384c9ace04 100644
--- a/src/mame/drivers/magmax.c
+++ b/src/mame/drivers/magmax.c
@@ -24,6 +24,7 @@ Stephh's notes (based on the game M68000 code and some tests) :
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.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 39cec0619d5..4aa4c344f44 100644
--- a/src/mame/drivers/mainevt.c
+++ b/src/mame/drivers/mainevt.c
@@ -21,6 +21,8 @@ Notes:
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
+#include "cpu/hd6309/hd6309.h"
 #include "deprecat.h"
 #include "video/konamiic.h"
 #include "cpu/m6809/m6809.h"
diff --git a/src/mame/drivers/mainsnk.c b/src/mame/drivers/mainsnk.c
index 9545cfe4d0a..06d6f115d25 100644
--- a/src/mame/drivers/mainsnk.c
+++ b/src/mame/drivers/mainsnk.c
@@ -108,6 +108,7 @@ cc_p14.j2 8192 0xedc6a1eb M5L2764k
 */
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "snk.h"
 #include "sound/ay8910.h"
 
diff --git a/src/mame/drivers/mappy.c b/src/mame/drivers/mappy.c
index 76463acb588..87fb4c9ee6c 100644
--- a/src/mame/drivers/mappy.c
+++ b/src/mame/drivers/mappy.c
@@ -547,6 +547,7 @@ TODO:
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/m6809/m6809.h"
 #include "machine/namcoio.h"
 #include "sound/dac.h"
 #include "sound/namco.h"
diff --git a/src/mame/drivers/marineb.c b/src/mame/drivers/marineb.c
index f8cf1420797..80441dfdd0b 100644
--- a/src/mame/drivers/marineb.c
+++ b/src/mame/drivers/marineb.c
@@ -36,6 +36,7 @@ write
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "sound/ay8910.h"
 #include "includes/espial.h"
 
diff --git a/src/mame/drivers/marinedt.c b/src/mame/drivers/marinedt.c
index cd9eee237fe..149f5c27907 100644
--- a/src/mame/drivers/marinedt.c
+++ b/src/mame/drivers/marinedt.c
@@ -95,6 +95,7 @@ p2 ink doesn't always light up in test mode
 */
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 
 static bitmap_t *tile, *obj1, *obj2;
 static tilemap *tx_tilemap;
diff --git a/src/mame/drivers/mario.c b/src/mame/drivers/mario.c
index 86e5d339537..8c511626392 100644
--- a/src/mame/drivers/mario.c
+++ b/src/mame/drivers/mario.c
@@ -90,6 +90,7 @@ write:
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "machine/z80dma.h"
 
 #include "mario.h"
diff --git a/src/mame/drivers/markham.c b/src/mame/drivers/markham.c
index 370e37caed3..936c2b5c489 100644
--- a/src/mame/drivers/markham.c
+++ b/src/mame/drivers/markham.c
@@ -9,6 +9,7 @@ Markham (c) 1983 Sun Electronics
 *****************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "sound/sn76496.h"
 
 WRITE8_HANDLER( markham_videoram_w );
diff --git a/src/mame/drivers/mastboy.c b/src/mame/drivers/mastboy.c
index 970c5eb3be5..6afd9cab155 100644
--- a/src/mame/drivers/mastboy.c
+++ b/src/mame/drivers/mastboy.c
@@ -434,6 +434,7 @@
 */
 
 #include "driver.h"
+#include "cpu/z180/z180.h"
 #include "sound/saa1099.h"
 #include "sound/msm5205.h"
 
diff --git a/src/mame/drivers/mayumi.c b/src/mame/drivers/mayumi.c
index 3b8cb803548..fd1c3453ebb 100644
--- a/src/mame/drivers/mayumi.c
+++ b/src/mame/drivers/mayumi.c
@@ -7,6 +7,7 @@ Kikiippatsu Mayumi-chan (c) 1988 Victory L.L.C.
 *****************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "sound/2203intf.h"
 
 #define MCLK 10000000
diff --git a/src/mame/drivers/mazerbla.c b/src/mame/drivers/mazerbla.c
index a790ec2cb6a..ece216c6a91 100644
--- a/src/mame/drivers/mazerbla.c
+++ b/src/mame/drivers/mazerbla.c
@@ -36,6 +36,7 @@ TO DO:
 ****************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "sound/ay8910.h"
 
 static UINT8 *cfb_ram;
diff --git a/src/mame/drivers/mcatadv.c b/src/mame/drivers/mcatadv.c
index c02c27e7366..04f8dcf6267 100644
--- a/src/mame/drivers/mcatadv.c
+++ b/src/mame/drivers/mcatadv.c
@@ -136,6 +136,8 @@ Stephh's notes (based on the games M68000 code and some tests) :
 ******************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
+#include "cpu/m68000/m68000.h"
 #include "sound/2610intf.h"
 #include "includes/mcatadv.h"
 
diff --git a/src/mame/drivers/mcr.c b/src/mame/drivers/mcr.c
index f6b37187b1d..67da910a038 100644
--- a/src/mame/drivers/mcr.c
+++ b/src/mame/drivers/mcr.c
@@ -283,6 +283,7 @@
 
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "deprecat.h"
 #include "machine/z80ctc.h"
 #include "machine/z80pio.h"
diff --git a/src/mame/drivers/mcr3.c b/src/mame/drivers/mcr3.c
index 6b63795c08f..94f56811792 100644
--- a/src/mame/drivers/mcr3.c
+++ b/src/mame/drivers/mcr3.c
@@ -83,6 +83,7 @@
 
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "deprecat.h"
 #include "machine/z80ctc.h"
 #include "audio/mcr.h"
diff --git a/src/mame/drivers/mcr68.c b/src/mame/drivers/mcr68.c
index 31667940c76..6e92476294a 100644
--- a/src/mame/drivers/mcr68.c
+++ b/src/mame/drivers/mcr68.c
@@ -49,6 +49,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/m68000/m68000.h"
 #include "audio/mcr.h"
 #include "audio/williams.h"
 #include "mcr.h"
diff --git a/src/mame/drivers/mediagx.c b/src/mame/drivers/mediagx.c
index 0fcb7c881ea..a19671cd57e 100644
--- a/src/mame/drivers/mediagx.c
+++ b/src/mame/drivers/mediagx.c
@@ -64,6 +64,7 @@
 */
 
 #include "driver.h"
+#include "cpu/i386/i386intf.h"
 #include "devconv.h"
 #include "deprecat.h"
 #include "machine/8237dma.h"
diff --git a/src/mame/drivers/megadriv.c b/src/mame/drivers/megadriv.c
index 316efc0ac58..c89250850c5 100644
--- a/src/mame/drivers/megadriv.c
+++ b/src/mame/drivers/megadriv.c
@@ -66,6 +66,7 @@ On SegaC2 the VDP never turns on the IRQ6 enable register
 
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "deprecat.h"
 #include "sound/sn76496.h"
 #include "sound/2612intf.h"
diff --git a/src/mame/drivers/megaplay.c b/src/mame/drivers/megaplay.c
index b01c1965868..1da7a67b495 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 "cpu/z80/z80.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 693f02457b2..c6aebd9eb79 100644
--- a/src/mame/drivers/megasys1.c
+++ b/src/mame/drivers/megasys1.c
@@ -118,6 +118,8 @@ RAM         RW      0f0000-0f3fff       0e0000-0effff?      <
 #define OKI4_SOUND_CLOCK	XTAL_4MHz
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
+#include "cpu/m68000/m68000.h"
 #include "deprecat.h"
 #include "megasys1.h"
 #include "sound/2203intf.h"
diff --git a/src/mame/drivers/megatech.c b/src/mame/drivers/megatech.c
index d5f403701f6..34724dd9c53 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 "cpu/z80/z80.h"
 #include "genesis.h"
 #include "rendlay.h"
 #include "megadriv.h"
diff --git a/src/mame/drivers/meijinsn.c b/src/mame/drivers/meijinsn.c
index bdf9701e225..ebcdd044d34 100644
--- a/src/mame/drivers/meijinsn.c
+++ b/src/mame/drivers/meijinsn.c
@@ -59,6 +59,8 @@ SOFT  PSG & VOICE  BY M.C & S.H
 
 */
 #include "driver.h"
+#include "cpu/z80/z80.h"
+#include "cpu/m68000/m68000.h"
 #include "deprecat.h"
 #include "video/resnet.h"
 #include "sound/ay8910.h"
diff --git a/src/mame/drivers/merit.c b/src/mame/drivers/merit.c
index bfd13415ef6..a68f41fef1b 100644
--- a/src/mame/drivers/merit.c
+++ b/src/mame/drivers/merit.c
@@ -40,6 +40,7 @@ Notes: it's important that "user1" is 0xa0000 bytes with empty space filled
 */
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "machine/8255ppi.h"
 #include "sound/ay8910.h"
 #include "video/mc6845.h"
diff --git a/src/mame/drivers/mermaid.c b/src/mame/drivers/mermaid.c
index cb9283e5feb..dd576122a82 100644
--- a/src/mame/drivers/mermaid.c
+++ b/src/mame/drivers/mermaid.c
@@ -114,6 +114,7 @@ Stephh's notes (based on the games Z80 code and some tests) :
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "sound/ay8910.h"
 
 extern UINT8* mermaid_videoram2;
diff --git a/src/mame/drivers/metro.c b/src/mame/drivers/metro.c
index 21f5a49929b..e8bb2b1879e 100644
--- a/src/mame/drivers/metro.c
+++ b/src/mame/drivers/metro.c
@@ -81,6 +81,8 @@ driver modified by Eisuke Watanabe
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
+#include "cpu/m68000/m68000.h"
 #include "deprecat.h"
 #include "cpu/h83002/h8.h"
 #include "cpu/upd7810/upd7810.h"
diff --git a/src/mame/drivers/mgolf.c b/src/mame/drivers/mgolf.c
index 8596b08897d..a6a6efa258b 100644
--- a/src/mame/drivers/mgolf.c
+++ b/src/mame/drivers/mgolf.c
@@ -5,6 +5,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/m6502/m6502.h"
 
 static UINT8* mgolf_video_ram;
 
diff --git a/src/mame/drivers/mhavoc.c b/src/mame/drivers/mhavoc.c
index a60ca535a78..007b3a2c391 100644
--- a/src/mame/drivers/mhavoc.c
+++ b/src/mame/drivers/mhavoc.c
@@ -184,6 +184,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/m6502/m6502.h"
 #include "machine/atari_vg.h"
 #include "video/avgdvg.h"
 #include "video/vector.h"
diff --git a/src/mame/drivers/micro3d.c b/src/mame/drivers/micro3d.c
index 0fd37ace079..f6af56202ca 100644
--- a/src/mame/drivers/micro3d.c
+++ b/src/mame/drivers/micro3d.c
@@ -22,6 +22,7 @@
 /*====================================================================*/
 
 #include "driver.h"
+#include "cpu/m68000/m68000.h"
 #include "deprecat.h"
 #include "cpu/tms34010/tms34010.h"
 #include "cpu/mcs51/mcs51.h"
diff --git a/src/mame/drivers/midas.c b/src/mame/drivers/midas.c
index 46d874b672f..7d63dd818fc 100644
--- a/src/mame/drivers/midas.c
+++ b/src/mame/drivers/midas.c
@@ -46,6 +46,7 @@
 *************************************************************************************************************/
 
 #include "driver.h"
+#include "cpu/m68000/m68000.h"
 #include "sound/ymz280b.h"
 #include "machine/eeprom.h"
 
diff --git a/src/mame/drivers/midyunit.c b/src/mame/drivers/midyunit.c
index 7ad532d409b..9cee30fce42 100644
--- a/src/mame/drivers/midyunit.c
+++ b/src/mame/drivers/midyunit.c
@@ -112,6 +112,7 @@ Notes:
 **************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "cpu/tms34010/tms34010.h"
 #include "audio/williams.h"
 #include "sound/okim6295.h"
diff --git a/src/mame/drivers/midzeus.c b/src/mame/drivers/midzeus.c
index 8ff5253393a..9d9276125cd 100644
--- a/src/mame/drivers/midzeus.c
+++ b/src/mame/drivers/midzeus.c
@@ -25,6 +25,7 @@ The Grid         v1.2   10/18/2000
 **************************************************************************/
 
 #include "driver.h"
+#include "cpu/tms32031/tms32031.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 08aa3a491d2..8079529eaa5 100644
--- a/src/mame/drivers/mikie.c
+++ b/src/mame/drivers/mikie.c
@@ -17,6 +17,7 @@ MAIN BOARD:
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.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 9578ecdd6a7..ad91a610295 100644
--- a/src/mame/drivers/miniboy7.c
+++ b/src/mame/drivers/miniboy7.c
@@ -124,6 +124,7 @@
 #define MASTER_CLOCK	10000000	/* 10MHz */
 
 #include "driver.h"
+#include "cpu/m6502/m6502.h"
 #include "video/mc6845.h"
 
 
diff --git a/src/mame/drivers/mirage.c b/src/mame/drivers/mirage.c
index d827e886b03..1cc7fb1aa16 100644
--- a/src/mame/drivers/mirage.c
+++ b/src/mame/drivers/mirage.c
@@ -34,6 +34,7 @@ MR_01-.3A    [a0b758aa]
 */
 
 #include "driver.h"
+#include "cpu/m68000/m68000.h"
 #include "decocrpt.h"
 #include "decoprot.h"
 #include "deco16ic.h"
diff --git a/src/mame/drivers/mirax.c b/src/mame/drivers/mirax.c
index 12053b13e1c..6165f3cc313 100644
--- a/src/mame/drivers/mirax.c
+++ b/src/mame/drivers/mirax.c
@@ -61,6 +61,7 @@ The End
 */
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "deprecat.h"
 #include "sound/ay8910.h"
 
diff --git a/src/mame/drivers/missb2.c b/src/mame/drivers/missb2.c
index 6acd0832f3a..edbca77837e 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 "cpu/z80/z80.h"
 #include "sound/okim6295.h"
 #include "sound/3812intf.h"
 #include "includes/bublbobl.h"
diff --git a/src/mame/drivers/missile.c b/src/mame/drivers/missile.c
index 818197cf5a2..5945c12bd4c 100644
--- a/src/mame/drivers/missile.c
+++ b/src/mame/drivers/missile.c
@@ -328,6 +328,7 @@ Notes:
 *****************************************************************************************/
 
 #include "driver.h"
+#include "cpu/m6502/m6502.h"
 #include "sound/pokey.h"
 
 
diff --git a/src/mame/drivers/mitchell.c b/src/mame/drivers/mitchell.c
index a31a956c437..8a306daa79e 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 "cpu/z80/z80.h"
 #include "deprecat.h"
 #include "machine/eeprom.h"
 #include "includes/cps1.h"
diff --git a/src/mame/drivers/mjkjidai.c b/src/mame/drivers/mjkjidai.c
index 78ccb4a082e..610dbc11138 100644
--- a/src/mame/drivers/mjkjidai.c
+++ b/src/mame/drivers/mjkjidai.c
@@ -22,6 +22,7 @@ TODO:
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "streams.h"
 #include "sound/sn76496.h"
 #include "sound/okim6295.h"
diff --git a/src/mame/drivers/mjsister.c b/src/mame/drivers/mjsister.c
index 346b0e49373..c8a279a6e80 100644
--- a/src/mame/drivers/mjsister.c
+++ b/src/mame/drivers/mjsister.c
@@ -7,6 +7,7 @@ Mahjong Sisters (c) 1986 Toa Plan
 *****************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "deprecat.h"
 #include "sound/dac.h"
 #include "sound/ay8910.h"
diff --git a/src/mame/drivers/mjsiyoub.c b/src/mame/drivers/mjsiyoub.c
index f389a4ab204..5223b63af73 100644
--- a/src/mame/drivers/mjsiyoub.c
+++ b/src/mame/drivers/mjsiyoub.c
@@ -31,6 +31,7 @@ COLOR.BPR  color
 */
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "sound/ay8910.h"
 #include "sound/msm5205.h"
 
diff --git a/src/mame/drivers/mlanding.c b/src/mame/drivers/mlanding.c
index 1cf6c136651..e2852ecf784 100644
--- a/src/mame/drivers/mlanding.c
+++ b/src/mame/drivers/mlanding.c
@@ -4,6 +4,8 @@
 */
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
+#include "cpu/m68000/m68000.h"
 #include "deprecat.h"
 #include "audio/taitosnd.h"
 #include "sound/2151intf.h"
diff --git a/src/mame/drivers/model1.c b/src/mame/drivers/model1.c
index 2cd3aead35f..3c38c68e5d6 100644
--- a/src/mame/drivers/model1.c
+++ b/src/mame/drivers/model1.c
@@ -625,6 +625,7 @@ Notes:
 */
 
 #include "driver.h"
+#include "cpu/v60/v60.h"
 #include "deprecat.h"
 #include "machine/eeprom.h"
 #include "system16.h"
diff --git a/src/mame/drivers/model3.c b/src/mame/drivers/model3.c
index d430e604593..a1f1874e92a 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 "cpu/m68000/m68000.h"
 #include "deprecat.h"
 #include "cpu/powerpc/ppc.h"
 #include "machine/eeprom.h"
diff --git a/src/mame/drivers/mogura.c b/src/mame/drivers/mogura.c
index 51383ace214..64445426cdd 100644
--- a/src/mame/drivers/mogura.c
+++ b/src/mame/drivers/mogura.c
@@ -1,6 +1,7 @@
 /* Mogura Desse */
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "sound/dac.h"
 
 static UINT8 *mogura_tileram;
diff --git a/src/mame/drivers/mole.c b/src/mame/drivers/mole.c
index 3e787609e8a..c35ff1eb7a0 100644
--- a/src/mame/drivers/mole.c
+++ b/src/mame/drivers/mole.c
@@ -42,6 +42,7 @@
 // 0x3E7                    round point/passing point control?
 
 #include "driver.h"
+#include "cpu/m6502/m6502.h"
 #include "sound/ay8910.h"
 
 
diff --git a/src/mame/drivers/momoko.c b/src/mame/drivers/momoko.c
index b8b16a1d243..baa88654af9 100644
--- a/src/mame/drivers/momoko.c
+++ b/src/mame/drivers/momoko.c
@@ -42,6 +42,7 @@ Stephh's notes (based on the game Z80 code and some tests) :
 *****************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "sound/2203intf.h"
 
 extern UINT8 *momoko_bg_scrollx;
diff --git a/src/mame/drivers/mouser.c b/src/mame/drivers/mouser.c
index b6e8c06d43d..7dc4cfd0956 100644
--- a/src/mame/drivers/mouser.c
+++ b/src/mame/drivers/mouser.c
@@ -13,6 +13,7 @@
 *******************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "deprecat.h"
 #include "sound/ay8910.h"
 
diff --git a/src/mame/drivers/mquake.c b/src/mame/drivers/mquake.c
index d7e6c153b9a..c69ac07e1de 100644
--- a/src/mame/drivers/mquake.c
+++ b/src/mame/drivers/mquake.c
@@ -8,6 +8,7 @@
 
 
 #include "driver.h"
+#include "cpu/m68000/m68000.h"
 #include "includes/amiga.h"
 #include "sound/es5503.h"
 #include "machine/6526cia.h"
diff --git a/src/mame/drivers/mrjong.c b/src/mame/drivers/mrjong.c
index ce3b08a3178..c3ac4951494 100644
--- a/src/mame/drivers/mrjong.c
+++ b/src/mame/drivers/mrjong.c
@@ -43,6 +43,7 @@ ROMs 6A, 7A, 8A, 9A: 2764
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "sound/sn76496.h"
 
 
diff --git a/src/mame/drivers/ms32.c b/src/mame/drivers/ms32.c
index 586bd66ecf5..d3319222018 100644
--- a/src/mame/drivers/ms32.c
+++ b/src/mame/drivers/ms32.c
@@ -168,6 +168,8 @@ Games marked * need dumping / redumping
 /********** BITS & PIECES **********/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
+#include "cpu/v60/v60.h"
 #include "deprecat.h"
 #include "sound/ymf271.h"
 #include "includes/ms32.h"
diff --git a/src/mame/drivers/mugsmash.c b/src/mame/drivers/mugsmash.c
index dce46e9c9d4..c3353700e84 100644
--- a/src/mame/drivers/mugsmash.c
+++ b/src/mame/drivers/mugsmash.c
@@ -40,6 +40,8 @@ behavior we use .
 */
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
+#include "cpu/m68000/m68000.h"
 #include "sound/2151intf.h"
 #include "sound/okim6295.h"
 
diff --git a/src/mame/drivers/murogem.c b/src/mame/drivers/murogem.c
index dc435b39009..6cc5380413f 100644
--- a/src/mame/drivers/murogem.c
+++ b/src/mame/drivers/murogem.c
@@ -95,6 +95,7 @@ val (hex):  27  20  22  04  26  00  20  20  00  07  00  00  80  00  00  00  ns
 */
 
 #include "driver.h"
+#include "cpu/m6800/m6800.h"
 #include "video/mc6845.h"
 
 static UINT8 *murogem_videoram;
diff --git a/src/mame/drivers/mustache.c b/src/mame/drivers/mustache.c
index c4851272776..dc2fa45b240 100644
--- a/src/mame/drivers/mustache.c
+++ b/src/mame/drivers/mustache.c
@@ -28,6 +28,7 @@ YM2151:
 
 ***************************************************************************/
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "audio/seibu.h"	// for seibu_sound_decrypt on the MAIN cpu (not sound)
 #include "audio/t5182.h"
 
diff --git a/src/mame/drivers/mw8080bw.c b/src/mame/drivers/mw8080bw.c
index 63b8014b2ec..5433affe2f6 100644
--- a/src/mame/drivers/mw8080bw.c
+++ b/src/mame/drivers/mw8080bw.c
@@ -141,6 +141,7 @@
 ****************************************************************************/
 
 #include "driver.h"
+#include "cpu/i8085/i8085.h"
 #include "rendlay.h"
 #include "machine/rescap.h"
 #include "mw8080bw.h"
diff --git a/src/mame/drivers/mwarr.c b/src/mame/drivers/mwarr.c
index 529431a771a..d110877dbed 100644
--- a/src/mame/drivers/mwarr.c
+++ b/src/mame/drivers/mwarr.c
@@ -39,6 +39,7 @@ Notes:
 */
 
 #include "driver.h"
+#include "cpu/m68000/m68000.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 d1f5c187857..6c0a3ff6b11 100644
--- a/src/mame/drivers/mystston.c
+++ b/src/mame/drivers/mystston.c
@@ -14,6 +14,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/m6502/m6502.h"
 #include "sound/ay8910.h"
 #include "mystston.h"
 
diff --git a/src/mame/drivers/namcona1.c b/src/mame/drivers/namcona1.c
index f5a3cf3cd25..678dc56acee 100644
--- a/src/mame/drivers/namcona1.c
+++ b/src/mame/drivers/namcona1.c
@@ -159,6 +159,7 @@ Notes:
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/m68000/m68000.h"
 #include "deprecat.h"
 #include "namcona1.h"
 #include "sound/c140.h"
diff --git a/src/mame/drivers/namconb1.c b/src/mame/drivers/namconb1.c
index 9cb8e5d4467..79a98b53b0e 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 "cpu/m68000/m68000.h"
 #include "deprecat.h"
 #include "namconb1.h"
 #include "namcos2.h"
diff --git a/src/mame/drivers/namcond1.c b/src/mame/drivers/namcond1.c
index eb79e78aece..d9ac028f8b6 100644
--- a/src/mame/drivers/namcond1.c
+++ b/src/mame/drivers/namcond1.c
@@ -66,6 +66,7 @@ Notes:
  *************************************************************/
 
 #include "driver.h"
+#include "cpu/m68000/m68000.h"
 #include "video/ygv608.h"
 #include "cpu/h83002/h8.h"
 #include "namcond1.h"
diff --git a/src/mame/drivers/namcos2.c b/src/mame/drivers/namcos2.c
index 5fb837c3f0c..261c0fc0bd4 100644
--- a/src/mame/drivers/namcos2.c
+++ b/src/mame/drivers/namcos2.c
@@ -447,6 +447,8 @@ $a00000 checks have been seen on the Final Lap boards.
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/m68000/m68000.h"
+#include "cpu/m6805/m6805.h"
 #include "deprecat.h"
 #include "namcos2.h"
 #include "cpu/m6809/m6809.h"
diff --git a/src/mame/drivers/namcos21.c b/src/mame/drivers/namcos21.c
index c0261ca2085..b9940529e93 100644
--- a/src/mame/drivers/namcos21.c
+++ b/src/mame/drivers/namcos21.c
@@ -289,6 +289,8 @@ CPU68 PCB:
   JP3
 */
 #include "driver.h"
+#include "cpu/m68000/m68000.h"
+#include "cpu/m6805/m6805.h"
 #include "deprecat.h"
 #include "namcos2.h"
 #include "cpu/m6809/m6809.h"
diff --git a/src/mame/drivers/namcos22.c b/src/mame/drivers/namcos22.c
index a75ee01c184..a94e1e57c93 100644
--- a/src/mame/drivers/namcos22.c
+++ b/src/mame/drivers/namcos22.c
@@ -1109,6 +1109,7 @@
  */
 
 #include "driver.h"
+#include "cpu/m68000/m68000.h"
 #include "deprecat.h"
 #include "namcos22.h"
 #include "cpu/tms32025/tms32025.h"
diff --git a/src/mame/drivers/namcos86.c b/src/mame/drivers/namcos86.c
index e75408f1e9c..2afadc4c29b 100644
--- a/src/mame/drivers/namcos86.c
+++ b/src/mame/drivers/namcos86.c
@@ -175,6 +175,7 @@ TODO:
 *******************************************************************/
 
 #include "driver.h"
+#include "cpu/m6809/m6809.h"
 #include "cpu/m6800/m6800.h"
 #include "sound/2151intf.h"
 #include "sound/namco.h"
diff --git a/src/mame/drivers/naomi.c b/src/mame/drivers/naomi.c
index 491f16326f8..ebe4dcff103 100644
--- a/src/mame/drivers/naomi.c
+++ b/src/mame/drivers/naomi.c
@@ -653,6 +653,7 @@ Notes:
 */
 
 #include "driver.h"
+#include "cpu/arm7/arm7.h"
 #include "video/generic.h"
 #include "machine/eeprom.h"
 #include "naomibd.h"
diff --git a/src/mame/drivers/naughtyb.c b/src/mame/drivers/naughtyb.c
index 15a322d6de6..5a8094bcb88 100644
--- a/src/mame/drivers/naughtyb.c
+++ b/src/mame/drivers/naughtyb.c
@@ -103,6 +103,7 @@ TODO:
  ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "sound/custom.h"
 #include "sound/tms36xx.h"
 #include "includes/phoenix.h"
diff --git a/src/mame/drivers/nbmj8688.c b/src/mame/drivers/nbmj8688.c
index 1bcd662bf40..6820c841220 100644
--- a/src/mame/drivers/nbmj8688.c
+++ b/src/mame/drivers/nbmj8688.c
@@ -28,6 +28,7 @@ TODO:
 ******************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "nb1413m3.h"
 #include "sound/dac.h"
 #include "sound/ay8910.h"
diff --git a/src/mame/drivers/nbmj8891.c b/src/mame/drivers/nbmj8891.c
index 5f95eae1cf9..7f7c2b717cd 100644
--- a/src/mame/drivers/nbmj8891.c
+++ b/src/mame/drivers/nbmj8891.c
@@ -44,6 +44,7 @@ TODO:
 ******************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "nb1413m3.h"
 #include "sound/dac.h"
 #include "sound/ay8910.h"
diff --git a/src/mame/drivers/nbmj8991.c b/src/mame/drivers/nbmj8991.c
index 673df4b7d7d..a0bfc8fe626 100644
--- a/src/mame/drivers/nbmj8991.c
+++ b/src/mame/drivers/nbmj8991.c
@@ -29,6 +29,7 @@ Notes:
 ******************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "deprecat.h"
 #include "nb1413m3.h"
 #include "sound/ay8910.h"
diff --git a/src/mame/drivers/nbmj9195.c b/src/mame/drivers/nbmj9195.c
index bf74dcc1afb..cde83fc0d33 100644
--- a/src/mame/drivers/nbmj9195.c
+++ b/src/mame/drivers/nbmj9195.c
@@ -20,6 +20,7 @@ Notes:
 ******************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "machine/z80ctc.h"
 #include "nb1413m3.h"		// needed for mahjong input controller
 #include "sound/3812intf.h"
diff --git a/src/mame/drivers/nemesis.c b/src/mame/drivers/nemesis.c
index 4aaa1c5175d..74030937950 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 "cpu/m68000/m68000.h"
 #include "deprecat.h"
 #include "cpu/z80/z80.h"
 #include "sound/ay8910.h"
diff --git a/src/mame/drivers/neogeo.c b/src/mame/drivers/neogeo.c
index 032334bb3c5..2ef46870c43 100644
--- a/src/mame/drivers/neogeo.c
+++ b/src/mame/drivers/neogeo.c
@@ -80,6 +80,7 @@
 ****************************************************************************/
 
 #include "driver.h"
+#include "cpu/m68000/m68000.h"
 #include "neogeo.h"
 #include "machine/pd4990a.h"
 #include "cpu/z80/z80.h"
diff --git a/src/mame/drivers/news.c b/src/mame/drivers/news.c
index 4e28222ee04..6cd291adf11 100644
--- a/src/mame/drivers/news.c
+++ b/src/mame/drivers/news.c
@@ -14,6 +14,7 @@ driver by David Haywood
 */
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "news.h"
 #include "sound/okim6295.h"
 
diff --git a/src/mame/drivers/ninjakd2.c b/src/mame/drivers/ninjakd2.c
index 972fea98b15..131e9275845 100644
--- a/src/mame/drivers/ninjakd2.c
+++ b/src/mame/drivers/ninjakd2.c
@@ -121,6 +121,7 @@ TODO:
 ******************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.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 7ddbc510573..956d61401e1 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 "cpu/z80/z80.h"
 #include "taitoipt.h"
 #include "cpu/m68000/m68000.h"
 #include "video/taitoic.h"
diff --git a/src/mame/drivers/nitedrvr.c b/src/mame/drivers/nitedrvr.c
index ef44befdd1c..90b740ce1f1 100644
--- a/src/mame/drivers/nitedrvr.c
+++ b/src/mame/drivers/nitedrvr.c
@@ -35,6 +35,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/m6502/m6502.h"
 #include "machine/rescap.h"
 #include "sound/discrete.h"
 #include "nitedrvr.h"
diff --git a/src/mame/drivers/niyanpai.c b/src/mame/drivers/niyanpai.c
index 2594b74a82f..8b9d0fad144 100644
--- a/src/mame/drivers/niyanpai.c
+++ b/src/mame/drivers/niyanpai.c
@@ -33,6 +33,8 @@ Memo:
 ******************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
+#include "cpu/m68000/m68000.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 860c4081852..a0a8be45d06 100644
--- a/src/mame/drivers/nmg5.c
+++ b/src/mame/drivers/nmg5.c
@@ -220,6 +220,8 @@ Stephh's notes (based on the games M68000 code and some tests) :
 */
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
+#include "cpu/m68000/m68000.h"
 #include "sound/okim6295.h"
 #include "sound/3812intf.h"
 
diff --git a/src/mame/drivers/nmk16.c b/src/mame/drivers/nmk16.c
index 1b45bb00f6b..a9f399c98d3 100644
--- a/src/mame/drivers/nmk16.c
+++ b/src/mame/drivers/nmk16.c
@@ -152,6 +152,9 @@ Afega stands for "Art-Fiction Electronic Game"
 ********************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
+#include "cpu/tlcs90/tlcs90.h"
+#include "cpu/m68000/m68000.h"
 #include "deprecat.h"
 #include "audio/seibu.h"
 #include "sound/2203intf.h"
diff --git a/src/mame/drivers/nova2001.c b/src/mame/drivers/nova2001.c
index aaacfe5dab1..e02618a91f5 100644
--- a/src/mame/drivers/nova2001.c
+++ b/src/mame/drivers/nova2001.c
@@ -118,6 +118,7 @@ e000 - e7ff        R/W      Work RAM
 ******************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "deprecat.h"
 #include "sound/ay8910.h"
 #include "nova2001.h"
diff --git a/src/mame/drivers/nss.c b/src/mame/drivers/nss.c
index 48cf08c3e32..d1b1d15e3a2 100644
--- a/src/mame/drivers/nss.c
+++ b/src/mame/drivers/nss.c
@@ -293,6 +293,8 @@ Contra III   CONTRA_III_1   TC574000   CONTRA_III_0   TC574000    GAME1_NSSU
 
 ***************************************************************************/
 #include "driver.h"
+#include "cpu/spc700/spc700.h"
+#include "cpu/g65816/g65816.h"
 #include "includes/snes.h"
 
 static ADDRESS_MAP_START( snes_map, ADDRESS_SPACE_PROGRAM, 8)
diff --git a/src/mame/drivers/nwk-tr.c b/src/mame/drivers/nwk-tr.c
index 476076d3eb9..2eceed792cb 100644
--- a/src/mame/drivers/nwk-tr.c
+++ b/src/mame/drivers/nwk-tr.c
@@ -213,6 +213,7 @@ Thrill Drive 713A13  -       713A14  -
 */
 
 #include "driver.h"
+#include "cpu/m68000/m68000.h"
 #include "deprecat.h"
 #include "cpu/powerpc/ppc.h"
 #include "cpu/sharc/sharc.h"
diff --git a/src/mame/drivers/offtwall.c b/src/mame/drivers/offtwall.c
index ae4b42d98f6..3a21528e144 100644
--- a/src/mame/drivers/offtwall.c
+++ b/src/mame/drivers/offtwall.c
@@ -18,6 +18,7 @@
 
 
 #include "driver.h"
+#include "cpu/m68000/m68000.h"
 #include "machine/atarigen.h"
 #include "audio/atarijsa.h"
 #include "offtwall.h"
diff --git a/src/mame/drivers/ohmygod.c b/src/mame/drivers/ohmygod.c
index faaea068b3f..55430523480 100644
--- a/src/mame/drivers/ohmygod.c
+++ b/src/mame/drivers/ohmygod.c
@@ -12,6 +12,7 @@ Notes:
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/m68000/m68000.h"
 #include "sound/okim6295.h"
 
 
diff --git a/src/mame/drivers/olibochu.c b/src/mame/drivers/olibochu.c
index 0f259a9bc15..b9dbfaaea60 100644
--- a/src/mame/drivers/olibochu.c
+++ b/src/mame/drivers/olibochu.c
@@ -11,6 +11,7 @@ TODO:
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "deprecat.h"
 #include "sound/ay8910.h"
 
diff --git a/src/mame/drivers/omegrace.c b/src/mame/drivers/omegrace.c
index deeae82e23b..1714d2ada07 100644
--- a/src/mame/drivers/omegrace.c
+++ b/src/mame/drivers/omegrace.c
@@ -217,6 +217,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.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 346d95a46b2..b6703443adc 100644
--- a/src/mame/drivers/oneshot.c
+++ b/src/mame/drivers/oneshot.c
@@ -30,6 +30,8 @@ TO DO :
 */
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
+#include "cpu/m68000/m68000.h"
 #include "sound/okim6295.h"
 #include "sound/3812intf.h"
 #include "includes/oneshot.h"
diff --git a/src/mame/drivers/onetwo.c b/src/mame/drivers/onetwo.c
index 801579a91a0..6f3476b0e63 100644
--- a/src/mame/drivers/onetwo.c
+++ b/src/mame/drivers/onetwo.c
@@ -40,6 +40,7 @@ Note: this is quite clearly a 'Korean bootleg' of Shisensho - Joshiryo-Hen / Mat
 */
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "sound/okim6295.h"
 #include "sound/3812intf.h"
 
diff --git a/src/mame/drivers/opwolf.c b/src/mame/drivers/opwolf.c
index 0bc02800350..d7c47095535 100644
--- a/src/mame/drivers/opwolf.c
+++ b/src/mame/drivers/opwolf.c
@@ -107,6 +107,8 @@ register. So what is controlling priority.
 #define SOUND_CPU_CLOCK		(XTAL_8MHz / 2)		/* clock for Z80 sound CPU */
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
+#include "cpu/m68000/m68000.h"
 #include "taitoipt.h"
 #include "video/taitoic.h"
 #include "audio/taitosnd.h"
diff --git a/src/mame/drivers/orbit.c b/src/mame/drivers/orbit.c
index 44d0cb2cf8b..06ef9cadf61 100644
--- a/src/mame/drivers/orbit.c
+++ b/src/mame/drivers/orbit.c
@@ -18,6 +18,7 @@ Atari Orbit Driver
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/m6800/m6800.h"
 #include "orbit.h"
 #include "sound/discrete.h"
 
diff --git a/src/mame/drivers/othldrby.c b/src/mame/drivers/othldrby.c
index 46edd868ba0..9f8b99e0774 100644
--- a/src/mame/drivers/othldrby.c
+++ b/src/mame/drivers/othldrby.c
@@ -15,6 +15,7 @@ Notes:
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/m68000/m68000.h"
 #include "sound/okim6295.h"
 
 
diff --git a/src/mame/drivers/othunder.c b/src/mame/drivers/othunder.c
index a3e79f866d1..3c150dca032 100644
--- a/src/mame/drivers/othunder.c
+++ b/src/mame/drivers/othunder.c
@@ -231,6 +231,7 @@ TODO:
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.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 67002d44dda..9d5738d93a0 100644
--- a/src/mame/drivers/overdriv.c
+++ b/src/mame/drivers/overdriv.c
@@ -19,6 +19,7 @@ Notes:
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/m68000/m68000.h"
 #include "deprecat.h"
 #include "video/konamiic.h"
 #include "machine/eeprom.h"
diff --git a/src/mame/drivers/pacland.c b/src/mame/drivers/pacland.c
index 5f83d9bdb58..7ebe721d435 100644
--- a/src/mame/drivers/pacland.c
+++ b/src/mame/drivers/pacland.c
@@ -173,6 +173,7 @@ Notes:
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/m6809/m6809.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 2f729b3a6c1..380669810f4 100644
--- a/src/mame/drivers/pacman.c
+++ b/src/mame/drivers/pacman.c
@@ -337,6 +337,7 @@ Boards:
 ****************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "deprecat.h"
 #include "pacman.h"
 #include "cpu/s2650/s2650.h"
diff --git a/src/mame/drivers/pangofun.c b/src/mame/drivers/pangofun.c
index d25211a954b..c4877108345 100644
--- a/src/mame/drivers/pangofun.c
+++ b/src/mame/drivers/pangofun.c
@@ -90,6 +90,7 @@ Arcade Version (Coin-Op) by InfoCube (Pisa, Italy)
 */
 
 #include "driver.h"
+#include "cpu/i386/i386intf.h"
 
 static VIDEO_START(pangofun)
 {
diff --git a/src/mame/drivers/panicr.c b/src/mame/drivers/panicr.c
index e3b08ffabf1..032e7b0d1d8 100644
--- a/src/mame/drivers/panicr.c
+++ b/src/mame/drivers/panicr.c
@@ -60,6 +60,8 @@ D.9B         [f99cac4b] /
 */
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
+#include "cpu/nec/necintrf.h"
 #include "deprecat.h"
 #include "audio/t5182.h"
 
diff --git a/src/mame/drivers/paradise.c b/src/mame/drivers/paradise.c
index d8acd84cc8a..af10b0a013b 100644
--- a/src/mame/drivers/paradise.c
+++ b/src/mame/drivers/paradise.c
@@ -30,6 +30,7 @@ paradise: I'm not sure it's working correctly:
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "deprecat.h"
 #include "paradise.h"
 #include "sound/okim6295.h"
diff --git a/src/mame/drivers/paranoia.c b/src/mame/drivers/paranoia.c
index 222d95481f8..2194a1c0dc4 100644
--- a/src/mame/drivers/paranoia.c
+++ b/src/mame/drivers/paranoia.c
@@ -34,6 +34,8 @@ HuC6280A (Hudson)
 ****************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
+#include "cpu/i8085/i8085.h"
 #include "deprecat.h"
 #include "machine/pcecommn.h"
 #include "video/vdc.h"
diff --git a/src/mame/drivers/parodius.c b/src/mame/drivers/parodius.c
index 84399f894ae..ba59b16517f 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 "cpu/z80/z80.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 a86f6c2d7a2..4c1b7b1dc98 100644
--- a/src/mame/drivers/pasha2.c
+++ b/src/mame/drivers/pasha2.c
@@ -72,6 +72,7 @@ Notes:
 *********************************************************************/
 
 #include "driver.h"
+#include "cpu/e132xs/e132xs.h"
 #include "machine/eeprom.h"
 #include "sound/okim6295.h"
 
diff --git a/src/mame/drivers/pass.c b/src/mame/drivers/pass.c
index 77dbb560ba5..9300a60113a 100644
--- a/src/mame/drivers/pass.c
+++ b/src/mame/drivers/pass.c
@@ -100,6 +100,8 @@
  */
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
+#include "cpu/m68000/m68000.h"
 #include "sound/2203intf.h"
 #include "sound/okim6295.h"
 
diff --git a/src/mame/drivers/pastelg.c b/src/mame/drivers/pastelg.c
index bd32c5dbe2e..c057bd33b07 100644
--- a/src/mame/drivers/pastelg.c
+++ b/src/mame/drivers/pastelg.c
@@ -21,6 +21,7 @@ Memo:
 ******************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "nb1413m3.h"
 #include "sound/ay8910.h"
 #include "sound/dac.h"
diff --git a/src/mame/drivers/pbaction.c b/src/mame/drivers/pbaction.c
index 8752f9d79ce..0f2ce9debe5 100644
--- a/src/mame/drivers/pbaction.c
+++ b/src/mame/drivers/pbaction.c
@@ -64,6 +64,7 @@ Stephh's notes (based on the game Z80 code and some tests) :
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "deprecat.h"
 #include "sound/ay8910.h"
 #include "machine/segacrpt.h"
diff --git a/src/mame/drivers/pengo.c b/src/mame/drivers/pengo.c
index 36948c3606e..06d9aca75ca 100644
--- a/src/mame/drivers/pengo.c
+++ b/src/mame/drivers/pengo.c
@@ -62,6 +62,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "machine/segacrpt.h"
 #include "pacman.h"
 #include "sound/namco.h"
diff --git a/src/mame/drivers/pgm.c b/src/mame/drivers/pgm.c
index 11194a5f0d7..b5b9916c49e 100644
--- a/src/mame/drivers/pgm.c
+++ b/src/mame/drivers/pgm.c
@@ -281,6 +281,9 @@ Notes:
 #define PGMARM7SPEEDHACK 1
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
+#include "cpu/m68000/m68000.h"
+#include "cpu/arm7/arm7.h"
 #include "deprecat.h"
 #include "sound/ics2115.h"
 #include "cpu/arm7/arm7core.h"
diff --git a/src/mame/drivers/phoenix.c b/src/mame/drivers/phoenix.c
index 31faf2f3ef8..f7d2c3c1626 100644
--- a/src/mame/drivers/phoenix.c
+++ b/src/mame/drivers/phoenix.c
@@ -30,6 +30,7 @@ Pleiads:
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "sound/tms36xx.h"
 #include "cpu/i8085/i8085.h"
 #include "sound/ay8910.h"
diff --git a/src/mame/drivers/pingpong.c b/src/mame/drivers/pingpong.c
index 450e9dee1d8..111ded57b21 100644
--- a/src/mame/drivers/pingpong.c
+++ b/src/mame/drivers/pingpong.c
@@ -1,4 +1,5 @@
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "deprecat.h"
 #include "sound/sn76496.h"
 
diff --git a/src/mame/drivers/pipeline.c b/src/mame/drivers/pipeline.c
index 5ad71fd0a07..911fade221e 100644
--- a/src/mame/drivers/pipeline.c
+++ b/src/mame/drivers/pipeline.c
@@ -48,6 +48,7 @@ Notes:
 */
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "machine/z80ctc.h"
 #include "sound/2203intf.h"
 #include "machine/8255ppi.h"
diff --git a/src/mame/drivers/pirates.c b/src/mame/drivers/pirates.c
index 519f34511c7..c9038ff5679 100644
--- a/src/mame/drivers/pirates.c
+++ b/src/mame/drivers/pirates.c
@@ -88,6 +88,7 @@ Notes:
 ---*/
 
 #include "driver.h"
+#include "cpu/m68000/m68000.h"
 #include "machine/eeprom.h"
 #include "sound/okim6295.h"
 
diff --git a/src/mame/drivers/pitnrun.c b/src/mame/drivers/pitnrun.c
index e29077ad9e8..156b1b13cac 100644
--- a/src/mame/drivers/pitnrun.c
+++ b/src/mame/drivers/pitnrun.c
@@ -64,6 +64,7 @@ K1000233A
 */
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "cpu/m6805/m6805.h"
 #include "sound/ay8910.h"
 #include "includes/pitnrun.h"
diff --git a/src/mame/drivers/pkscram.c b/src/mame/drivers/pkscram.c
index 7d97a4b0f79..27dbc3460ec 100644
--- a/src/mame/drivers/pkscram.c
+++ b/src/mame/drivers/pkscram.c
@@ -12,6 +12,7 @@ driver by David Haywood and few bits by Pierpaolo Prazzoli
 */
 
 #include "driver.h"
+#include "cpu/m68000/m68000.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 d49d7b1f5e7..5a8b9d94862 100644
--- a/src/mame/drivers/pktgaldx.c
+++ b/src/mame/drivers/pktgaldx.c
@@ -54,6 +54,7 @@ bootleg todo:
 */
 
 #include "driver.h"
+#include "cpu/m68000/m68000.h"
 #include "decocrpt.h"
 #include "decoprot.h"
 #include "deco16ic.h"
diff --git a/src/mame/drivers/playch10.c b/src/mame/drivers/playch10.c
index 6f0b042d9bb..86c963849e4 100644
--- a/src/mame/drivers/playch10.c
+++ b/src/mame/drivers/playch10.c
@@ -290,6 +290,7 @@ Notes & Todo:
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/m6502/m6502.h"
 #include "video/ppu2c0x.h"
 #include "cpu/z80/z80.h"
 #include "machine/rp5h01.h"
diff --git a/src/mame/drivers/playmark.c b/src/mame/drivers/playmark.c
index a60aa4f7164..457462f779c 100644
--- a/src/mame/drivers/playmark.c
+++ b/src/mame/drivers/playmark.c
@@ -40,6 +40,7 @@ TODO:
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/m68000/m68000.h"
 #include "machine/eeprom.h"
 #include "cpu/pic16c5x/pic16c5x.h"
 #include "sound/okim6295.h"
diff --git a/src/mame/drivers/pntnpuzl.c b/src/mame/drivers/pntnpuzl.c
index aadb5b05657..2ff51873f49 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 "cpu/m68000/m68000.h"
 #include "machine/eeprom.h"
 
 
diff --git a/src/mame/drivers/polepos.c b/src/mame/drivers/polepos.c
index df94db47b13..5a9b434b492 100644
--- a/src/mame/drivers/polepos.c
+++ b/src/mame/drivers/polepos.c
@@ -211,6 +211,8 @@ Notes:
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
+#include "cpu/mb88xx/mb88xx.h"
 #include "deprecat.h"
 #include "machine/namcoio.h"
 #include "sound/namco.h"
diff --git a/src/mame/drivers/poolshrk.c b/src/mame/drivers/poolshrk.c
index f504555ccfe..618b3af355b 100644
--- a/src/mame/drivers/poolshrk.c
+++ b/src/mame/drivers/poolshrk.c
@@ -5,6 +5,7 @@ Atari Poolshark Driver
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/m6800/m6800.h"
 #include "poolshrk.h"
 #include "sound/discrete.h"
 
diff --git a/src/mame/drivers/pooyan.c b/src/mame/drivers/pooyan.c
index 9c32f77cfcf..3cc679ebe61 100644
--- a/src/mame/drivers/pooyan.c
+++ b/src/mame/drivers/pooyan.c
@@ -9,6 +9,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "pooyan.h"
 #include "audio/timeplt.h"
 
diff --git a/src/mame/drivers/popper.c b/src/mame/drivers/popper.c
index 330a0928582..ef4fdfb8d8a 100644
--- a/src/mame/drivers/popper.c
+++ b/src/mame/drivers/popper.c
@@ -79,6 +79,7 @@ Notes:
 */
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "deprecat.h"
 #include "sound/ay8910.h"
 
diff --git a/src/mame/drivers/portrait.c b/src/mame/drivers/portrait.c
index eb9811b19df..c45338bcb2b 100644
--- a/src/mame/drivers/portrait.c
+++ b/src/mame/drivers/portrait.c
@@ -84,6 +84,7 @@ DM81LS95 = TriState buffer
 **************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "cpu/mcs48/mcs48.h"
 #include "sound/5220intf.h"
 
diff --git a/src/mame/drivers/powerbal.c b/src/mame/drivers/powerbal.c
index 0c5f16241b8..e10868b0729 100644
--- a/src/mame/drivers/powerbal.c
+++ b/src/mame/drivers/powerbal.c
@@ -14,6 +14,7 @@ Magic Sticks:
 */
 
 #include "driver.h"
+#include "cpu/m68000/m68000.h"
 #include "machine/eeprom.h"
 #include "sound/okim6295.h"
 
diff --git a/src/mame/drivers/powerins.c b/src/mame/drivers/powerins.c
index bcb1d137cbd..e943c03a55c 100644
--- a/src/mame/drivers/powerins.c
+++ b/src/mame/drivers/powerins.c
@@ -25,6 +25,8 @@ TODO:
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
+#include "cpu/m68000/m68000.h"
 #include "machine/nmk112.h"
 #include "sound/okim6295.h"
 #include "sound/2203intf.h"
diff --git a/src/mame/drivers/ppmast93.c b/src/mame/drivers/ppmast93.c
index 35959171a66..012a63856df 100644
--- a/src/mame/drivers/ppmast93.c
+++ b/src/mame/drivers/ppmast93.c
@@ -130,6 +130,7 @@ Dip locations added based on the notes above.
 */
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "sound/3812intf.h"
 #include "sound/2413intf.h"
 #include "sound/dac.h"
diff --git a/src/mame/drivers/prehisle.c b/src/mame/drivers/prehisle.c
index 838b202a079..c66735335f2 100644
--- a/src/mame/drivers/prehisle.c
+++ b/src/mame/drivers/prehisle.c
@@ -9,6 +9,8 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
+#include "cpu/m68000/m68000.h"
 #include "sound/upd7759.h"
 #include "sound/3812intf.h"
 
diff --git a/src/mame/drivers/psikyo.c b/src/mame/drivers/psikyo.c
index 85ede65d374..76a0f5d8066 100644
--- a/src/mame/drivers/psikyo.c
+++ b/src/mame/drivers/psikyo.c
@@ -61,6 +61,8 @@ This was pointed out by Bart Puype
 *****/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
+#include "cpu/m68000/m68000.h"
 #include "sound/2610intf.h"
 #include "sound/ymf278b.h"
 
diff --git a/src/mame/drivers/psychic5.c b/src/mame/drivers/psychic5.c
index 40e8e535370..c98bac7abf5 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 "cpu/z80/z80.h"
 #include "deprecat.h"
 #include "sound/2203intf.h"
 
diff --git a/src/mame/drivers/pturn.c b/src/mame/drivers/pturn.c
index b6b8836660d..472d2ce181b 100644
--- a/src/mame/drivers/pturn.c
+++ b/src/mame/drivers/pturn.c
@@ -75,6 +75,7 @@ ROMS: All ROM labels say only "PROM" and a number.
 
 */
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "deprecat.h"
 #include "sound/ay8910.h"
 
diff --git a/src/mame/drivers/puckpkmn.c b/src/mame/drivers/puckpkmn.c
index 3a520bdf7db..d99d13df26b 100644
--- a/src/mame/drivers/puckpkmn.c
+++ b/src/mame/drivers/puckpkmn.c
@@ -43,6 +43,7 @@ Notes:
 */
 
 #include "driver.h"
+#include "cpu/m68000/m68000.h"
 #include "genesis.h"
 
 #define MASTER_CLOCK		53693100
diff --git a/src/mame/drivers/punchout.c b/src/mame/drivers/punchout.c
index 98236a52fda..e31aa4a1182 100644
--- a/src/mame/drivers/punchout.c
+++ b/src/mame/drivers/punchout.c
@@ -105,6 +105,7 @@ DIP locations verified for:
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.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 d5206a0f5b7..5a947150721 100644
--- a/src/mame/drivers/pushman.c
+++ b/src/mame/drivers/pushman.c
@@ -24,6 +24,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/m68000/m68000.h"
 #include "cpu/z80/z80.h"
 #include "cpu/m6805/m6805.h"
 #include "sound/2203intf.h"
diff --git a/src/mame/drivers/qix.c b/src/mame/drivers/qix.c
index f2efb6ef5e6..6c55b566d77 100644
--- a/src/mame/drivers/qix.c
+++ b/src/mame/drivers/qix.c
@@ -222,6 +222,7 @@ Interrupts:
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/m6805/m6805.h"
 #include "rendlay.h"
 #include "machine/6821pia.h"
 #include "qix.h"
diff --git a/src/mame/drivers/quantum.c b/src/mame/drivers/quantum.c
index 70571836108..c2b35cb773d 100644
--- a/src/mame/drivers/quantum.c
+++ b/src/mame/drivers/quantum.c
@@ -44,6 +44,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/m68000/m68000.h"
 #include "video/vector.h"
 #include "video/avgdvg.h"
 #include "sound/pokey.h"
diff --git a/src/mame/drivers/queen.c b/src/mame/drivers/queen.c
index cdb13b85f89..a50b7561915 100644
--- a/src/mame/drivers/queen.c
+++ b/src/mame/drivers/queen.c
@@ -17,6 +17,7 @@ ROMs    epia BIOS + solid state HD
 */
 
 #include "driver.h"
+#include "cpu/i386/i386intf.h"
 
 VIDEO_START(queen)
 {
diff --git a/src/mame/drivers/quizdna.c b/src/mame/drivers/quizdna.c
index 2b1c157a192..5589ead7fa4 100644
--- a/src/mame/drivers/quizdna.c
+++ b/src/mame/drivers/quizdna.c
@@ -9,6 +9,7 @@ Quiz Gekiretsu Scramble (Gakuen Paradise 2) (c) 1993 Face
 *****************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "sound/2203intf.h"
 #include "sound/okim6295.h"
 
diff --git a/src/mame/drivers/quizpani.c b/src/mame/drivers/quizpani.c
index 195305594e0..5f62881d195 100644
--- a/src/mame/drivers/quizpani.c
+++ b/src/mame/drivers/quizpani.c
@@ -33,6 +33,7 @@
 *************************************************************************/
 
 #include "driver.h"
+#include "cpu/m68000/m68000.h"
 #include "machine/nmk112.h"
 #include "sound/okim6295.h"
 
diff --git a/src/mame/drivers/quizpun2.c b/src/mame/drivers/quizpun2.c
index b2ecccc4078..7c69b6faabb 100644
--- a/src/mame/drivers/quizpun2.c
+++ b/src/mame/drivers/quizpun2.c
@@ -39,6 +39,7 @@ Notes:
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "sound/2203intf.h"
 
 #define VERBOSE_PROTECTION_LOG 0
diff --git a/src/mame/drivers/rabbit.c b/src/mame/drivers/rabbit.c
index 7e5ca959bf7..1030b003d5f 100644
--- a/src/mame/drivers/rabbit.c
+++ b/src/mame/drivers/rabbit.c
@@ -81,6 +81,7 @@ Custom: Imagetek 15000 (2ch video & 2ch sound)
 */
 
 #include "driver.h"
+#include "cpu/m68000/m68000.h"
 #include "deprecat.h"
 #include "machine/eeprom.h"
 
diff --git a/src/mame/drivers/raiden.c b/src/mame/drivers/raiden.c
index 41f3a076639..bacac1da395 100644
--- a/src/mame/drivers/raiden.c
+++ b/src/mame/drivers/raiden.c
@@ -36,6 +36,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/nec/necintrf.h"
 #include "cpu/z80/z80.h"
 #include "audio/seibu.h"
 #include "sound/3812intf.h"
diff --git a/src/mame/drivers/raiden2.c b/src/mame/drivers/raiden2.c
index 53c7468ccd5..ca2457a55dc 100644
--- a/src/mame/drivers/raiden2.c
+++ b/src/mame/drivers/raiden2.c
@@ -136,6 +136,7 @@ Current Problem(s) - in order of priority
 */
 
 #include "driver.h"
+#include "cpu/nec/necintrf.h"
 #include "cpu/z80/z80.h"
 #include "audio/seibu.h"
 #include "machine/eeprom.h"
diff --git a/src/mame/drivers/rainbow.c b/src/mame/drivers/rainbow.c
index eceb77e14ff..1004376555b 100644
--- a/src/mame/drivers/rainbow.c
+++ b/src/mame/drivers/rainbow.c
@@ -237,6 +237,8 @@ Stephh's notes (based on the game M68000 code and some tests) :
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
+#include "cpu/m68000/m68000.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 7fd05b35123..b950ce3df2c 100644
--- a/src/mame/drivers/rallyx.c
+++ b/src/mame/drivers/rallyx.c
@@ -189,6 +189,7 @@ TODO:
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.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 2fe0a992426..a15d531b449 100644
--- a/src/mame/drivers/rampart.c
+++ b/src/mame/drivers/rampart.c
@@ -23,6 +23,7 @@
 
 
 #include "driver.h"
+#include "cpu/m68000/m68000.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 8be15cfbcfd..29fbd5c6ea6 100644
--- a/src/mame/drivers/rastan.c
+++ b/src/mame/drivers/rastan.c
@@ -157,6 +157,8 @@ Stephh's notes (based on the game M68000 code and some tests) :
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
+#include "cpu/m68000/m68000.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 0ca1c968ef1..63d64126b4d 100644
--- a/src/mame/drivers/rbmk.c
+++ b/src/mame/drivers/rbmk.c
@@ -50,6 +50,7 @@ Notes:
 */
 
 #include "driver.h"
+#include "cpu/m68000/m68000.h"
 #include "sound/okim6295.h"
 #include "machine/eeprom.h"
 
diff --git a/src/mame/drivers/rcasino.c b/src/mame/drivers/rcasino.c
index fc753bca2b8..fda007fa2f5 100644
--- a/src/mame/drivers/rcasino.c
+++ b/src/mame/drivers/rcasino.c
@@ -35,6 +35,7 @@ Get correct data for hopper on and lockout.
 */
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "sound/ay8910.h"
 
 static tilemap *bg_tilemap;
diff --git a/src/mame/drivers/realbrk.c b/src/mame/drivers/realbrk.c
index c5bb0ddbc41..3fb75b5bf37 100644
--- a/src/mame/drivers/realbrk.c
+++ b/src/mame/drivers/realbrk.c
@@ -41,6 +41,7 @@ To Do:
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/m68000/m68000.h"
 #include "deprecat.h"
 #include "machine/tmp68301.h"
 #include "realbrk.h"
diff --git a/src/mame/drivers/redclash.c b/src/mame/drivers/redclash.c
index e99b2f027d1..1c50629bd23 100644
--- a/src/mame/drivers/redclash.c
+++ b/src/mame/drivers/redclash.c
@@ -21,6 +21,7 @@ TODO:
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 
 
 extern WRITE8_HANDLER( redclash_videoram_w );
diff --git a/src/mame/drivers/relief.c b/src/mame/drivers/relief.c
index 6981321338c..8627ba4c006 100644
--- a/src/mame/drivers/relief.c
+++ b/src/mame/drivers/relief.c
@@ -18,6 +18,7 @@
 
 
 #include "driver.h"
+#include "cpu/m68000/m68000.h"
 #include "machine/atarigen.h"
 #include "relief.h"
 #include "sound/okim6295.h"
diff --git a/src/mame/drivers/retofinv.c b/src/mame/drivers/retofinv.c
index 52686590cf6..896c54a308f 100644
--- a/src/mame/drivers/retofinv.c
+++ b/src/mame/drivers/retofinv.c
@@ -29,6 +29,7 @@ Notes:
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "deprecat.h"
 #include "cpu/m6805/m6805.h"
 #include "sound/sn76496.h"
diff --git a/src/mame/drivers/rmhaihai.c b/src/mame/drivers/rmhaihai.c
index 697ab155500..c3e6b91325a 100644
--- a/src/mame/drivers/rmhaihai.c
+++ b/src/mame/drivers/rmhaihai.c
@@ -29,6 +29,7 @@ TODO:
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "sound/ay8910.h"
 #include "sound/msm5205.h"
 
diff --git a/src/mame/drivers/rohga.c b/src/mame/drivers/rohga.c
index aa82079ec1e..c2633622e4c 100644
--- a/src/mame/drivers/rohga.c
+++ b/src/mame/drivers/rohga.c
@@ -108,6 +108,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/m68000/m68000.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 b0b10fd3ef3..570d9df3822 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 "cpu/z80/z80.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/route16.c b/src/mame/drivers/route16.c
index 7e12f4cf03c..b16b1b4639e 100644
--- a/src/mame/drivers/route16.c
+++ b/src/mame/drivers/route16.c
@@ -68,6 +68,7 @@
  ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "deprecat.h"
 #include "sound/dac.h"
 #include "sound/sn76477.h"
diff --git a/src/mame/drivers/royalmah.c b/src/mame/drivers/royalmah.c
index 4c57e5b9d9f..e89d56825af 100644
--- a/src/mame/drivers/royalmah.c
+++ b/src/mame/drivers/royalmah.c
@@ -85,6 +85,7 @@ Stephh's notes (based on the games Z80 code and some tests) :
 ****************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "deprecat.h"
 #include "cpu/tlcs90/tlcs90.h"
 #include "machine/msm6242.h"
diff --git a/src/mame/drivers/rpunch.c b/src/mame/drivers/rpunch.c
index d95bd06ecdb..bee7bbb0caf 100644
--- a/src/mame/drivers/rpunch.c
+++ b/src/mame/drivers/rpunch.c
@@ -105,6 +105,8 @@
 
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
+#include "cpu/m68000/m68000.h"
 #include "cpu/m6809/m6809.h"
 #include "sound/2151intf.h"
 #include "sound/upd7759.h"
diff --git a/src/mame/drivers/runaway.c b/src/mame/drivers/runaway.c
index 1bfb85061bf..38b791a1175 100644
--- a/src/mame/drivers/runaway.c
+++ b/src/mame/drivers/runaway.c
@@ -11,6 +11,7 @@
 ****************************************************************************/
 
 #include "driver.h"
+#include "cpu/m6502/m6502.h"
 #include "machine/atari_vg.h"
 #include "sound/pokey.h"
 
diff --git a/src/mame/drivers/safarir.c b/src/mame/drivers/safarir.c
index 8a4df3c2d12..4fb7b0e936f 100644
--- a/src/mame/drivers/safarir.c
+++ b/src/mame/drivers/safarir.c
@@ -45,6 +45,7 @@
 ****************************************************************************/
 
 #include "driver.h"
+#include "cpu/i8085/i8085.h"
 
 
 static UINT8 *ram_1, *ram_2;
diff --git a/src/mame/drivers/sandscrp.c b/src/mame/drivers/sandscrp.c
index 1316a6f1144..26c485fe165 100644
--- a/src/mame/drivers/sandscrp.c
+++ b/src/mame/drivers/sandscrp.c
@@ -71,6 +71,8 @@ Is there another alt program rom set labeled 9 & 10?
 */
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
+#include "cpu/m68000/m68000.h"
 #include "machine/eeprom.h"
 #include "includes/kaneko16.h"
 #include "sound/2203intf.h"
diff --git a/src/mame/drivers/sbasketb.c b/src/mame/drivers/sbasketb.c
index ae50c931106..b8b53990551 100644
--- a/src/mame/drivers/sbasketb.c
+++ b/src/mame/drivers/sbasketb.c
@@ -39,6 +39,7 @@ CPU/Video Board Parts:
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "machine/konami1.h"
 #include "cpu/m6809/m6809.h"
 #include "sound/vlm5030.h"
diff --git a/src/mame/drivers/sbowling.c b/src/mame/drivers/sbowling.c
index 999e3c78b55..dd6a480cbc0 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 "cpu/i8085/i8085.h"
 #include "deprecat.h"
 #include "cpu/mcs48/mcs48.h"
 #include "video/resnet.h"
diff --git a/src/mame/drivers/sbrkout.c b/src/mame/drivers/sbrkout.c
index 9999e2e3f9c..ac6a5b533a5 100644
--- a/src/mame/drivers/sbrkout.c
+++ b/src/mame/drivers/sbrkout.c
@@ -31,6 +31,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/m6502/m6502.h"
 #include "sound/dac.h"
 
 #include "sbrkout.lh"
diff --git a/src/mame/drivers/sbugger.c b/src/mame/drivers/sbugger.c
index 8739197ca42..b88c207dbef 100644
--- a/src/mame/drivers/sbugger.c
+++ b/src/mame/drivers/sbugger.c
@@ -98,6 +98,7 @@ Sound PCB
 */
 
 #include "driver.h"
+#include "cpu/i8085/i8085.h"
 #include "deprecat.h"
 #include "sound/sn76496.h"
 
diff --git a/src/mame/drivers/scobra.c b/src/mame/drivers/scobra.c
index 471ed5e0306..1c78b4bbe9e 100644
--- a/src/mame/drivers/scobra.c
+++ b/src/mame/drivers/scobra.c
@@ -33,6 +33,7 @@ Notes/Tidbits:
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "machine/8255ppi.h"
 #include "galaxold.h"
 #include "sound/ay8910.h"
diff --git a/src/mame/drivers/scotrsht.c b/src/mame/drivers/scotrsht.c
index 2547ecde23c..039db7c8039 100644
--- a/src/mame/drivers/scotrsht.c
+++ b/src/mame/drivers/scotrsht.c
@@ -33,6 +33,8 @@ Stephh's notes (based on the game M6502 code and some tests) :
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
+#include "cpu/m6809/m6809.h"
 #include "sound/2203intf.h"
 
 extern UINT8 *scotrsht_scroll;
diff --git a/src/mame/drivers/scramble.c b/src/mame/drivers/scramble.c
index 23cbb74dcf8..30ae3f88880 100644
--- a/src/mame/drivers/scramble.c
+++ b/src/mame/drivers/scramble.c
@@ -26,6 +26,7 @@ Notes:
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "cpu/s2650/s2650.h"
 #include "machine/8255ppi.h"
 #include "sound/ay8910.h"
diff --git a/src/mame/drivers/scregg.c b/src/mame/drivers/scregg.c
index 3167523b16d..6636ca12120 100644
--- a/src/mame/drivers/scregg.c
+++ b/src/mame/drivers/scregg.c
@@ -50,6 +50,7 @@ it as ASCII text.
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/m6502/m6502.h"
 #include "deprecat.h"
 #include "sound/ay8910.h"
 #include "includes/btime.h"
diff --git a/src/mame/drivers/sderby.c b/src/mame/drivers/sderby.c
index eded9b1e4a4..f005d7fa3ed 100644
--- a/src/mame/drivers/sderby.c
+++ b/src/mame/drivers/sderby.c
@@ -59,6 +59,7 @@
 *******************************************************************************************/
 
 #include "driver.h"
+#include "cpu/m68000/m68000.h"
 #include "sound/okim6295.h"
 #include "sderby.lh"
 #include "spacewin.lh"
diff --git a/src/mame/drivers/segae.c b/src/mame/drivers/segae.c
index 27c89869293..87b2f215ce2 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 "cpu/z80/z80.h"
 #include "deprecat.h"
 #include "sound/sn76496.h"
 #include "machine/mc8123.h"
diff --git a/src/mame/drivers/segag80v.c b/src/mame/drivers/segag80v.c
index 180ce0f50e6..885d1f0d684 100644
--- a/src/mame/drivers/segag80v.c
+++ b/src/mame/drivers/segag80v.c
@@ -133,6 +133,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.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 afc763ea3ae..ccabb89d973 100644
--- a/src/mame/drivers/segahang.c
+++ b/src/mame/drivers/segahang.c
@@ -14,6 +14,8 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
+#include "cpu/mcs51/mcs51.h"
 #include "deprecat.h"
 #include "system16.h"
 #include "machine/segaic16.h"
diff --git a/src/mame/drivers/segald.c b/src/mame/drivers/segald.c
index 3a86f03b81a..5c845c90a7c 100644
--- a/src/mame/drivers/segald.c
+++ b/src/mame/drivers/segald.c
@@ -18,6 +18,7 @@ Todo:
 */
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "render.h"
 #include "machine/laserdsc.h"
 
diff --git a/src/mame/drivers/segaorun.c b/src/mame/drivers/segaorun.c
index cc51954c6a4..739ac1836aa 100644
--- a/src/mame/drivers/segaorun.c
+++ b/src/mame/drivers/segaorun.c
@@ -14,6 +14,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "system16.h"
 #include "machine/fd1089.h"
 #include "machine/segaic16.h"
diff --git a/src/mame/drivers/segas16a.c b/src/mame/drivers/segas16a.c
index 79f49bc2841..8d9a6ccf176 100644
--- a/src/mame/drivers/segas16a.c
+++ b/src/mame/drivers/segas16a.c
@@ -144,6 +144,9 @@ Tetris         -         -         -         -         EPR12169  EPR12170  -
 */
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
+#include "cpu/m68000/m68000.h"
+#include "cpu/mcs51/mcs51.h"
 #include "system16.h"
 #include "machine/8255ppi.h"
 #include "machine/fd1089.h"
diff --git a/src/mame/drivers/segas16b.c b/src/mame/drivers/segas16b.c
index 9598a8082fc..fbdda080da9 100644
--- a/src/mame/drivers/segas16b.c
+++ b/src/mame/drivers/segas16b.c
@@ -868,6 +868,9 @@ CPU  - 317-0092  |--------------------------------------------------------------
 
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
+#include "cpu/m68000/m68000.h"
+#include "cpu/mcs51/mcs51.h"
 #include "deprecat.h"
 #include "system16.h"
 #include "machine/segaic16.h"
diff --git a/src/mame/drivers/segas18.c b/src/mame/drivers/segas18.c
index 68829be6de3..4fd2390b610 100644
--- a/src/mame/drivers/segas18.c
+++ b/src/mame/drivers/segas18.c
@@ -28,6 +28,9 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
+#include "cpu/m68000/m68000.h"
+#include "cpu/mcs51/mcs51.h"
 #include "deprecat.h"
 #include "machine/segaic16.h"
 #include "system16.h"
diff --git a/src/mame/drivers/segas32.c b/src/mame/drivers/segas32.c
index 41b10b5f0cb..9b9854dcc6c 100644
--- a/src/mame/drivers/segas32.c
+++ b/src/mame/drivers/segas32.c
@@ -292,6 +292,9 @@ Stadium Cross EPR15093  EPR15094  EPR15018  EPR15019  EPR15192  EPR15020  EPR150
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
+#include "cpu/v60/v60.h"
+#include "cpu/nec/necintrf.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 cf1e01cb93c..0fe2eb3126e 100644
--- a/src/mame/drivers/segaxbd.c
+++ b/src/mame/drivers/segaxbd.c
@@ -20,6 +20,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.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 a2936730648..7acc1285509 100644
--- a/src/mame/drivers/segaybd.c
+++ b/src/mame/drivers/segaybd.c
@@ -10,6 +10,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.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 c64b3d7f666..6564206cad6 100644
--- a/src/mame/drivers/seibuspi.c
+++ b/src/mame/drivers/seibuspi.c
@@ -669,6 +669,8 @@ Notes:
 */
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
+#include "cpu/i386/i386intf.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 7639452e44b..cfd321f38d2 100644
--- a/src/mame/drivers/seicross.c
+++ b/src/mame/drivers/seicross.c
@@ -43,6 +43,8 @@ This info came from http://www.ne.jp/asahi/cc-sakura/akkun/old/fryski.html
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
+#include "cpu/m6800/m6800.h"
 #include "sound/ay8910.h"
 #include "sound/dac.h"
 
diff --git a/src/mame/drivers/sengokmj.c b/src/mame/drivers/sengokmj.c
index e4537d67caa..7732c8ee3d8 100644
--- a/src/mame/drivers/sengokmj.c
+++ b/src/mame/drivers/sengokmj.c
@@ -52,6 +52,7 @@ RSSENGO2.72   chr.
 *******************************************************************************************/
 
 #include "driver.h"
+#include "cpu/nec/necintrf.h"
 #include "audio/seibu.h"
 #include "sound/3812intf.h"
 
diff --git a/src/mame/drivers/senjyo.c b/src/mame/drivers/senjyo.c
index 93454be9092..5488c2dd6c0 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 "cpu/z80/z80.h"
 #include "sound/sn76496.h"
 #include "sound/samples.h"
 #include "machine/segacrpt.h"
diff --git a/src/mame/drivers/seta.c b/src/mame/drivers/seta.c
index dc3182a43c4..3e0e2ea4575 100644
--- a/src/mame/drivers/seta.c
+++ b/src/mame/drivers/seta.c
@@ -1288,6 +1288,9 @@ Note: on screen copyright is (c)1998 Coinmaster.
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
+#include "cpu/m68000/m68000.h"
+#include "cpu/m6502/m6502.h"
 #include "deprecat.h"
 #include "seta.h"
 #include "machine/6821pia.h"
diff --git a/src/mame/drivers/seta2.c b/src/mame/drivers/seta2.c
index 1faee0dd9c8..65d6f094d03 100644
--- a/src/mame/drivers/seta2.c
+++ b/src/mame/drivers/seta2.c
@@ -407,6 +407,7 @@ U38 - U40 Mask roms (Graphics 23c64020 64Mbit) - 23C64020 read as 27C322 with pi
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/m68000/m68000.h"
 #include "deprecat.h"
 #include "machine/tmp68301.h"
 #include "machine/eeprom.h"
diff --git a/src/mame/drivers/sg1000a.c b/src/mame/drivers/sg1000a.c
index c3b373f7be8..71ae499a052 100644
--- a/src/mame/drivers/sg1000a.c
+++ b/src/mame/drivers/sg1000a.c
@@ -112,6 +112,7 @@ CN4               CN5
 ******************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "sound/sn76496.h"
 #include "video/tms9928a.h"
 #include "machine/8255ppi.h"
diff --git a/src/mame/drivers/shadfrce.c b/src/mame/drivers/shadfrce.c
index 97cc31e4bc6..663683a8e99 100644
--- a/src/mame/drivers/shadfrce.c
+++ b/src/mame/drivers/shadfrce.c
@@ -78,6 +78,8 @@ lev 7 : 0x7c : 0000 11d0 - just rte
 */
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
+#include "cpu/m68000/m68000.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 eb88cf41006..0ab77fe7ff8 100644
--- a/src/mame/drivers/shangha3.c
+++ b/src/mame/drivers/shangha3.c
@@ -20,6 +20,7 @@ blocken:
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/m68000/m68000.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 4fe0554ab14..4f497c8549a 100644
--- a/src/mame/drivers/shanghai.c
+++ b/src/mame/drivers/shanghai.c
@@ -23,6 +23,7 @@ displayed.
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/nec/necintrf.h"
 #include "audio/seibu.h"
 #include "video/hd63484.h"
 
diff --git a/src/mame/drivers/shaolins.c b/src/mame/drivers/shaolins.c
index a2b169f65df..747c0d6327c 100644
--- a/src/mame/drivers/shaolins.c
+++ b/src/mame/drivers/shaolins.c
@@ -7,6 +7,7 @@ driver by Allard Van Der Bas
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/m6809/m6809.h"
 #include "deprecat.h"
 #include "sound/sn76496.h"
 
diff --git a/src/mame/drivers/shisen.c b/src/mame/drivers/shisen.c
index ce7e334925a..aac7701fad2 100644
--- a/src/mame/drivers/shisen.c
+++ b/src/mame/drivers/shisen.c
@@ -6,6 +6,7 @@ driver by Nicola Salmoria
 
 ***************************************************************************/
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "deprecat.h"
 #include "audio/m72.h"
 #include "sound/dac.h"
diff --git a/src/mame/drivers/shougi.c b/src/mame/drivers/shougi.c
index 8f24a675010..bb98b5f6577 100644
--- a/src/mame/drivers/shougi.c
+++ b/src/mame/drivers/shougi.c
@@ -82,6 +82,7 @@ PROM  : Type MB7051
 
 
 #include "driver.h"
+#include "cpu/alph8201/alph8201.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 4d092a7fd24..f44895cdf32 100644
--- a/src/mame/drivers/shuuz.c
+++ b/src/mame/drivers/shuuz.c
@@ -18,6 +18,7 @@
 
 
 #include "driver.h"
+#include "cpu/m68000/m68000.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 cd515f64bcb..19c9c21a65e 100644
--- a/src/mame/drivers/sidearms.c
+++ b/src/mame/drivers/sidearms.c
@@ -36,6 +36,7 @@ Notes:
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "sound/2203intf.h"
 #include "sound/2151intf.h"
 
diff --git a/src/mame/drivers/silkroad.c b/src/mame/drivers/silkroad.c
index 4250ec207f4..12fa82f9e14 100644
--- a/src/mame/drivers/silkroad.c
+++ b/src/mame/drivers/silkroad.c
@@ -1,4 +1,5 @@
 #include "driver.h"
+#include "cpu/m68000/m68000.h"
 #include "sound/2151intf.h"
 #include "sound/okim6295.h"
 
diff --git a/src/mame/drivers/skullxbo.c b/src/mame/drivers/skullxbo.c
index 14ab0b3b427..88ef3672fde 100644
--- a/src/mame/drivers/skullxbo.c
+++ b/src/mame/drivers/skullxbo.c
@@ -18,6 +18,7 @@
 
 
 #include "driver.h"
+#include "cpu/m68000/m68000.h"
 #include "machine/atarigen.h"
 #include "audio/atarijsa.h"
 #include "skullxbo.h"
diff --git a/src/mame/drivers/skyarmy.c b/src/mame/drivers/skyarmy.c
index 6ebdaf2c848..3024e5b9355 100644
--- a/src/mame/drivers/skyarmy.c
+++ b/src/mame/drivers/skyarmy.c
@@ -21,6 +21,7 @@
 
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "sound/ay8910.h"
 
 static UINT8 *skyarmy_videoram;
diff --git a/src/mame/drivers/skydiver.c b/src/mame/drivers/skydiver.c
index 71792495d36..b028e068cf4 100644
--- a/src/mame/drivers/skydiver.c
+++ b/src/mame/drivers/skydiver.c
@@ -87,6 +87,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/m6800/m6800.h"
 #include "deprecat.h"
 #include "skydiver.h"
 #include "sound/discrete.h"
diff --git a/src/mame/drivers/skyfox.c b/src/mame/drivers/skyfox.c
index 44a316cc4d5..4a9096a38a8 100644
--- a/src/mame/drivers/skyfox.c
+++ b/src/mame/drivers/skyfox.c
@@ -17,6 +17,7 @@ Verified Dip locations and recommended settings with manual
 
 ***************************************************************************/
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "sound/2203intf.h"
 
 /* Variables defined in video: */
diff --git a/src/mame/drivers/skykid.c b/src/mame/drivers/skykid.c
index 7b751b830e7..4a1f702063a 100644
--- a/src/mame/drivers/skykid.c
+++ b/src/mame/drivers/skykid.c
@@ -14,6 +14,7 @@ Notes:
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/m6809/m6809.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 22c1acf9c2a..7f0765080a8 100644
--- a/src/mame/drivers/skylncr.c
+++ b/src/mame/drivers/skylncr.c
@@ -9,6 +9,7 @@
 *************************************************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "sound/ay8910.h"
 
 static tilemap *tmap, *tmap2;
diff --git a/src/mame/drivers/skyraid.c b/src/mame/drivers/skyraid.c
index 9b1c348e7d4..72de420341d 100644
--- a/src/mame/drivers/skyraid.c
+++ b/src/mame/drivers/skyraid.c
@@ -5,6 +5,7 @@ Atari Sky Raider driver
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/m6502/m6502.h"
 
 extern UINT8* skyraid_alpha_num_ram;
 extern UINT8* skyraid_pos_ram;
diff --git a/src/mame/drivers/slapfght.c b/src/mame/drivers/slapfght.c
index 3afcaf2ca4d..0b0a63f6a4a 100644
--- a/src/mame/drivers/slapfght.c
+++ b/src/mame/drivers/slapfght.c
@@ -399,6 +399,7 @@ Stephh's notes (based on the games Z80 code and some tests) :
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "deprecat.h"
 #include "cpu/m6805/m6805.h"
 #include "sound/ay8910.h"
diff --git a/src/mame/drivers/slapshot.c b/src/mame/drivers/slapshot.c
index e0160116d85..7eca4cd9d24 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 "cpu/z80/z80.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 47699ae36ee..1b7e9de3ea5 100644
--- a/src/mame/drivers/sliver.c
+++ b/src/mame/drivers/sliver.c
@@ -65,6 +65,7 @@ Notes:
 */
 
 #include "driver.h"
+#include "cpu/m68000/m68000.h"
 #include "deprecat.h"
 #include "sound/okim6295.h"
 #include "cpu/mcs51/mcs51.h"
diff --git a/src/mame/drivers/smstrv.c b/src/mame/drivers/smstrv.c
index 348575744ea..a7ee7a2f32c 100644
--- a/src/mame/drivers/smstrv.c
+++ b/src/mame/drivers/smstrv.c
@@ -285,6 +285,7 @@ U145        1Brown          PAL14H4CN
 */
 
 #include "driver.h"
+#include "cpu/i86/i88intf.h"
 #include "sound/ay8910.h"
 #include "machine/8255ppi.h"
 
diff --git a/src/mame/drivers/snesb.c b/src/mame/drivers/snesb.c
index 32434d06f1e..790dea3ad0a 100644
--- a/src/mame/drivers/snesb.c
+++ b/src/mame/drivers/snesb.c
@@ -80,6 +80,8 @@ TODO:
 
 ***************************************************************************/
 #include "driver.h"
+#include "cpu/spc700/spc700.h"
+#include "cpu/g65816/g65816.h"
 #include "includes/snes.h"
 
 static INT8 *shared_ram;
diff --git a/src/mame/drivers/snk.c b/src/mame/drivers/snk.c
index 9e97a8b6459..0eb3c8b91cd 100644
--- a/src/mame/drivers/snk.c
+++ b/src/mame/drivers/snk.c
@@ -258,6 +258,7 @@ TODO:
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "snk.h"
 #include "sound/snkwave.h"
 #include "sound/ay8910.h"
diff --git a/src/mame/drivers/snk68.c b/src/mame/drivers/snk68.c
index 5452b7d6f8c..72d9f0e7ed8 100644
--- a/src/mame/drivers/snk68.c
+++ b/src/mame/drivers/snk68.c
@@ -41,6 +41,7 @@ Notes:
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/m68000/m68000.h"
 #include "cpu/z80/z80.h"
 #include "sound/3812intf.h"
 #include "sound/upd7759.h"
diff --git a/src/mame/drivers/snookr10.c b/src/mame/drivers/snookr10.c
index 892954af4c3..5d7e3ce3ded 100644
--- a/src/mame/drivers/snookr10.c
+++ b/src/mame/drivers/snookr10.c
@@ -362,6 +362,7 @@
 #define MASTER_CLOCK	XTAL_16MHz
 
 #include "driver.h"
+#include "cpu/m6502/m6502.h"
 #include "sound/okim6295.h"
 #include "snookr10.lh"
 
diff --git a/src/mame/drivers/spacefb.c b/src/mame/drivers/spacefb.c
index 1f43f6c8bcf..02c88de74f0 100644
--- a/src/mame/drivers/spacefb.c
+++ b/src/mame/drivers/spacefb.c
@@ -105,6 +105,7 @@
 ****************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "spacefb.h"
 #include "cpu/mcs48/mcs48.h"
 #include "sound/dac.h"
diff --git a/src/mame/drivers/spbactn.c b/src/mame/drivers/spbactn.c
index d632ce0c3d0..d2dc64526f3 100644
--- a/src/mame/drivers/spbactn.c
+++ b/src/mame/drivers/spbactn.c
@@ -126,6 +126,8 @@ cpu #0 (PC=00001A1A): unmapped memory word write to 00090030 = 00F7 & 00FF
 *******************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
+#include "cpu/m68000/m68000.h"
 #include "sound/okim6295.h"
 #include "sound/3812intf.h"
 
diff --git a/src/mame/drivers/spdodgeb.c b/src/mame/drivers/spdodgeb.c
index 148988439bd..12be8d8e6d9 100644
--- a/src/mame/drivers/spdodgeb.c
+++ b/src/mame/drivers/spdodgeb.c
@@ -22,6 +22,7 @@ Notes:
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/m6502/m6502.h"
 #include "deprecat.h"
 #include "cpu/m6809/m6809.h"
 #include "sound/3812intf.h"
diff --git a/src/mame/drivers/speedatk.c b/src/mame/drivers/speedatk.c
index 72144d15d85..00cd4e80d17 100644
--- a/src/mame/drivers/speedatk.c
+++ b/src/mame/drivers/speedatk.c
@@ -75,6 +75,7 @@ PS / PD :  key matrix
 *****************************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "sound/ay8910.h"
 
 static UINT8 mux_data;
diff --git a/src/mame/drivers/speedbal.c b/src/mame/drivers/speedbal.c
index 75fb7df6dff..a436324aa50 100644
--- a/src/mame/drivers/speedbal.c
+++ b/src/mame/drivers/speedbal.c
@@ -51,6 +51,7 @@ c1  ??
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "deprecat.h"
 #include "sound/3812intf.h"
 
diff --git a/src/mame/drivers/speedspn.c b/src/mame/drivers/speedspn.c
index c73f10758db..32ff6e4a1f2 100644
--- a/src/mame/drivers/speedspn.c
+++ b/src/mame/drivers/speedspn.c
@@ -21,6 +21,7 @@ TODO:
 ******************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "sound/okim6295.h"
 
 /*** README INFO **************************************************************
diff --git a/src/mame/drivers/spool99.c b/src/mame/drivers/spool99.c
index 39b07d3489b..9fcf2fa53c8 100644
--- a/src/mame/drivers/spool99.c
+++ b/src/mame/drivers/spool99.c
@@ -88,6 +88,7 @@ Note
 *******************************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "sound/okim6295.h"
 #include "machine/eeprom.h"
 
diff --git a/src/mame/drivers/sprcros2.c b/src/mame/drivers/sprcros2.c
index f4dbdeac4a7..e22ba7729d0 100644
--- a/src/mame/drivers/sprcros2.c
+++ b/src/mame/drivers/sprcros2.c
@@ -55,6 +55,7 @@ Notes:
 */
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "deprecat.h"
 #include "sound/sn76496.h"
 
diff --git a/src/mame/drivers/sprint2.c b/src/mame/drivers/sprint2.c
index 83294a9918d..75c3683271d 100644
--- a/src/mame/drivers/sprint2.c
+++ b/src/mame/drivers/sprint2.c
@@ -18,6 +18,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/m6502/m6502.h"
 #include "sprint2.h"
 #include "sound/discrete.h"
 
diff --git a/src/mame/drivers/sprint4.c b/src/mame/drivers/sprint4.c
index c0ba2fa1468..cebc145c039 100644
--- a/src/mame/drivers/sprint4.c
+++ b/src/mame/drivers/sprint4.c
@@ -5,6 +5,7 @@ Atari Sprint 4 driver
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/m6502/m6502.h"
 #include "audio/sprint4.h"
 
 #define MASTER_CLOCK    12096000
diff --git a/src/mame/drivers/sprint8.c b/src/mame/drivers/sprint8.c
index 284448f2ade..7fbb8a767b9 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 "cpu/m6800/m6800.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 fd28fe7d5c7..8e3da616a2e 100644
--- a/src/mame/drivers/spy.c
+++ b/src/mame/drivers/spy.c
@@ -18,6 +18,7 @@ Revisions:
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "cpu/m6809/m6809.h"
 #include "video/konamiic.h"
 #include "sound/3812intf.h"
diff --git a/src/mame/drivers/srmp2.c b/src/mame/drivers/srmp2.c
index 0e481475637..897de713a00 100644
--- a/src/mame/drivers/srmp2.c
+++ b/src/mame/drivers/srmp2.c
@@ -56,6 +56,8 @@ Note:
 
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
+#include "cpu/m68000/m68000.h"
 #include "deprecat.h"
 #include "sound/ay8910.h"
 #include "sound/msm5205.h"
diff --git a/src/mame/drivers/srmp5.c b/src/mame/drivers/srmp5.c
index d64e6c06a42..31b6339c4b5 100644
--- a/src/mame/drivers/srmp5.c
+++ b/src/mame/drivers/srmp5.c
@@ -30,6 +30,7 @@ SX008-14.BIN ; /
 
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "cpu/mips/r3000.h"
 #include "sound/st0016.h"
 #include "st0016.h"
diff --git a/src/mame/drivers/srmp6.c b/src/mame/drivers/srmp6.c
index affe4809327..5aad047feb4 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 "cpu/m68000/m68000.h"
 #include "deprecat.h"
 #include "sound/nile.h"
 
diff --git a/src/mame/drivers/srumbler.c b/src/mame/drivers/srumbler.c
index 3f71db53b8f..ef6e8448fc5 100644
--- a/src/mame/drivers/srumbler.c
+++ b/src/mame/drivers/srumbler.c
@@ -9,6 +9,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "deprecat.h"
 #include "cpu/m6809/m6809.h"
 #include "sound/2203intf.h"
diff --git a/src/mame/drivers/ssfindo.c b/src/mame/drivers/ssfindo.c
index bf96a886876..6a90feeedd0 100644
--- a/src/mame/drivers/ssfindo.c
+++ b/src/mame/drivers/ssfindo.c
@@ -121,6 +121,7 @@ Notes:
 */
 
 #include "driver.h"
+#include "cpu/arm7/arm7.h"
 #include "cpu/arm7/arm7core.h"
 
 enum
diff --git a/src/mame/drivers/sshangha.c b/src/mame/drivers/sshangha.c
index 51cae8e4ac7..687188c45bf 100644
--- a/src/mame/drivers/sshangha.c
+++ b/src/mame/drivers/sshangha.c
@@ -52,6 +52,8 @@ Stephh's notes (based on the games M68000 code and some tests) :
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
+#include "cpu/m68000/m68000.h"
 #include "sound/2203intf.h"
 #include "sound/okim6295.h"
 
diff --git a/src/mame/drivers/ssingles.c b/src/mame/drivers/ssingles.c
index 3debe9cafc2..a8b9d662641 100644
--- a/src/mame/drivers/ssingles.c
+++ b/src/mame/drivers/ssingles.c
@@ -22,6 +22,7 @@
 */
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "sound/ay8910.h"
 #include "video/mc6845.h"
 
diff --git a/src/mame/drivers/sslam.c b/src/mame/drivers/sslam.c
index 6b6e730a72f..f3d635d326b 100644
--- a/src/mame/drivers/sslam.c
+++ b/src/mame/drivers/sslam.c
@@ -81,6 +81,7 @@ Notes:
 
 
 #include "driver.h"
+#include "cpu/m68000/m68000.h"
 #include "cpu/mcs51/mcs51.h"
 #include "sound/okim6295.h"
 
diff --git a/src/mame/drivers/sspeedr.c b/src/mame/drivers/sspeedr.c
index 15932cbaafb..077aee90ec7 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 "cpu/z80/z80.h"
 #include "sspeedr.lh"
 #include "includes/sspeedr.h"
 
diff --git a/src/mame/drivers/ssrj.c b/src/mame/drivers/ssrj.c
index 601bc7ce9bf..9399b63d541 100644
--- a/src/mame/drivers/ssrj.c
+++ b/src/mame/drivers/ssrj.c
@@ -30,6 +30,7 @@ HW info :
 ************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "sound/ay8910.h"
 
 extern UINT8 *ssrj_vram1,*ssrj_vram2,*ssrj_vram3,*ssrj_vram4,*ssrj_scrollram;
diff --git a/src/mame/drivers/sstrangr.c b/src/mame/drivers/sstrangr.c
index dff0f2c1521..d2eb16b0940 100644
--- a/src/mame/drivers/sstrangr.c
+++ b/src/mame/drivers/sstrangr.c
@@ -6,6 +6,7 @@
 
 
 #include "driver.h"
+#include "cpu/i8085/i8085.h"
 #include "deprecat.h"
 
 
diff --git a/src/mame/drivers/ssv.c b/src/mame/drivers/ssv.c
index 4ea97e2a75e..e5875e35e02 100644
--- a/src/mame/drivers/ssv.c
+++ b/src/mame/drivers/ssv.c
@@ -180,6 +180,8 @@ Notes:
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/v810/v810.h"
+#include "cpu/v60/v60.h"
 #include "deprecat.h"
 #include "machine/eeprom.h"
 #include "sound/es5506.h"
diff --git a/src/mame/drivers/st0016.c b/src/mame/drivers/st0016.c
index a15e717bc59..9665078d9a2 100644
--- a/src/mame/drivers/st0016.c
+++ b/src/mame/drivers/st0016.c
@@ -8,6 +8,7 @@ Todo:
 */
 
 #include "driver.h"
+#include "cpu/v810/v810.h"
 #include "deprecat.h"
 #include "cpu/z80/z80.h"
 #include "sound/st0016.h"
diff --git a/src/mame/drivers/stactics.c b/src/mame/drivers/stactics.c
index 8e99f9afab4..ce7c37d813b 100644
--- a/src/mame/drivers/stactics.c
+++ b/src/mame/drivers/stactics.c
@@ -41,6 +41,7 @@ Verify Color PROM resistor values (Last 8 colors)
 ****************************************************************************/
 
 #include "driver.h"
+#include "cpu/i8085/i8085.h"
 #include "stactics.h"
 #include "stactics.lh"
 
diff --git a/src/mame/drivers/stadhero.c b/src/mame/drivers/stadhero.c
index fe701828c98..d388a2c451b 100644
--- a/src/mame/drivers/stadhero.c
+++ b/src/mame/drivers/stadhero.c
@@ -7,6 +7,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/m68000/m68000.h"
 #include "cpu/m6502/m6502.h"
 #include "sound/2203intf.h"
 #include "sound/3812intf.h"
diff --git a/src/mame/drivers/starfire.c b/src/mame/drivers/starfire.c
index 5806ab42f67..f18ff6bb44b 100644
--- a/src/mame/drivers/starfire.c
+++ b/src/mame/drivers/starfire.c
@@ -45,6 +45,7 @@ starfira has one less rom in total than starfire but everything passes as
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "includes/starfire.h"
 
 
diff --git a/src/mame/drivers/starshp1.c b/src/mame/drivers/starshp1.c
index f8d9c069c1f..34dbd47b42f 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 "cpu/m6502/m6502.h"
 #include "includes/starshp1.h"
 
 int starshp1_attract;
diff --git a/src/mame/drivers/steaser.c b/src/mame/drivers/steaser.c
index 63150f36808..198249254fb 100644
--- a/src/mame/drivers/steaser.c
+++ b/src/mame/drivers/steaser.c
@@ -39,6 +39,7 @@ TODO:
 
 
 #include "driver.h"
+#include "cpu/m68000/m68000.h"
 #include "deprecat.h"
 
 
diff --git a/src/mame/drivers/stepstag.c b/src/mame/drivers/stepstag.c
index 6b9805ca705..bc14f761ea6 100644
--- a/src/mame/drivers/stepstag.c
+++ b/src/mame/drivers/stepstag.c
@@ -8,6 +8,7 @@
  */
 
 #include "driver.h"
+#include "cpu/m68000/m68000.h"
 
 static READ16_HANDLER( unknown_read_0xc00000 )
 {
diff --git a/src/mame/drivers/stfight.c b/src/mame/drivers/stfight.c
index c4a049a4040..82b0524b022 100644
--- a/src/mame/drivers/stfight.c
+++ b/src/mame/drivers/stfight.c
@@ -229,6 +229,7 @@ DONE? (check on real board)
 *****************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "sound/2203intf.h"
 #include "sound/msm5205.h"
 #include "includes/stfight.h"
diff --git a/src/mame/drivers/stlforce.c b/src/mame/drivers/stlforce.c
index 97406257818..e6cb9f75b10 100644
--- a/src/mame/drivers/stlforce.c
+++ b/src/mame/drivers/stlforce.c
@@ -68,6 +68,7 @@ TO DO :
 */
 
 #include "driver.h"
+#include "cpu/m68000/m68000.h"
 #include "machine/eeprom.h"
 #include "sound/okim6295.h"
 
diff --git a/src/mame/drivers/strnskil.c b/src/mame/drivers/strnskil.c
index 8f34d03e755..d31c7466853 100644
--- a/src/mame/drivers/strnskil.c
+++ b/src/mame/drivers/strnskil.c
@@ -15,6 +15,7 @@ Notes:
 *****************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "deprecat.h"
 #include "sound/sn76496.h"
 
diff --git a/src/mame/drivers/stv.c b/src/mame/drivers/stv.c
index d3d8af89096..7117bd2e95d 100644
--- a/src/mame/drivers/stv.c
+++ b/src/mame/drivers/stv.c
@@ -154,6 +154,7 @@ ToDo / Notes:
 */
 
 #include "driver.h"
+#include "cpu/m68000/m68000.h"
 #include "machine/eeprom.h"
 #include "cpu/sh2/sh2.h"
 #include "machine/stvcd.h"
diff --git a/src/mame/drivers/subs.c b/src/mame/drivers/subs.c
index 805a6b1c0d7..16b852ddc86 100644
--- a/src/mame/drivers/subs.c
+++ b/src/mame/drivers/subs.c
@@ -18,6 +18,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/m6502/m6502.h"
 #include "deprecat.h"
 #include "subs.h"
 #include "sound/discrete.h"
diff --git a/src/mame/drivers/suna16.c b/src/mame/drivers/suna16.c
index 4b190ea65d8..abdf5d8569f 100644
--- a/src/mame/drivers/suna16.c
+++ b/src/mame/drivers/suna16.c
@@ -22,6 +22,8 @@ Year + Game                 By      Board      Hardware
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
+#include "cpu/m68000/m68000.h"
 #include "deprecat.h"
 #include "sound/dac.h"
 #include "sound/2151intf.h"
diff --git a/src/mame/drivers/supbtime.c b/src/mame/drivers/supbtime.c
index d6663010e96..62a74bf2937 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 "cpu/m68000/m68000.h"
 #include "cpu/h6280/h6280.h"
 #include "sound/2151intf.h"
 #include "sound/okim6295.h"
diff --git a/src/mame/drivers/supdrapo.c b/src/mame/drivers/supdrapo.c
index 5f5276916a7..26ca63a185c 100644
--- a/src/mame/drivers/supdrapo.c
+++ b/src/mame/drivers/supdrapo.c
@@ -24,6 +24,7 @@ A3-1J
 */
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "sound/ay8910.h"
 
 static tilemap *fg_tilemap;
diff --git a/src/mame/drivers/superdq.c b/src/mame/drivers/superdq.c
index ca2680ea5b1..44f78124d97 100644
--- a/src/mame/drivers/superdq.c
+++ b/src/mame/drivers/superdq.c
@@ -21,6 +21,7 @@
 
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "render.h"
 #include "sound/sn76496.h"
 #include "sound/custom.h"
diff --git a/src/mame/drivers/superqix.c b/src/mame/drivers/superqix.c
index 8214a67618a..466c85f1ca1 100644
--- a/src/mame/drivers/superqix.c
+++ b/src/mame/drivers/superqix.c
@@ -107,6 +107,7 @@ DSW2 stored @ $f237
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "deprecat.h"
 #include "cpu/m6805/m6805.h"
 #include "cpu/mcs51/mcs51.h"
diff --git a/src/mame/drivers/supertnk.c b/src/mame/drivers/supertnk.c
index 33e8730b8e8..09347475679 100644
--- a/src/mame/drivers/supertnk.c
+++ b/src/mame/drivers/supertnk.c
@@ -96,6 +96,7 @@ CRU lines:
 
 
 #include "driver.h"
+#include "cpu/tms9900/tms9900.h"
 #include "sound/ay8910.h"
 
 
diff --git a/src/mame/drivers/suprgolf.c b/src/mame/drivers/suprgolf.c
index f1e12cc8c4f..f00c2b10fe0 100644
--- a/src/mame/drivers/suprgolf.c
+++ b/src/mame/drivers/suprgolf.c
@@ -15,6 +15,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "sound/2203intf.h"
 
 static tilemap *suprgolf_tilemap;
diff --git a/src/mame/drivers/suprridr.c b/src/mame/drivers/suprridr.c
index adc9625e4ad..8deaa400eb3 100644
--- a/src/mame/drivers/suprridr.c
+++ b/src/mame/drivers/suprridr.c
@@ -80,6 +80,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "suprridr.h"
 #include "sound/ay8910.h"
 
diff --git a/src/mame/drivers/suprslam.c b/src/mame/drivers/suprslam.c
index 5af1e50abba..d4f5d65d1ee 100644
--- a/src/mame/drivers/suprslam.c
+++ b/src/mame/drivers/suprslam.c
@@ -81,6 +81,8 @@ EB26IC73.BIN    27C240      /  Main Program
 ******************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
+#include "cpu/m68000/m68000.h"
 #include "video/konamiic.h"
 #include "sound/2610intf.h"
 
diff --git a/src/mame/drivers/tail2nos.c b/src/mame/drivers/tail2nos.c
index 1dcece526b7..6c92501b2a8 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 "cpu/m68000/m68000.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 fbbe0797b29..4437c0e8464 100644
--- a/src/mame/drivers/taito_b.c
+++ b/src/mame/drivers/taito_b.c
@@ -168,6 +168,7 @@ Notes:
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "deprecat.h"
 #include "taitoipt.h"
 #include "cpu/m68000/m68000.h"
diff --git a/src/mame/drivers/taito_f2.c b/src/mame/drivers/taito_f2.c
index 8b9a9bdd8e9..4a8848a3d52 100644
--- a/src/mame/drivers/taito_f2.c
+++ b/src/mame/drivers/taito_f2.c
@@ -293,6 +293,7 @@ Notes:
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "taitoipt.h"
 #include "cpu/m68000/m68000.h"
 #include "video/taitoic.h"
diff --git a/src/mame/drivers/taito_f3.c b/src/mame/drivers/taito_f3.c
index b7c4e27039a..89254a3910c 100644
--- a/src/mame/drivers/taito_f3.c
+++ b/src/mame/drivers/taito_f3.c
@@ -36,6 +36,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/m68000/m68000.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 5b89345ff10..d3d528b8526 100644
--- a/src/mame/drivers/taito_h.c
+++ b/src/mame/drivers/taito_h.c
@@ -128,6 +128,8 @@ Recordbr: loads of unmapped IOC reads and writes.
 
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
+#include "cpu/m68000/m68000.h"
 #include "taitoipt.h"
 #include "audio/taitosnd.h"
 #include "video/taitoic.h"
diff --git a/src/mame/drivers/taito_x.c b/src/mame/drivers/taito_x.c
index 632b776049c..6dbd5dff8d4 100644
--- a/src/mame/drivers/taito_x.c
+++ b/src/mame/drivers/taito_x.c
@@ -311,6 +311,8 @@ Stephh's notes (based on the game M68000 code and some tests) :
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
+#include "cpu/m68000/m68000.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 15a172eea39..b6a7016d725 100644
--- a/src/mame/drivers/taito_z.c
+++ b/src/mame/drivers/taito_z.c
@@ -858,6 +858,7 @@ J1100256A VIDEO PCB
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "taitoipt.h"
 #include "cpu/m68000/m68000.h"
 #include "machine/eeprom.h"
diff --git a/src/mame/drivers/taitoair.c b/src/mame/drivers/taitoair.c
index d97a7b19f07..295054f7dc2 100644
--- a/src/mame/drivers/taitoair.c
+++ b/src/mame/drivers/taitoair.c
@@ -216,6 +216,8 @@ cpu #2 (PC=0000060E): unmapped memory word read from 0000683A & FFFF
 ****************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
+#include "cpu/m68000/m68000.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 845e9683637..447d830c65c 100644
--- a/src/mame/drivers/taitojc.c
+++ b/src/mame/drivers/taitojc.c
@@ -350,6 +350,8 @@ Notes:
 */
 
 #include "driver.h"
+#include "cpu/tms32051/tms32051.h"
+#include "cpu/m68000/m68000.h"
 #include "taito_f3.h"
 #include "cpu/mc68hc11/mc68hc11.h"
 #include "sound/es5506.h"
diff --git a/src/mame/drivers/taitowlf.c b/src/mame/drivers/taitowlf.c
index 6c73fc7f144..b713ab09b9c 100644
--- a/src/mame/drivers/taitowlf.c
+++ b/src/mame/drivers/taitowlf.c
@@ -4,6 +4,7 @@
 */
 
 #include "driver.h"
+#include "cpu/i386/i386intf.h"
 #include "memconv.h"
 #include "devconv.h"
 #include "deprecat.h"
diff --git a/src/mame/drivers/tank8.c b/src/mame/drivers/tank8.c
index 843f60245f2..5c269e1c846 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 "cpu/m6800/m6800.h"
 #include "tank8.h"
 #include "sound/discrete.h"
 
diff --git a/src/mame/drivers/tankbust.c b/src/mame/drivers/tankbust.c
index 0607f8fec5e..3ad1d621c2d 100644
--- a/src/mame/drivers/tankbust.c
+++ b/src/mame/drivers/tankbust.c
@@ -17,6 +17,7 @@ To do:
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "sound/ay8910.h"
 
 
diff --git a/src/mame/drivers/taotaido.c b/src/mame/drivers/taotaido.c
index 5040ce9634e..195c2716edf 100644
--- a/src/mame/drivers/taotaido.c
+++ b/src/mame/drivers/taotaido.c
@@ -64,6 +64,8 @@ zooming might be wrong
 
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
+#include "cpu/m68000/m68000.h"
 #include "sound/2610intf.h"
 #include "includes/taotaido.h"
 
diff --git a/src/mame/drivers/tarzan.c b/src/mame/drivers/tarzan.c
index 0c02a22bd3c..e7cd673b24a 100644
--- a/src/mame/drivers/tarzan.c
+++ b/src/mame/drivers/tarzan.c
@@ -3,6 +3,7 @@
 /* CPU might not be z80 */
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 
 #if 0
 static UINT16 *file1_data;
diff --git a/src/mame/drivers/tatsumi.c b/src/mame/drivers/tatsumi.c
index d7d2861fefd..4eed6a255db 100644
--- a/src/mame/drivers/tatsumi.c
+++ b/src/mame/drivers/tatsumi.c
@@ -138,6 +138,9 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
+#include "cpu/nec/necintrf.h"
+#include "cpu/m68000/m68000.h"
 #include "tatsumi.h"
 #include "sound/2151intf.h"
 #include "sound/okim6295.h"
diff --git a/src/mame/drivers/tattack.c b/src/mame/drivers/tattack.c
index a822208014a..60350de6fed 100644
--- a/src/mame/drivers/tattack.c
+++ b/src/mame/drivers/tattack.c
@@ -19,6 +19,7 @@
 ****************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 
 
 static tilemap *tmap;
diff --git a/src/mame/drivers/taxidrvr.c b/src/mame/drivers/taxidrvr.c
index 30188088dd2..a17d9409ecc 100644
--- a/src/mame/drivers/taxidrvr.c
+++ b/src/mame/drivers/taxidrvr.c
@@ -5,6 +5,7 @@ Taxi Driver  (c) 1984 Graphic Techno
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "machine/8255ppi.h"
 #include "taxidrvr.h"
 #include "sound/ay8910.h"
diff --git a/src/mame/drivers/tcl.c b/src/mame/drivers/tcl.c
index 5c333781c5b..71cb083e536 100644
--- a/src/mame/drivers/tcl.c
+++ b/src/mame/drivers/tcl.c
@@ -37,6 +37,7 @@ Notes:
 */
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "machine/8255ppi.h"
 #include "sound/ay8910.h"
 
diff --git a/src/mame/drivers/tecmosys.c b/src/mame/drivers/tecmosys.c
index 2924a94a5b7..6ac2fd177e7 100644
--- a/src/mame/drivers/tecmosys.c
+++ b/src/mame/drivers/tecmosys.c
@@ -182,6 +182,7 @@ ae500w07.ad1 - M6295 Samples (23c4001)
 */
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "machine/eeprom.h"
 #include "tecmosys.h"
 #include "cpu/m68000/m68000.h"
diff --git a/src/mame/drivers/tempest.c b/src/mame/drivers/tempest.c
index 71d0fff957b..30f0fa42865 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 "cpu/m6502/m6502.h"
 #include "machine/mathbox.h"
 #include "video/avgdvg.h"
 #include "video/vector.h"
diff --git a/src/mame/drivers/terracre.c b/src/mame/drivers/terracre.c
index 26027edf587..bc546a493f5 100644
--- a/src/mame/drivers/terracre.c
+++ b/src/mame/drivers/terracre.c
@@ -81,6 +81,7 @@ AT-2
 */
 
 #include "driver.h"
+#include "cpu/m68000/m68000.h"
 #include "deprecat.h"
 #include "cpu/z80/z80.h"
 #include "sound/dac.h"
diff --git a/src/mame/drivers/tetrisp2.c b/src/mame/drivers/tetrisp2.c
index 6e8a81a66ee..d9c0ec420a2 100644
--- a/src/mame/drivers/tetrisp2.c
+++ b/src/mame/drivers/tetrisp2.c
@@ -34,6 +34,7 @@ Notes:
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/m68000/m68000.h"
 #include "sound/okim6295.h"
 #include "sound/ymz280b.h"
 #include "rocknms.lh"
diff --git a/src/mame/drivers/tetriunk.c b/src/mame/drivers/tetriunk.c
index 607295fbce6..fc538d801fe 100644
--- a/src/mame/drivers/tetriunk.c
+++ b/src/mame/drivers/tetriunk.c
@@ -9,6 +9,7 @@
 */
 
 #include "driver.h"
+#include "cpu/i86/i88intf.h"
 
 static int crtindex;
 static int crtdata[256];
diff --git a/src/mame/drivers/thayers.c b/src/mame/drivers/thayers.c
index c0d2639e5d5..8eda2b5a8a3 100644
--- a/src/mame/drivers/thayers.c
+++ b/src/mame/drivers/thayers.c
@@ -11,6 +11,7 @@
 */
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "render.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 3479767673a..6c49dee2f0e 100644
--- a/src/mame/drivers/thedeep.c
+++ b/src/mame/drivers/thedeep.c
@@ -25,6 +25,8 @@ Notes:
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
+#include "cpu/m6502/m6502.h"
 #include "deprecat.h"
 #include "thedeep.h"
 #include "sound/2203intf.h"
diff --git a/src/mame/drivers/thepit.c b/src/mame/drivers/thepit.c
index 8ff631329f8..b16f6c484ca 100644
--- a/src/mame/drivers/thepit.c
+++ b/src/mame/drivers/thepit.c
@@ -115,6 +115,7 @@ HT-01B
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "sound/ay8910.h"
 
 
diff --git a/src/mame/drivers/thunderj.c b/src/mame/drivers/thunderj.c
index cd8296a3d16..6dd74c64bc3 100644
--- a/src/mame/drivers/thunderj.c
+++ b/src/mame/drivers/thunderj.c
@@ -18,6 +18,7 @@
 
 
 #include "driver.h"
+#include "cpu/m68000/m68000.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 3d28ea51b38..0a455d33e6a 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 "cpu/z80/z80.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/tiamc1.c b/src/mame/drivers/tiamc1.c
index 083cea69ced..25e0163305a 100644
--- a/src/mame/drivers/tiamc1.c
+++ b/src/mame/drivers/tiamc1.c
@@ -115,6 +115,7 @@
 */
 
 #include "driver.h"
+#include "cpu/i8085/i8085.h"
 #include "includes/tiamc1.h"
 
 static UINT8 *video_ram;
diff --git a/src/mame/drivers/tigeroad.c b/src/mame/drivers/tigeroad.c
index 9bf7f61db69..40caef6118c 100644
--- a/src/mame/drivers/tigeroad.c
+++ b/src/mame/drivers/tigeroad.c
@@ -20,6 +20,7 @@ Memory Overview:
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/m68000/m68000.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 3c86c1c01bf..03546ea0dd5 100644
--- a/src/mame/drivers/timelimt.c
+++ b/src/mame/drivers/timelimt.c
@@ -11,6 +11,7 @@ Notes:
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "sound/ay8910.h"
 
 /* from video */
diff --git a/src/mame/drivers/timeplt.c b/src/mame/drivers/timeplt.c
index d2d772244ee..4831b362181 100644
--- a/src/mame/drivers/timeplt.c
+++ b/src/mame/drivers/timeplt.c
@@ -45,6 +45,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "timeplt.h"
 #include "audio/timeplt.h"
 
diff --git a/src/mame/drivers/tmaster.c b/src/mame/drivers/tmaster.c
index 4e0384c1255..1941f989226 100644
--- a/src/mame/drivers/tmaster.c
+++ b/src/mame/drivers/tmaster.c
@@ -99,6 +99,7 @@ To Do:
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/m68000/m68000.h"
 #include "deprecat.h"
 #include "sound/okim6295.h"
 #include "machine/eeprom.h"
diff --git a/src/mame/drivers/tnzs.c b/src/mame/drivers/tnzs.c
index 95a0d169370..51c44c3e763 100644
--- a/src/mame/drivers/tnzs.c
+++ b/src/mame/drivers/tnzs.c
@@ -620,6 +620,7 @@ Driver by Takahiro Nogi (nogi@kt.rim.or.jp) 1999/11/06
 
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "taitoipt.h"
 #include "cpu/i8x41/i8x41.h"
 #include "sound/2203intf.h"
diff --git a/src/mame/drivers/toaplan1.c b/src/mame/drivers/toaplan1.c
index dee3e1a410d..05827d7480c 100644
--- a/src/mame/drivers/toaplan1.c
+++ b/src/mame/drivers/toaplan1.c
@@ -62,6 +62,8 @@ To Do:
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
+#include "cpu/m68000/m68000.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 ced49144b52..09e6ed6962d 100644
--- a/src/mame/drivers/toaplan2.c
+++ b/src/mame/drivers/toaplan2.c
@@ -243,6 +243,8 @@ To Do / Unknowns:
 
 
 #include "driver.h"
+#include "cpu/z180/z180.h"
+#include "cpu/nec/necintrf.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 ffeb02fdbf4..949990ecc2d 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 "cpu/m68000/m68000.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 042792ef4ef..d7c722ad121 100644
--- a/src/mame/drivers/toobin.c
+++ b/src/mame/drivers/toobin.c
@@ -18,6 +18,7 @@
 
 
 #include "driver.h"
+#include "cpu/m68000/m68000.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 f42cfebe945..51b1448c017 100644
--- a/src/mame/drivers/topshoot.c
+++ b/src/mame/drivers/topshoot.c
@@ -134,6 +134,8 @@ connector, but of course, I can be wrong.
 */
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
+#include "cpu/m68000/m68000.h"
 #include "genesis.h"
 
 
diff --git a/src/mame/drivers/topspeed.c b/src/mame/drivers/topspeed.c
index ec488eb338e..96247ad8ce2 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 "cpu/z80/z80.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 d488cb84a81..023400404e3 100644
--- a/src/mame/drivers/toratora.c
+++ b/src/mame/drivers/toratora.c
@@ -18,6 +18,7 @@ TODO:
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/m6800/m6800.h"
 #include "machine/6821pia.h"
 #include "sound/sn76477.h"
 
diff --git a/src/mame/drivers/toypop.c b/src/mame/drivers/toypop.c
index 4ef81879b66..bb6180410e8 100644
--- a/src/mame/drivers/toypop.c
+++ b/src/mame/drivers/toypop.c
@@ -30,6 +30,8 @@ TODO:
 ****************************************/
 
 #include "driver.h"
+#include "cpu/m6809/m6809.h"
+#include "cpu/m68000/m68000.h"
 #include "machine/namcoio.h"
 #include "sound/namco.h"
 
diff --git a/src/mame/drivers/tp84.c b/src/mame/drivers/tp84.c
index 386983dbd12..cf90b220101 100644
--- a/src/mame/drivers/tp84.c
+++ b/src/mame/drivers/tp84.c
@@ -65,6 +65,8 @@ C004      76489 #4 trigger
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
+#include "cpu/m6809/m6809.h"
 #include "sound/sn76496.h"
 #include "sound/flt_rc.h"
 
diff --git a/src/mame/drivers/trackfld.c b/src/mame/drivers/trackfld.c
index 59544985c18..2d24ebf19cb 100644
--- a/src/mame/drivers/trackfld.c
+++ b/src/mame/drivers/trackfld.c
@@ -18,6 +18,8 @@ MAIN BOARD:
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
+#include "cpu/m6800/m6800.h"
 #include "machine/konami1.h"
 #include "cpu/m6809/m6809.h"
 #include "sound/sn76496.h"
diff --git a/src/mame/drivers/travrusa.c b/src/mame/drivers/travrusa.c
index ec832fb18b0..d7956d4ae7c 100644
--- a/src/mame/drivers/travrusa.c
+++ b/src/mame/drivers/travrusa.c
@@ -48,6 +48,7 @@ and 2764 eprom (swapped D3/D4 and D5/D6 data lines)
 ****************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "audio/irem.h"
 
 extern UINT8 *travrusa_videoram;
diff --git a/src/mame/drivers/triplhnt.c b/src/mame/drivers/triplhnt.c
index 9f154b6580c..e2510430295 100644
--- a/src/mame/drivers/triplhnt.c
+++ b/src/mame/drivers/triplhnt.c
@@ -11,6 +11,7 @@ To Do:
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/m6800/m6800.h"
 #include "triplhnt.h"
 
 static UINT8 triplhnt_cmos[16];
diff --git a/src/mame/drivers/trucocl.c b/src/mame/drivers/trucocl.c
index 4f88ccfc746..ecd60c22cc6 100644
--- a/src/mame/drivers/trucocl.c
+++ b/src/mame/drivers/trucocl.c
@@ -33,6 +33,7 @@ Daughterboard: Custom made, plugged in the 2 roms and Z80 mainboard sockets.
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "sound/dac.h"
 
 /* from video */
diff --git a/src/mame/drivers/trvmadns.c b/src/mame/drivers/trvmadns.c
index 7d578a8e834..33a588cf7ba 100644
--- a/src/mame/drivers/trvmadns.c
+++ b/src/mame/drivers/trvmadns.c
@@ -61,6 +61,7 @@ Technology = NMOS
 */
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "sound/ay8910.h"
 
 static tilemap *bg_tilemap;
diff --git a/src/mame/drivers/trvquest.c b/src/mame/drivers/trvquest.c
index 2ab5032841f..207d55fb1fa 100644
--- a/src/mame/drivers/trvquest.c
+++ b/src/mame/drivers/trvquest.c
@@ -35,6 +35,7 @@ Notes:
 */
 
 #include "driver.h"
+#include "cpu/m6809/m6809.h"
 #include "machine/6522via.h"
 #include "sound/ay8910.h"
 #include "gameplan.h"
diff --git a/src/mame/drivers/tryout.c b/src/mame/drivers/tryout.c
index 614ad806d45..67a2ee350a3 100644
--- a/src/mame/drivers/tryout.c
+++ b/src/mame/drivers/tryout.c
@@ -13,6 +13,7 @@
 ****************************************************************/
 
 #include "driver.h"
+#include "cpu/m6502/m6502.h"
 #include "deprecat.h"
 #include "sound/2203intf.h"
 
diff --git a/src/mame/drivers/ttchamp.c b/src/mame/drivers/ttchamp.c
index c10a27649a9..38a3ebaccf3 100644
--- a/src/mame/drivers/ttchamp.c
+++ b/src/mame/drivers/ttchamp.c
@@ -42,6 +42,7 @@ The PCB is Spanish and manufacured by Gamart.
 */
 
 #include "driver.h"
+#include "cpu/nec/necintrf.h"
 
 static UINT16 *peno_vram;
 
diff --git a/src/mame/drivers/tubep.c b/src/mame/drivers/tubep.c
index 0d372c4bad3..2c4440d861a 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 "cpu/m6800/m6800.h"
 #include "cpu/z80/z80.h"
 #include "cpu/m6805/m6805.h"
 #include "sound/ay8910.h"
diff --git a/src/mame/drivers/tugboat.c b/src/mame/drivers/tugboat.c
index 44d6ec86271..bd54e5be4fc 100644
--- a/src/mame/drivers/tugboat.c
+++ b/src/mame/drivers/tugboat.c
@@ -22,6 +22,7 @@ always false - counter was reloaded and incremented before interrupt occurs
 ****************************************************************************/
 
 #include "driver.h"
+#include "cpu/m6502/m6502.h"
 #include "machine/6821pia.h"
 #include "sound/ay8910.h"
 
diff --git a/src/mame/drivers/tumbleb.c b/src/mame/drivers/tumbleb.c
index 688cb2d53cf..72d6cf2b215 100644
--- a/src/mame/drivers/tumbleb.c
+++ b/src/mame/drivers/tumbleb.c
@@ -309,6 +309,8 @@ Stephh's notes (based on the games M68000 code and some tests) :
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
+#include "cpu/m68000/m68000.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 6ff94c63330..4fc4268e3d3 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 "cpu/m68000/m68000.h"
 #include "cpu/h6280/h6280.h"
 #include "decocrpt.h"
 #include "sound/2151intf.h"
diff --git a/src/mame/drivers/tunhunt.c b/src/mame/drivers/tunhunt.c
index 0bea1b2fdd5..20520ce03a2 100644
--- a/src/mame/drivers/tunhunt.c
+++ b/src/mame/drivers/tunhunt.c
@@ -49,6 +49,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/m6502/m6502.h"
 #include "deprecat.h"
 #include "sound/pokey.h"
 
diff --git a/src/mame/drivers/turbo.c b/src/mame/drivers/turbo.c
index 8af84893291..0de78bef02a 100644
--- a/src/mame/drivers/turbo.c
+++ b/src/mame/drivers/turbo.c
@@ -145,6 +145,7 @@
 **************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "machine/8255ppi.h"
 #include "turbo.h"
 #include "machine/segacrpt.h"
diff --git a/src/mame/drivers/twincobr.c b/src/mame/drivers/twincobr.c
index b8f2f998a59..e732acacc40 100644
--- a/src/mame/drivers/twincobr.c
+++ b/src/mame/drivers/twincobr.c
@@ -188,6 +188,7 @@ Shark   Zame
 
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "cpu/m68000/m68000.h"
 #include "cpu/tms32010/tms32010.h"
 #include "twincobr.h"
diff --git a/src/mame/drivers/twins.c b/src/mame/drivers/twins.c
index 96a03bae275..454e62adf48 100644
--- a/src/mame/drivers/twins.c
+++ b/src/mame/drivers/twins.c
@@ -49,6 +49,7 @@ Electronic Devices was printed on rom labels
 */
 
 #include "driver.h"
+#include "cpu/nec/necintrf.h"
 #include "sound/ay8910.h"
 
 static UINT16 *twins_videoram;
diff --git a/src/mame/drivers/tx1.c b/src/mame/drivers/tx1.c
index ded4cc5bc36..8d738b0aab7 100644
--- a/src/mame/drivers/tx1.c
+++ b/src/mame/drivers/tx1.c
@@ -41,6 +41,8 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
+#include "cpu/i86/i86intf.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 763dddade9e..176af55569d 100644
--- a/src/mame/drivers/uapce.c
+++ b/src/mame/drivers/uapce.c
@@ -24,6 +24,7 @@
 */
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "deprecat.h"
 #include "machine/pcecommn.h"
 #include "video/vdc.h"
diff --git a/src/mame/drivers/ultratnk.c b/src/mame/drivers/ultratnk.c
index 59074839c27..984a726d1b7 100644
--- a/src/mame/drivers/ultratnk.c
+++ b/src/mame/drivers/ultratnk.c
@@ -5,6 +5,7 @@ Atari Ultra Tank driver
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/m6502/m6502.h"
 #include "ultratnk.h"
 #include "audio/sprint4.h"
 
diff --git a/src/mame/drivers/ultrsprt.c b/src/mame/drivers/ultrsprt.c
index c875b6f230a..668af3e062a 100644
--- a/src/mame/drivers/ultrsprt.c
+++ b/src/mame/drivers/ultrsprt.c
@@ -5,6 +5,7 @@
 */
 
 #include "driver.h"
+#include "cpu/m68000/m68000.h"
 #include "cpu/powerpc/ppc.h"
 #include "sound/k054539.h"
 #include "machine/eeprom.h"
diff --git a/src/mame/drivers/unico.c b/src/mame/drivers/unico.c
index 93217232926..18bb15a89de 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 "cpu/m68000/m68000.h"
 #include "machine/eeprom.h"
 #include "unico.h"
 #include "sound/2151intf.h"
diff --git a/src/mame/drivers/upscope.c b/src/mame/drivers/upscope.c
index ed1b6abd4fb..acbffe988a7 100644
--- a/src/mame/drivers/upscope.c
+++ b/src/mame/drivers/upscope.c
@@ -24,6 +24,7 @@
 **********************************************************************************/
 
 #include "driver.h"
+#include "cpu/m68000/m68000.h"
 #include "includes/amiga.h"
 #include "machine/6526cia.h"
 
diff --git a/src/mame/drivers/usgames.c b/src/mame/drivers/usgames.c
index 84354367006..a725fc4b419 100644
--- a/src/mame/drivers/usgames.c
+++ b/src/mame/drivers/usgames.c
@@ -24,6 +24,7 @@ Sound: AY-3-8912
 */
 
 #include "driver.h"
+#include "cpu/m6809/m6809.h"
 #include "deprecat.h"
 #include "video/mc6845.h"
 #include "sound/ay8910.h"
diff --git a/src/mame/drivers/vamphalf.c b/src/mame/drivers/vamphalf.c
index 6ba21861aab..37c0692db04 100644
--- a/src/mame/drivers/vamphalf.c
+++ b/src/mame/drivers/vamphalf.c
@@ -28,6 +28,8 @@
 *********************************************************************/
 
 #include "driver.h"
+#include "cpu/mcs51/mcs51.h"
+#include "cpu/e132xs/e132xs.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 7f70c6544cd..45810fc7188 100644
--- a/src/mame/drivers/vaportra.c
+++ b/src/mame/drivers/vaportra.c
@@ -9,6 +9,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/m68000/m68000.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 7d5d6de7d42..3248d84210d 100644
--- a/src/mame/drivers/vastar.c
+++ b/src/mame/drivers/vastar.c
@@ -62,6 +62,7 @@ write:
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "deprecat.h"
 #include "sound/ay8910.h"
 
diff --git a/src/mame/drivers/vcombat.c b/src/mame/drivers/vcombat.c
index 7932e5af28e..9ab7b0c4fc9 100644
--- a/src/mame/drivers/vcombat.c
+++ b/src/mame/drivers/vcombat.c
@@ -69,6 +69,7 @@ TODO :  This is a skeleton driver.  Nearly everything.
 
 #include <stdio.h>
 #include "driver.h"
+#include "cpu/m68000/m68000.h"
 #include "video/generic.h"
 
 static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
diff --git a/src/mame/drivers/vegaeo.c b/src/mame/drivers/vegaeo.c
index aafa11c9a4c..cfb5aa91c38 100644
--- a/src/mame/drivers/vegaeo.c
+++ b/src/mame/drivers/vegaeo.c
@@ -13,6 +13,7 @@
  *********************************************************************/
 
 #include "driver.h"
+#include "cpu/e132xs/e132xs.h"
 #include "deprecat.h"
 #include "machine/at28c16.h"
 #include "eolithsp.h"
diff --git a/src/mame/drivers/vendetta.c b/src/mame/drivers/vendetta.c
index c89d7e53a4d..cb27e0e1ee4 100644
--- a/src/mame/drivers/vendetta.c
+++ b/src/mame/drivers/vendetta.c
@@ -87,6 +87,7 @@ Notes:
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.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/vertigo.c b/src/mame/drivers/vertigo.c
index 845e8ba34da..7c3101cd4db 100644
--- a/src/mame/drivers/vertigo.c
+++ b/src/mame/drivers/vertigo.c
@@ -10,6 +10,8 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/m6805/m6805.h"
+#include "cpu/m68000/m68000.h"
 #include "video/vector.h"
 #include "vertigo.h"
 #include "exidy440.h"
diff --git a/src/mame/drivers/vicdual.c b/src/mame/drivers/vicdual.c
index 57513ce1882..6ceef764f72 100644
--- a/src/mame/drivers/vicdual.c
+++ b/src/mame/drivers/vicdual.c
@@ -52,6 +52,8 @@
 ****************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
+#include "cpu/i8085/i8085.h"
 #include "vicdual.h"
 
 
diff --git a/src/mame/drivers/victory.c b/src/mame/drivers/victory.c
index b9e661a2128..2ef19c0e6ec 100644
--- a/src/mame/drivers/victory.c
+++ b/src/mame/drivers/victory.c
@@ -95,6 +95,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "exidy.h"
 #include "victory.h"
 
diff --git a/src/mame/drivers/videopin.c b/src/mame/drivers/videopin.c
index 1a1a3e9ee3f..9caabd039fd 100644
--- a/src/mame/drivers/videopin.c
+++ b/src/mame/drivers/videopin.c
@@ -11,6 +11,7 @@
 *************************************************************************/
 
 #include "driver.h"
+#include "cpu/m6502/m6502.h"
 #include "videopin.h"
 #include "videopin.lh"
 #include "sound/discrete.h"
diff --git a/src/mame/drivers/vigilant.c b/src/mame/drivers/vigilant.c
index 9925290ca75..8d9bd72fba5 100644
--- a/src/mame/drivers/vigilant.c
+++ b/src/mame/drivers/vigilant.c
@@ -15,6 +15,7 @@ Buccaneers has a 5.6888 Mhz and a 18.432 Mhz OSC
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "deprecat.h"
 #include "audio/m72.h"
 #include "sound/dac.h"
diff --git a/src/mame/drivers/vindictr.c b/src/mame/drivers/vindictr.c
index 659573f9c57..2bb3f69276b 100644
--- a/src/mame/drivers/vindictr.c
+++ b/src/mame/drivers/vindictr.c
@@ -18,6 +18,7 @@
 
 
 #include "driver.h"
+#include "cpu/m68000/m68000.h"
 #include "machine/atarigen.h"
 #include "audio/atarijsa.h"
 #include "vindictr.h"
diff --git a/src/mame/drivers/vmetal.c b/src/mame/drivers/vmetal.c
index b8f9d558a1b..0109b60808c 100644
--- a/src/mame/drivers/vmetal.c
+++ b/src/mame/drivers/vmetal.c
@@ -76,6 +76,7 @@ cleanup
 */
 
 #include "driver.h"
+#include "cpu/m68000/m68000.h"
 #include "sound/okim6295.h"
 #include "sound/es8712.h"
 
diff --git a/src/mame/drivers/volfied.c b/src/mame/drivers/volfied.c
index ed751618bed..0ad6f20bb3c 100644
--- a/src/mame/drivers/volfied.c
+++ b/src/mame/drivers/volfied.c
@@ -40,6 +40,8 @@ Stephh's notes (based on the game M68000 code and some tests) :
 ********************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
+#include "cpu/m68000/m68000.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 6c07fd10dd2..df848ea2dfe 100644
--- a/src/mame/drivers/vroulet.c
+++ b/src/mame/drivers/vroulet.c
@@ -35,6 +35,7 @@ Tomasz Slanina 20050225
 */
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "machine/8255ppi.h"
 #include "sound/ay8910.h"
 
diff --git a/src/mame/drivers/vsnes.c b/src/mame/drivers/vsnes.c
index 6b870d43430..ee1152914de 100644
--- a/src/mame/drivers/vsnes.c
+++ b/src/mame/drivers/vsnes.c
@@ -130,6 +130,7 @@ Changes:
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/m6502/m6502.h"
 #include "rendlay.h"
 #include "video/ppu2c0x.h"
 #include "machine/rp5h01.h"
@@ -137,9 +138,6 @@ Changes:
 #include "sound/nes_apu.h"
 #include "includes/vsnes.h"
 
-/* clock frequency */
-#define N2A03_DEFAULTCLOCK ( 21477272.724 / 12 )
-
 #define DUAL_RBI 1
 
 /******************************************************************************/
diff --git a/src/mame/drivers/vulgus.c b/src/mame/drivers/vulgus.c
index 5e93224313b..bb506589034 100644
--- a/src/mame/drivers/vulgus.c
+++ b/src/mame/drivers/vulgus.c
@@ -40,6 +40,7 @@ c001      YM2203 #2 write
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "deprecat.h"
 #include "sound/ay8910.h"
 
diff --git a/src/mame/drivers/wallc.c b/src/mame/drivers/wallc.c
index a68c29ef2b4..3852ee22ac4 100644
--- a/src/mame/drivers/wallc.c
+++ b/src/mame/drivers/wallc.c
@@ -48,6 +48,7 @@ Thanks to HIGHWAYMAN for providing info on how to get to these epoxies
 ****************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "video/resnet.h"
 #include "sound/ay8910.h"
 
diff --git a/src/mame/drivers/wardner.c b/src/mame/drivers/wardner.c
index 81272a76270..bc39728dce0 100644
--- a/src/mame/drivers/wardner.c
+++ b/src/mame/drivers/wardner.c
@@ -124,6 +124,7 @@ out:
 
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "cpu/tms32010/tms32010.h"
 #include "twincobr.h"
 #include "sound/3812intf.h"
diff --git a/src/mame/drivers/warpwarp.c b/src/mame/drivers/warpwarp.c
index cfb0c8107b1..2f7c1a30fb2 100644
--- a/src/mame/drivers/warpwarp.c
+++ b/src/mame/drivers/warpwarp.c
@@ -127,6 +127,7 @@ TODO:
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/i8085/i8085.h"
 #include "sound/custom.h"
 #include "warpwarp.h"
 #include "geebee.lh"
diff --git a/src/mame/drivers/warriorb.c b/src/mame/drivers/warriorb.c
index 48aa9af8564..532462cd129 100644
--- a/src/mame/drivers/warriorb.c
+++ b/src/mame/drivers/warriorb.c
@@ -144,6 +144,7 @@ Colscroll effects?
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "taitoipt.h"
 #include "rendlay.h"
 #include "cpu/m68000/m68000.h"
diff --git a/src/mame/drivers/wecleman.c b/src/mame/drivers/wecleman.c
index bf3f9d7121f..12e760d4f78 100644
--- a/src/mame/drivers/wecleman.c
+++ b/src/mame/drivers/wecleman.c
@@ -270,6 +270,8 @@ TODO:
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
+#include "cpu/m68000/m68000.h"
 #include "deprecat.h"
 #include "video/konamiic.h"
 #include "cpu/m6809/m6809.h"
diff --git a/src/mame/drivers/welltris.c b/src/mame/drivers/welltris.c
index 85e0878b85d..3de19b00e3b 100644
--- a/src/mame/drivers/welltris.c
+++ b/src/mame/drivers/welltris.c
@@ -313,6 +313,8 @@ TODO:
 #define WELLTRIS_4P_HACK 0
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
+#include "cpu/m68000/m68000.h"
 #include "sound/2610intf.h"
 
 UINT16 *welltris_spriteram;
diff --git a/src/mame/drivers/wgp.c b/src/mame/drivers/wgp.c
index f35bd81502f..0561ba0b70e 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 "cpu/z80/z80.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 f8e25989f37..f682f97f0e5 100644
--- a/src/mame/drivers/wheelfir.c
+++ b/src/mame/drivers/wheelfir.c
@@ -49,6 +49,7 @@ something is missing, currently needs a hack to boot
 
 
 #include "driver.h"
+#include "cpu/m68000/m68000.h"
 #include "deprecat.h"
 
 static int toggle_bit;
diff --git a/src/mame/drivers/williams.c b/src/mame/drivers/williams.c
index 74d1d5243d1..eb3f3a731ad 100644
--- a/src/mame/drivers/williams.c
+++ b/src/mame/drivers/williams.c
@@ -492,6 +492,8 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/m6809/m6809.h"
+#include "cpu/m6800/m6800.h"
 #include "machine/6821pia.h"
 #include "audio/williams.h"
 #include "williams.h"
diff --git a/src/mame/drivers/wink.c b/src/mame/drivers/wink.c
index ed12ed69973..df3bd5492cc 100644
--- a/src/mame/drivers/wink.c
+++ b/src/mame/drivers/wink.c
@@ -12,6 +12,7 @@
 */
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "sound/ay8910.h"
 
 static tilemap *bg_tilemap;
diff --git a/src/mame/drivers/witch.c b/src/mame/drivers/witch.c
index 4c6faf2bc2c..1dc596ec620 100644
--- a/src/mame/drivers/witch.c
+++ b/src/mame/drivers/witch.c
@@ -190,6 +190,7 @@ TODO :
 */
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "sound/es8712.h"
 #include "sound/2203intf.h"
 
diff --git a/src/mame/drivers/wiz.c b/src/mame/drivers/wiz.c
index e578d8c9bc1..c1780f9009e 100644
--- a/src/mame/drivers/wiz.c
+++ b/src/mame/drivers/wiz.c
@@ -158,6 +158,7 @@ Stephh's notes (based on the games Z80 code and some tests) :
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "deprecat.h"
 #include "sound/ay8910.h"
 #include "sound/discrete.h"
diff --git a/src/mame/drivers/wldarrow.c b/src/mame/drivers/wldarrow.c
index 511fff256e2..1ad13359e46 100644
--- a/src/mame/drivers/wldarrow.c
+++ b/src/mame/drivers/wldarrow.c
@@ -16,6 +16,7 @@ XTal: 20.0
 **********************************/
 
 #include "driver.h"
+#include "cpu/i8085/i8085.h"
 #include "sound/dac.h"
 
 
diff --git a/src/mame/drivers/wolfpack.c b/src/mame/drivers/wolfpack.c
index 5b1b2986f5f..83d1c512f16 100644
--- a/src/mame/drivers/wolfpack.c
+++ b/src/mame/drivers/wolfpack.c
@@ -5,6 +5,7 @@ Atari Wolf Pack (prototype) driver
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/m6502/m6502.h"
 #include "sound/s14001a.h"
 
 extern int wolfpack_collision;
diff --git a/src/mame/drivers/xexex.c b/src/mame/drivers/xexex.c
index 78ae44bfcee..0f090e6ca20 100644
--- a/src/mame/drivers/xexex.c
+++ b/src/mame/drivers/xexex.c
@@ -62,6 +62,7 @@ Unresolved Issues:
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/m68000/m68000.h"
 #include "deprecat.h"
 #include "video/konamiic.h"
 #include "cpu/z80/z80.h"
diff --git a/src/mame/drivers/xmen.c b/src/mame/drivers/xmen.c
index 4d679b29583..c94ccabbc8b 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 "cpu/m68000/m68000.h"
 #include "deprecat.h"
 #include "video/konamiic.h"
 #include "machine/eeprom.h"
diff --git a/src/mame/drivers/xxmissio.c b/src/mame/drivers/xxmissio.c
index 1fd713243c5..c6b6fdb2476 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 "cpu/z80/z80.h"
 #include "deprecat.h"
 #include "sound/2203intf.h"
 
diff --git a/src/mame/drivers/xybots.c b/src/mame/drivers/xybots.c
index 84423fd62c2..cfe76cefbd8 100644
--- a/src/mame/drivers/xybots.c
+++ b/src/mame/drivers/xybots.c
@@ -18,6 +18,7 @@
 
 
 #include "driver.h"
+#include "cpu/m68000/m68000.h"
 #include "machine/atarigen.h"
 #include "audio/atarijsa.h"
 #include "xybots.h"
diff --git a/src/mame/drivers/yumefuda.c b/src/mame/drivers/yumefuda.c
index cc32bb7d7eb..419b41c8f9e 100644
--- a/src/mame/drivers/yumefuda.c
+++ b/src/mame/drivers/yumefuda.c
@@ -52,6 +52,7 @@ Code disassembling
 *******************************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "machine/eeprom.h"
 #include "sound/ay8910.h"
 
diff --git a/src/mame/drivers/yunsun16.c b/src/mame/drivers/yunsun16.c
index 0ee268f18e1..ff7a4af4d6a 100644
--- a/src/mame/drivers/yunsun16.c
+++ b/src/mame/drivers/yunsun16.c
@@ -86,6 +86,8 @@ Stephh's notes (based on the games M68000 code and some tests) :
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
+#include "cpu/m68000/m68000.h"
 #include "sound/okim6295.h"
 #include "sound/3812intf.h"
 
diff --git a/src/mame/drivers/zaccaria.c b/src/mame/drivers/zaccaria.c
index f2395ba93b9..d1d6d63dfe3 100644
--- a/src/mame/drivers/zaccaria.c
+++ b/src/mame/drivers/zaccaria.c
@@ -34,6 +34,8 @@ Notes:
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
+#include "cpu/m6800/m6800.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 81c4d5831b9..dc009d30448 100644
--- a/src/mame/drivers/zaxxon.c
+++ b/src/mame/drivers/zaxxon.c
@@ -305,6 +305,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.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 174399e0f5c..04dab750011 100644
--- a/src/mame/drivers/zerozone.c
+++ b/src/mame/drivers/zerozone.c
@@ -27,6 +27,8 @@ TODO:
 
 ***************************************************************************/
 #include "driver.h"
+#include "cpu/z80/z80.h"
+#include "cpu/m68000/m68000.h"
 #include "sound/okim6295.h"
 
 VIDEO_START( zerozone );
diff --git a/src/mame/drivers/zn.c b/src/mame/drivers/zn.c
index a5c72ebcc01..8d17adc347a 100644
--- a/src/mame/drivers/zn.c
+++ b/src/mame/drivers/zn.c
@@ -9,6 +9,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/m68000/m68000.h"
 #include "deprecat.h"
 #include "cpu/mips/psx.h"
 #include "cpu/z80/z80.h"
diff --git a/src/mame/drivers/zodiack.c b/src/mame/drivers/zodiack.c
index 5c4968b6843..dae48ab1058 100644
--- a/src/mame/drivers/zodiack.c
+++ b/src/mame/drivers/zodiack.c
@@ -19,6 +19,7 @@ TODO:
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "deprecat.h"
 #include "sound/ay8910.h"
 #include "includes/espial.h"
diff --git a/src/mame/drivers/zr107.c b/src/mame/drivers/zr107.c
index 3d9c12da3d4..2aebbce523e 100644
--- a/src/mame/drivers/zr107.c
+++ b/src/mame/drivers/zr107.c
@@ -174,6 +174,7 @@ Check gticlub.c for details on the bottom board.
 */
 
 #include "driver.h"
+#include "cpu/m68000/m68000.h"
 #include "cpu/powerpc/ppc.h"
 #include "cpu/sharc/sharc.h"
 #include "sound/k054539.h"
diff --git a/src/mame/machine/leland.c b/src/mame/machine/leland.c
index 118b502f9c8..8523fe707d5 100644
--- a/src/mame/machine/leland.c
+++ b/src/mame/machine/leland.c
@@ -7,6 +7,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/i86/i186intf.h"
 #include "machine/eeprom.h"
 #include "cpu/z80/z80.h"
 #include "leland.h"
diff --git a/src/mame/machine/slapstic.c b/src/mame/machine/slapstic.c
index e888beb4eae..904848d6b65 100644
--- a/src/mame/machine/slapstic.c
+++ b/src/mame/machine/slapstic.c
@@ -179,6 +179,7 @@
 *************************************************************************/
 
 #include "driver.h"
+#include "cpu/m6800/m6800.h"
 #include "slapstic.h"
 #include "cpu/m68000/m68000.h"
 
diff --git a/src/mame/machine/toaplan1.c b/src/mame/machine/toaplan1.c
index 2fc02701acc..d702ed5a617 100644
--- a/src/mame/machine/toaplan1.c
+++ b/src/mame/machine/toaplan1.c
@@ -4,6 +4,7 @@
  ***************************************************************************/
 
 #include "driver.h"
+#include "cpu/z80/z80.h"
 #include "cpu/m68000/m68000.h"
 #include "cpu/tms32010/tms32010.h"
 #include "includes/toaplan1.h"