summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/machine
diff options
context:
space:
mode:
author Olivier Galibert <galibert@pobox.com>2017-02-11 18:23:11 +0100
committer Olivier Galibert <galibert@pobox.com>2017-02-11 18:31:20 +0100
commita2557f1b02478c5aaa1fdfa00204ac2e219319a1 (patch)
tree6f1693d59aa53be8c76ffe3bcf7fbc72f8546453 /src/mame/machine
parentc49b631153be9efc3a7e7b6172c17f5418843c0b (diff)
Remove emu.h from headers (nw)
Per Vas' request. If the compile fails for you (i'm thinking osx and windows native debuggers here in particular), add '#include "emu.h"' as first include of the cpp files that fail. Due to our use of precompilation and forced inclusion, emu.h must be included as the very first non-comment thing we do if we want to be sure msvc compiles are identical to gcc/clang ones. Doing it directly instead of through an include increases the correctness probability by a magnitude.
Diffstat (limited to 'src/mame/machine')
-rw-r--r--src/mame/machine/315_5296.cpp1
-rw-r--r--src/mame/machine/315_5296.h1
-rw-r--r--src/mame/machine/6883sam.cpp1
-rw-r--r--src/mame/machine/6883sam.h1
-rw-r--r--src/mame/machine/abc1600mac.cpp1
-rw-r--r--src/mame/machine/abc1600mac.h1
-rw-r--r--src/mame/machine/abc80kb.cpp1
-rw-r--r--src/mame/machine/abc80kb.h1
-rw-r--r--src/mame/machine/alpha8201.cpp1
-rw-r--r--src/mame/machine/alpha8201.h1
-rw-r--r--src/mame/machine/apollo.cpp1
-rw-r--r--src/mame/machine/apollo_dbg.cpp1
-rw-r--r--src/mame/machine/apollo_dbg.h1
-rw-r--r--src/mame/machine/apollo_kbd.cpp1
-rw-r--r--src/mame/machine/apollo_kbd.h1
-rw-r--r--src/mame/machine/apricotkb.cpp1
-rw-r--r--src/mame/machine/apricotkb.h1
-rw-r--r--src/mame/machine/at.cpp1
-rw-r--r--src/mame/machine/at.h1
-rw-r--r--src/mame/machine/cammu.cpp1
-rw-r--r--src/mame/machine/cammu.h3
-rw-r--r--src/mame/machine/cat702.cpp1
-rw-r--r--src/mame/machine/cat702.h1
-rw-r--r--src/mame/machine/cdi070.h1
-rw-r--r--src/mame/machine/cdicdic.h1
-rw-r--r--src/mame/machine/cdislave.h1
-rw-r--r--src/mame/machine/coco.cpp1
-rw-r--r--src/mame/machine/coco12.cpp1
-rw-r--r--src/mame/machine/coco3.cpp1
-rw-r--r--src/mame/machine/compiskb.cpp1
-rw-r--r--src/mame/machine/compiskb.h1
-rw-r--r--src/mame/machine/cuda.h1
-rw-r--r--src/mame/machine/cybiko.cpp1
-rw-r--r--src/mame/machine/dec_lk201.h1
-rw-r--r--src/mame/machine/deco222.cpp1
-rw-r--r--src/mame/machine/deco222.h1
-rw-r--r--src/mame/machine/decocpu6.cpp1
-rw-r--r--src/mame/machine/decocpu6.h1
-rw-r--r--src/mame/machine/decocpu7.cpp1
-rw-r--r--src/mame/machine/decocpu7.h1
-rw-r--r--src/mame/machine/decopincpu.cpp1
-rw-r--r--src/mame/machine/decopincpu.h1
-rw-r--r--src/mame/machine/dgnalpha.cpp1
-rw-r--r--src/mame/machine/dmv_keyb.cpp1
-rw-r--r--src/mame/machine/dmv_keyb.h1
-rw-r--r--src/mame/machine/dragon.cpp1
-rw-r--r--src/mame/machine/egret.h1
-rw-r--r--src/mame/machine/esqlcd.cpp1
-rw-r--r--src/mame/machine/esqlcd.h1
-rw-r--r--src/mame/machine/esqpanel.h1
-rw-r--r--src/mame/machine/esqvfd.cpp1
-rw-r--r--src/mame/machine/esqvfd.h1
-rw-r--r--src/mame/machine/gamecom.cpp1
-rw-r--r--src/mame/machine/gdrom.cpp1
-rw-r--r--src/mame/machine/genpin.cpp1
-rw-r--r--src/mame/machine/genpin.h1
-rw-r--r--src/mame/machine/hng64_net.cpp1
-rw-r--r--src/mame/machine/ibm6580_fdc.cpp1
-rw-r--r--src/mame/machine/ibm6580_fdc.h1
-rw-r--r--src/mame/machine/ibm6580_kbd.cpp1
-rw-r--r--src/mame/machine/ibm6580_kbd.h1
-rw-r--r--src/mame/machine/ie15_kbd.cpp1
-rw-r--r--src/mame/machine/ie15_kbd.h1
-rw-r--r--src/mame/machine/igs036crypt.cpp1
-rw-r--r--src/mame/machine/igs036crypt.h1
-rw-r--r--src/mame/machine/interpro_ioga.cpp1
-rw-r--r--src/mame/machine/interpro_ioga.h3
-rw-r--r--src/mame/machine/interpro_mcga.cpp3
-rw-r--r--src/mame/machine/interpro_mcga.h3
-rw-r--r--src/mame/machine/interpro_sga.cpp1
-rw-r--r--src/mame/machine/interpro_sga.h3
-rw-r--r--src/mame/machine/isbc_208.cpp1
-rw-r--r--src/mame/machine/isbc_208.h1
-rw-r--r--src/mame/machine/isbc_215g.cpp1
-rw-r--r--src/mame/machine/isbc_215g.h1
-rw-r--r--src/mame/machine/iteagle_fpga.cpp1
-rw-r--r--src/mame/machine/jvs13551.cpp1
-rw-r--r--src/mame/machine/jvs13551.h1
-rw-r--r--src/mame/machine/k573cass.cpp1
-rw-r--r--src/mame/machine/k573mcr.cpp1
-rw-r--r--src/mame/machine/k573mcr.h1
-rw-r--r--src/mame/machine/k573msu.cpp1
-rw-r--r--src/mame/machine/k573msu.h1
-rw-r--r--src/mame/machine/k573npu.cpp1
-rw-r--r--src/mame/machine/k573npu.h1
-rw-r--r--src/mame/machine/k7659kb.cpp1
-rw-r--r--src/mame/machine/k7659kb.h1
-rw-r--r--src/mame/machine/kabuki.h1
-rw-r--r--src/mame/machine/kaypro.cpp1
-rw-r--r--src/mame/machine/km035.h1
-rw-r--r--src/mame/machine/lisa.cpp1
-rw-r--r--src/mame/machine/llc.cpp1
-rw-r--r--src/mame/machine/m20_8086.cpp1
-rw-r--r--src/mame/machine/m20_8086.h1
-rw-r--r--src/mame/machine/m20_kbd.cpp1
-rw-r--r--src/mame/machine/m24_kbd.cpp1
-rw-r--r--src/mame/machine/m24_kbd.h1
-rw-r--r--src/mame/machine/m24_z8000.cpp1
-rw-r--r--src/mame/machine/m24_z8000.h1
-rw-r--r--src/mame/machine/m2comm.h1
-rw-r--r--src/mame/machine/mackbd.h1
-rw-r--r--src/mame/machine/mbc55x.cpp1
-rw-r--r--src/mame/machine/mbee.cpp1
-rw-r--r--src/mame/machine/mc80.cpp1
-rw-r--r--src/mame/machine/meters.h1
-rw-r--r--src/mame/machine/midikbd.cpp1
-rw-r--r--src/mame/machine/midikbd.h1
-rw-r--r--src/mame/machine/mm1kb.cpp1
-rw-r--r--src/mame/machine/mm1kb.h1
-rw-r--r--src/mame/machine/ms7004.h1
-rw-r--r--src/mame/machine/msx.cpp1
-rw-r--r--src/mame/machine/mz80.cpp1
-rw-r--r--src/mame/machine/nextkbd.cpp1
-rw-r--r--src/mame/machine/nextkbd.h1
-rw-r--r--src/mame/machine/ngen_kb.cpp1
-rw-r--r--src/mame/machine/ns11prot.cpp1
-rw-r--r--src/mame/machine/ns11prot.h1
-rw-r--r--src/mame/machine/octo_kbd.cpp1
-rw-r--r--src/mame/machine/p2000t.cpp1
-rw-r--r--src/mame/machine/pc1512kb.cpp1
-rw-r--r--src/mame/machine/pc1512kb.h1
-rw-r--r--src/mame/machine/pc9801_cbus.cpp1
-rw-r--r--src/mame/machine/pc9801_cbus.h1
-rw-r--r--src/mame/machine/pc9801_cd.cpp1
-rw-r--r--src/mame/machine/pcd_kbd.cpp1
-rw-r--r--src/mame/machine/pcd_kbd.h1
-rw-r--r--src/mame/machine/pp01.cpp1
-rw-r--r--src/mame/machine/prof80mmu.cpp1
-rw-r--r--src/mame/machine/prof80mmu.h1
-rw-r--r--src/mame/machine/qimi.cpp1
-rw-r--r--src/mame/machine/qimi.h1
-rw-r--r--src/mame/machine/qx10kbd.cpp1
-rw-r--r--src/mame/machine/rm380z.cpp1
-rw-r--r--src/mame/machine/rmnimbus.cpp1
-rw-r--r--src/mame/machine/rmnkbd.cpp1
-rw-r--r--src/mame/machine/segabb.cpp1
-rw-r--r--src/mame/machine/segacrp2_device.h1
-rw-r--r--src/mame/machine/segacrpt_device.h1
-rw-r--r--src/mame/machine/slapstic.cpp1
-rw-r--r--src/mame/machine/sorcerer.cpp1
-rw-r--r--src/mame/machine/special.cpp1
-rw-r--r--src/mame/machine/st0016.cpp1
-rw-r--r--src/mame/machine/st0016.h1
-rw-r--r--src/mame/machine/subsino.h1
-rw-r--r--src/mame/machine/super80.cpp1
-rw-r--r--src/mame/machine/swim.cpp1
-rw-r--r--src/mame/machine/tandy2kb.cpp1
-rw-r--r--src/mame/machine/tandy2kb.h1
-rw-r--r--src/mame/machine/teleprinter.cpp1
-rw-r--r--src/mame/machine/thomflop.cpp1
-rw-r--r--src/mame/machine/trs80.cpp1
-rw-r--r--src/mame/machine/trs80m2kb.cpp1
-rw-r--r--src/mame/machine/trs80m2kb.h1
-rw-r--r--src/mame/machine/upd65031.cpp1
-rw-r--r--src/mame/machine/upd65031.h1
-rw-r--r--src/mame/machine/v1050kb.cpp1
-rw-r--r--src/mame/machine/v1050kb.h1
-rw-r--r--src/mame/machine/vector06.cpp1
-rw-r--r--src/mame/machine/victor9k_fdc.cpp1
-rw-r--r--src/mame/machine/victor9k_fdc.h1
-rw-r--r--src/mame/machine/victor9kb.cpp1
-rw-r--r--src/mame/machine/victor9kb.h1
-rw-r--r--src/mame/machine/wangpckb.cpp1
-rw-r--r--src/mame/machine/wangpckb.h1
-rw-r--r--src/mame/machine/wpc.cpp1
-rw-r--r--src/mame/machine/wpc.h1
-rw-r--r--src/mame/machine/wswan.cpp1
-rw-r--r--src/mame/machine/x1.cpp1
-rw-r--r--src/mame/machine/x68k_hdc.cpp1
-rw-r--r--src/mame/machine/x68k_hdc.h1
-rw-r--r--src/mame/machine/x68k_kbd.cpp1
-rw-r--r--src/mame/machine/x820kb.cpp1
-rw-r--r--src/mame/machine/x820kb.h1
-rw-r--r--src/mame/machine/znmcu.cpp1
-rw-r--r--src/mame/machine/znmcu.h1
-rw-r--r--src/mame/machine/zs01.cpp1
-rw-r--r--src/mame/machine/zx.cpp1
-rw-r--r--src/mame/machine/zx8302.h1
178 files changed, 108 insertions, 80 deletions
diff --git a/src/mame/machine/315_5296.cpp b/src/mame/machine/315_5296.cpp
index 310a0bbd820..46464969d50 100644
--- a/src/mame/machine/315_5296.cpp
+++ b/src/mame/machine/315_5296.cpp
@@ -22,6 +22,7 @@
**********************************************************************/
+#include "emu.h"
#include "machine/315_5296.h"
diff --git a/src/mame/machine/315_5296.h b/src/mame/machine/315_5296.h
index 0e2c2229611..f66064895c0 100644
--- a/src/mame/machine/315_5296.h
+++ b/src/mame/machine/315_5296.h
@@ -11,7 +11,6 @@
#ifndef _SEGA_315_5296_H
#define _SEGA_315_5296_H
-#include "emu.h"
//**************************************************************************
diff --git a/src/mame/machine/6883sam.cpp b/src/mame/machine/6883sam.cpp
index ce07281231f..36de03974ec 100644
--- a/src/mame/machine/6883sam.cpp
+++ b/src/mame/machine/6883sam.cpp
@@ -49,6 +49,7 @@
***************************************************************************/
+#include "emu.h"
#include "machine/6883sam.h"
diff --git a/src/mame/machine/6883sam.h b/src/mame/machine/6883sam.h
index fc0258df3f9..02bfd0603ae 100644
--- a/src/mame/machine/6883sam.h
+++ b/src/mame/machine/6883sam.h
@@ -13,7 +13,6 @@
#ifndef __6883SAM__
#define __6883SAM__
-#include "emu.h"
#define MCFG_SAM6883_ADD(_tag, _clock, _cputag, _cpuspace) \
MCFG_DEVICE_ADD(_tag, SAM6883, _clock) \
diff --git a/src/mame/machine/abc1600mac.cpp b/src/mame/machine/abc1600mac.cpp
index 8a797394157..a7c220d01d9 100644
--- a/src/mame/machine/abc1600mac.cpp
+++ b/src/mame/machine/abc1600mac.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "abc1600mac.h"
diff --git a/src/mame/machine/abc1600mac.h b/src/mame/machine/abc1600mac.h
index 0cd3adfbdfe..a13a7bf40d0 100644
--- a/src/mame/machine/abc1600mac.h
+++ b/src/mame/machine/abc1600mac.h
@@ -11,7 +11,6 @@
#ifndef __ABC1600_MAC__
#define __ABC1600_MAC__
-#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "machine/watchdog.h"
diff --git a/src/mame/machine/abc80kb.cpp b/src/mame/machine/abc80kb.cpp
index 6c6c8509697..f57bfb8a31e 100644
--- a/src/mame/machine/abc80kb.cpp
+++ b/src/mame/machine/abc80kb.cpp
@@ -71,6 +71,7 @@ Notes:
*/
+#include "emu.h"
#include "abc80kb.h"
diff --git a/src/mame/machine/abc80kb.h b/src/mame/machine/abc80kb.h
index 6a2b17101ed..67beace62b3 100644
--- a/src/mame/machine/abc80kb.h
+++ b/src/mame/machine/abc80kb.h
@@ -11,7 +11,6 @@
#ifndef __ABC80_KEYBOARD__
#define __ABC80_KEYBOARD__
-#include "emu.h"
#include "cpu/mcs48/mcs48.h"
diff --git a/src/mame/machine/alpha8201.cpp b/src/mame/machine/alpha8201.cpp
index 1acaf966405..99d130e63c6 100644
--- a/src/mame/machine/alpha8201.cpp
+++ b/src/mame/machine/alpha8201.cpp
@@ -271,6 +271,7 @@ Notes:
***************************************************************************/
+#include "emu.h"
#include "cpu/hmcs40/hmcs40.h"
#include "alpha8201.h"
diff --git a/src/mame/machine/alpha8201.h b/src/mame/machine/alpha8201.h
index 9d13dba6d96..c116d2cbf92 100644
--- a/src/mame/machine/alpha8201.h
+++ b/src/mame/machine/alpha8201.h
@@ -9,7 +9,6 @@
#ifndef _ALPHA8201_H_
#define _ALPHA8201_H_
-#include "emu.h"
class alpha_8201_device : public device_t
{
diff --git a/src/mame/machine/apollo.cpp b/src/mame/machine/apollo.cpp
index 79c81bf986f..01e3d7f91ee 100644
--- a/src/mame/machine/apollo.cpp
+++ b/src/mame/machine/apollo.cpp
@@ -28,6 +28,7 @@
*
*/
+#include "emu.h"
#include "includes/apollo.h"
#include "bus/isa/omti8621.h"
diff --git a/src/mame/machine/apollo_dbg.cpp b/src/mame/machine/apollo_dbg.cpp
index aad0ef62ee9..63b05d162c5 100644
--- a/src/mame/machine/apollo_dbg.cpp
+++ b/src/mame/machine/apollo_dbg.cpp
@@ -10,6 +10,7 @@
#define VERBOSE 1
+#include "emu.h"
#include "includes/apollo.h"
#include "cpu/m68000/m68kcpu.h"
diff --git a/src/mame/machine/apollo_dbg.h b/src/mame/machine/apollo_dbg.h
index 12227102e4e..3ce08a200f4 100644
--- a/src/mame/machine/apollo_dbg.h
+++ b/src/mame/machine/apollo_dbg.h
@@ -13,7 +13,6 @@
#ifndef __APOLLO_DBG_H__
#define __APOLLO_DBG_H__
-#include "emu.h"
int apollo_debug_instruction_hook(m68000_base_device *device, offs_t curpc);
diff --git a/src/mame/machine/apollo_kbd.cpp b/src/mame/machine/apollo_kbd.cpp
index e86c2465d65..cc1220d0667 100644
--- a/src/mame/machine/apollo_kbd.cpp
+++ b/src/mame/machine/apollo_kbd.cpp
@@ -12,6 +12,7 @@
#define VERBOSE 0
+#include "emu.h"
#include "machine/apollo_kbd.h"
#include "sound/beep.h"
diff --git a/src/mame/machine/apollo_kbd.h b/src/mame/machine/apollo_kbd.h
index 69921a444ad..369c3873095 100644
--- a/src/mame/machine/apollo_kbd.h
+++ b/src/mame/machine/apollo_kbd.h
@@ -13,7 +13,6 @@
#ifndef __APOLLO_KBD_H__
#define __APOLLO_KBD_H__
-#include "emu.h"
#include "sound/beep.h"
// BSD-derived systems get very sad when you party with system reserved names.
diff --git a/src/mame/machine/apricotkb.cpp b/src/mame/machine/apricotkb.cpp
index 2717e8cb397..21af9342dce 100644
--- a/src/mame/machine/apricotkb.cpp
+++ b/src/mame/machine/apricotkb.cpp
@@ -6,6 +6,7 @@
*********************************************************************/
+#include "emu.h"
#include "apricotkb.h"
diff --git a/src/mame/machine/apricotkb.h b/src/mame/machine/apricotkb.h
index cc5da305b38..598155fd011 100644
--- a/src/mame/machine/apricotkb.h
+++ b/src/mame/machine/apricotkb.h
@@ -11,7 +11,6 @@
#ifndef __APRICOT_KEYBOARD__
#define __APRICOT_KEYBOARD__
-#include "emu.h"
diff --git a/src/mame/machine/at.cpp b/src/mame/machine/at.cpp
index 56d12935079..d79a9da0318 100644
--- a/src/mame/machine/at.cpp
+++ b/src/mame/machine/at.cpp
@@ -6,6 +6,7 @@
***************************************************************************/
+#include "emu.h"
#include "machine/at.h"
#include "cpu/i86/i286.h"
#include "cpu/i386/i386.h"
diff --git a/src/mame/machine/at.h b/src/mame/machine/at.h
index 12d6895197c..75f3f7cb703 100644
--- a/src/mame/machine/at.h
+++ b/src/mame/machine/at.h
@@ -3,7 +3,6 @@
#ifndef _AT_H_
#define _AT_H_
-#include "emu.h"
#include "machine/mc146818.h"
#include "machine/pic8259.h"
#include "machine/pit8253.h"
diff --git a/src/mame/machine/cammu.cpp b/src/mame/machine/cammu.cpp
index 1ee7cdab38a..9c31e925611 100644
--- a/src/mame/machine/cammu.cpp
+++ b/src/mame/machine/cammu.cpp
@@ -20,6 +20,7 @@
* - bus errors
*/
+#include "emu.h"
#include "cammu.h"
#define VERBOSE 0
diff --git a/src/mame/machine/cammu.h b/src/mame/machine/cammu.h
index a00208efbb5..15d0d7a4c66 100644
--- a/src/mame/machine/cammu.h
+++ b/src/mame/machine/cammu.h
@@ -6,7 +6,6 @@
#ifndef CAMMU_H_
#define CAMMU_H_
-#include "emu.h"
// the following enables a very crude instruction cache - it has known (future)
// problems, but speeds up cpu execution quite noticeably in the short term by
@@ -88,4 +87,4 @@ extern const device_type CAMMU_C4T;
extern const device_type CAMMU_C4I;
extern const device_type CAMMU_C3;
-#endif \ No newline at end of file
+#endif
diff --git a/src/mame/machine/cat702.cpp b/src/mame/machine/cat702.cpp
index 69f57604ca1..a474c18be4b 100644
--- a/src/mame/machine/cat702.cpp
+++ b/src/mame/machine/cat702.cpp
@@ -84,6 +84,7 @@
= Shift(c[n-1, 6])^Shift(c[n-1, 7])
*/
+#include "emu.h"
#include "cat702.h"
const device_type CAT702 = &device_creator<cat702_device>;
diff --git a/src/mame/machine/cat702.h b/src/mame/machine/cat702.h
index bf7a2925a92..e6c63dea541 100644
--- a/src/mame/machine/cat702.h
+++ b/src/mame/machine/cat702.h
@@ -7,7 +7,6 @@
#ifndef __CAT702_H__
#define __CAT702_H__
-#include "emu.h"
extern const device_type CAT702;
diff --git a/src/mame/machine/cdi070.h b/src/mame/machine/cdi070.h
index 2d944e3609c..478297d27b6 100644
--- a/src/mame/machine/cdi070.h
+++ b/src/mame/machine/cdi070.h
@@ -24,7 +24,6 @@ TODO:
#ifndef _MACHINE_CDI68070_H_
#define _MACHINE_CDI68070_H_
-#include "emu.h"
#define ISR_MST 0x80 // Master
#define ISR_TRX 0x40 // Transmitter
diff --git a/src/mame/machine/cdicdic.h b/src/mame/machine/cdicdic.h
index 7663dd33fcf..881f6ab16da 100644
--- a/src/mame/machine/cdicdic.h
+++ b/src/mame/machine/cdicdic.h
@@ -26,7 +26,6 @@ TODO:
#ifndef __CDICDIC_H__
#define __CDICDIC_H__
-#include "emu.h"
#include "cdrom.h"
#include "sound/cdda.h"
diff --git a/src/mame/machine/cdislave.h b/src/mame/machine/cdislave.h
index 29e748f9528..7fee3e4561b 100644
--- a/src/mame/machine/cdislave.h
+++ b/src/mame/machine/cdislave.h
@@ -26,7 +26,6 @@ TODO:
#ifndef __CDISLAVE_H__
#define __CDISLAVE_H__
-#include "emu.h"
//**************************************************************************
// INTERFACE CONFIGURATION MACROS
diff --git a/src/mame/machine/coco.cpp b/src/mame/machine/coco.cpp
index 06d19615113..ddf0efaca74 100644
--- a/src/mame/machine/coco.cpp
+++ b/src/mame/machine/coco.cpp
@@ -57,6 +57,7 @@ DAC and bitbanger values written should be reflected in the read.
***************************************************************************/
+#include "emu.h"
#include "includes/coco.h"
#include "cpu/m6809/m6809.h"
diff --git a/src/mame/machine/coco12.cpp b/src/mame/machine/coco12.cpp
index ac98b91468e..ffe2b0002de 100644
--- a/src/mame/machine/coco12.cpp
+++ b/src/mame/machine/coco12.cpp
@@ -8,6 +8,7 @@
***************************************************************************/
+#include "emu.h"
#include "includes/coco12.h"
//-------------------------------------------------
diff --git a/src/mame/machine/coco3.cpp b/src/mame/machine/coco3.cpp
index dab68c0761e..c0d30584d7f 100644
--- a/src/mame/machine/coco3.cpp
+++ b/src/mame/machine/coco3.cpp
@@ -43,6 +43,7 @@
***************************************************************************/
+#include "emu.h"
#include "includes/coco3.h"
//-------------------------------------------------
diff --git a/src/mame/machine/compiskb.cpp b/src/mame/machine/compiskb.cpp
index 12262b17159..0343351ce51 100644
--- a/src/mame/machine/compiskb.cpp
+++ b/src/mame/machine/compiskb.cpp
@@ -6,6 +6,7 @@
*********************************************************************/
+#include "emu.h"
#include "compiskb.h"
diff --git a/src/mame/machine/compiskb.h b/src/mame/machine/compiskb.h
index 4585e39241a..1d6c2f18d31 100644
--- a/src/mame/machine/compiskb.h
+++ b/src/mame/machine/compiskb.h
@@ -11,7 +11,6 @@
#ifndef __COMPIS_KEYBOARD__
#define __COMPIS_KEYBOARD__
-#include "emu.h"
#include "cpu/mcs48/mcs48.h"
#include "sound/speaker.h"
diff --git a/src/mame/machine/cuda.h b/src/mame/machine/cuda.h
index 9d6786e9803..ecc77b127d2 100644
--- a/src/mame/machine/cuda.h
+++ b/src/mame/machine/cuda.h
@@ -5,7 +5,6 @@
#ifndef __CUDA_H__
#define __CUDA_H__
-#include "emu.h"
//**************************************************************************
// MACROS / CONSTANTS
diff --git a/src/mame/machine/cybiko.cpp b/src/mame/machine/cybiko.cpp
index 116d7676cdc..bbcdf9f8958 100644
--- a/src/mame/machine/cybiko.cpp
+++ b/src/mame/machine/cybiko.cpp
@@ -12,6 +12,7 @@
*/
+#include "emu.h"
#include "includes/cybiko.h"
#define LOG_LEVEL 1
diff --git a/src/mame/machine/dec_lk201.h b/src/mame/machine/dec_lk201.h
index 5db6a35219a..308d6a98052 100644
--- a/src/mame/machine/dec_lk201.h
+++ b/src/mame/machine/dec_lk201.h
@@ -5,7 +5,6 @@
#ifndef __LK201_H__
#define __LK201_H__
-#include "emu.h"
#include "sound/beep.h"
//**************************************************************************
diff --git a/src/mame/machine/deco222.cpp b/src/mame/machine/deco222.cpp
index 722a2f0e2ac..9207c164f07 100644
--- a/src/mame/machine/deco222.cpp
+++ b/src/mame/machine/deco222.cpp
@@ -5,6 +5,7 @@
also sometimes implemented as basic logic outside the CPU on early revs and bootlegs */
+#include "emu.h"
#include "deco222.h"
diff --git a/src/mame/machine/deco222.h b/src/mame/machine/deco222.h
index 3d765e5aee4..6281ba7a88c 100644
--- a/src/mame/machine/deco222.h
+++ b/src/mame/machine/deco222.h
@@ -1,7 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:David Haywood
-#include "emu.h"
#include "cpu/m6502/m6502.h"
class deco_222_device : public m6502_device {
diff --git a/src/mame/machine/decocpu6.cpp b/src/mame/machine/decocpu6.cpp
index 28cdac73105..5f5ab6e97b3 100644
--- a/src/mame/machine/decocpu6.cpp
+++ b/src/mame/machine/decocpu6.cpp
@@ -6,6 +6,7 @@
*/
+#include "emu.h"
#include "decocpu6.h"
deco_cpu6_device::deco_cpu6_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
diff --git a/src/mame/machine/decocpu6.h b/src/mame/machine/decocpu6.h
index 0de17580c16..fc176bbcfcd 100644
--- a/src/mame/machine/decocpu6.h
+++ b/src/mame/machine/decocpu6.h
@@ -2,7 +2,6 @@
// copyright-holders:David Haywood
-#include "emu.h"
#include "cpu/m6502/m6502.h"
class deco_cpu6_device : public m6502_device {
diff --git a/src/mame/machine/decocpu7.cpp b/src/mame/machine/decocpu7.cpp
index 61b959d061b..7900cd3e866 100644
--- a/src/mame/machine/decocpu7.cpp
+++ b/src/mame/machine/decocpu7.cpp
@@ -1,6 +1,7 @@
// license:BSD-3-Clause
// copyright-holders:David Haywood
+#include "emu.h"
#include "decocpu7.h"
deco_cpu7_device::deco_cpu7_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
diff --git a/src/mame/machine/decocpu7.h b/src/mame/machine/decocpu7.h
index d03007efc04..229d97d6e30 100644
--- a/src/mame/machine/decocpu7.h
+++ b/src/mame/machine/decocpu7.h
@@ -1,7 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:David Haywood
-#include "emu.h"
#include "cpu/m6502/m6502.h"
class deco_cpu7_device : public m6502_device {
diff --git a/src/mame/machine/decopincpu.cpp b/src/mame/machine/decopincpu.cpp
index c0f7087e2f4..5166940d2ee 100644
--- a/src/mame/machine/decopincpu.cpp
+++ b/src/mame/machine/decopincpu.cpp
@@ -13,6 +13,7 @@
* - printer option (type 3b)
*/
+#include "emu.h"
#include "decopincpu.h"
const device_type DECOCPU1 = &device_creator<decocpu_type1_device>;
diff --git a/src/mame/machine/decopincpu.h b/src/mame/machine/decopincpu.h
index e4e5fffa304..73385b3ea99 100644
--- a/src/mame/machine/decopincpu.h
+++ b/src/mame/machine/decopincpu.h
@@ -9,7 +9,6 @@
#ifndef DECOPINCPU_H_
#define DECOPINCPU_H_
-#include "emu.h"
#include "cpu/m6800/m6800.h"
#include "machine/6821pia.h"
#include "machine/nvram.h"
diff --git a/src/mame/machine/dgnalpha.cpp b/src/mame/machine/dgnalpha.cpp
index 3523f97ecab..41ff87aeec7 100644
--- a/src/mame/machine/dgnalpha.cpp
+++ b/src/mame/machine/dgnalpha.cpp
@@ -66,6 +66,7 @@ keeping track of it in a variable in the driver.
***************************************************************************/
+#include "emu.h"
#include "includes/dgnalpha.h"
#include "sound/ay8910.h"
#include "imagedev/flopdrv.h"
diff --git a/src/mame/machine/dmv_keyb.cpp b/src/mame/machine/dmv_keyb.cpp
index 9d8e58134f0..a34993d1861 100644
--- a/src/mame/machine/dmv_keyb.cpp
+++ b/src/mame/machine/dmv_keyb.cpp
@@ -6,6 +6,7 @@
*********************************************************************/
+#include "emu.h"
#include "dmv_keyb.h"
diff --git a/src/mame/machine/dmv_keyb.h b/src/mame/machine/dmv_keyb.h
index f0a2930210a..77317be417a 100644
--- a/src/mame/machine/dmv_keyb.h
+++ b/src/mame/machine/dmv_keyb.h
@@ -12,7 +12,6 @@
#define __DMV_KEYBOARD__
-#include "emu.h"
#include "cpu/mcs48/mcs48.h"
diff --git a/src/mame/machine/dragon.cpp b/src/mame/machine/dragon.cpp
index 0e5f9cb553e..dd3672d4f9d 100644
--- a/src/mame/machine/dragon.cpp
+++ b/src/mame/machine/dragon.cpp
@@ -37,6 +37,7 @@ easier to manage.
***************************************************************************/
+#include "emu.h"
#include "includes/dragon.h"
diff --git a/src/mame/machine/egret.h b/src/mame/machine/egret.h
index 8ab3b085cd7..04f461fa5f3 100644
--- a/src/mame/machine/egret.h
+++ b/src/mame/machine/egret.h
@@ -5,7 +5,6 @@
#ifndef __EGRET_H__
#define __EGRET_H__
-#include "emu.h"
diff --git a/src/mame/machine/esqlcd.cpp b/src/mame/machine/esqlcd.cpp
index f03cb36d2fb..273e52b1953 100644
--- a/src/mame/machine/esqlcd.cpp
+++ b/src/mame/machine/esqlcd.cpp
@@ -4,6 +4,7 @@
Ensoniq LCD dotmatrix Displays
derived by Parduz from the VFD Emulation by R. Belmont
*/
+#include "emu.h"
#include "esqlcd.h"
#include "esq2by16.lh"
diff --git a/src/mame/machine/esqlcd.h b/src/mame/machine/esqlcd.h
index eb5aaaa648c..cb474cd6b8f 100644
--- a/src/mame/machine/esqlcd.h
+++ b/src/mame/machine/esqlcd.h
@@ -3,7 +3,6 @@
#ifndef ESQLCD_H
#define ESQLCD_H
-#include "emu.h"
#include "esqvfd.h"
diff --git a/src/mame/machine/esqpanel.h b/src/mame/machine/esqpanel.h
index 64b8ee67b40..f92ad91d501 100644
--- a/src/mame/machine/esqpanel.h
+++ b/src/mame/machine/esqpanel.h
@@ -5,7 +5,6 @@
#ifndef __ESQPANEL_H__
#define __ESQPANEL_H__
-#include "emu.h"
#include "machine/esqvfd.h"
#include "machine/esqlcd.h"
diff --git a/src/mame/machine/esqvfd.cpp b/src/mame/machine/esqvfd.cpp
index 3c879a4451e..aa557cbed92 100644
--- a/src/mame/machine/esqvfd.cpp
+++ b/src/mame/machine/esqvfd.cpp
@@ -5,6 +5,7 @@
Emulation by R. Belmont
*/
+#include "emu.h"
#include "esqvfd.h"
#include "esq1by22.lh"
#include "esq2by40.lh"
diff --git a/src/mame/machine/esqvfd.h b/src/mame/machine/esqvfd.h
index c4043f35956..f804bc698b5 100644
--- a/src/mame/machine/esqvfd.h
+++ b/src/mame/machine/esqvfd.h
@@ -3,7 +3,6 @@
#ifndef ESQVFD_H
#define ESQVFD_H
-#include "emu.h"
#define MCFG_ESQ1x22_ADD(_tag) \
MCFG_DEVICE_ADD(_tag, ESQ1x22, 60)
diff --git a/src/mame/machine/gamecom.cpp b/src/mame/machine/gamecom.cpp
index 1dcc1b8c2d2..2756dee4960 100644
--- a/src/mame/machine/gamecom.cpp
+++ b/src/mame/machine/gamecom.cpp
@@ -1,6 +1,7 @@
// license:BSD-3-Clause
// copyright-holders:Wilbert Pol, Robbbert
+#include "emu.h"
#include "includes/gamecom.h"
diff --git a/src/mame/machine/gdrom.cpp b/src/mame/machine/gdrom.cpp
index abd310e565e..fd081b3f060 100644
--- a/src/mame/machine/gdrom.cpp
+++ b/src/mame/machine/gdrom.cpp
@@ -6,6 +6,7 @@
***************************************************************************/
+#include "emu.h"
#include "gdrom.h"
#define GDROM_BUSY_STATE 0x00
diff --git a/src/mame/machine/genpin.cpp b/src/mame/machine/genpin.cpp
index bac8743f5d2..5875bc787c8 100644
--- a/src/mame/machine/genpin.cpp
+++ b/src/mame/machine/genpin.cpp
@@ -8,6 +8,7 @@ This is for common pinball machine coding.
+#include "emu.h"
#include "genpin.h"
MACHINE_CONFIG_FRAGMENT( genpin_audio )
diff --git a/src/mame/machine/genpin.h b/src/mame/machine/genpin.h
index 5b72d09ff53..9c6bc50c6e0 100644
--- a/src/mame/machine/genpin.h
+++ b/src/mame/machine/genpin.h
@@ -4,7 +4,6 @@
#define GENPIN_H_
-#include "emu.h"
#include "sound/samples.h"
#include "machine/nvram.h"
diff --git a/src/mame/machine/hng64_net.cpp b/src/mame/machine/hng64_net.cpp
index 589d978d2d8..13f0628585d 100644
--- a/src/mame/machine/hng64_net.cpp
+++ b/src/mame/machine/hng64_net.cpp
@@ -12,6 +12,7 @@
*/
+#include "emu.h"
#include "includes/hng64.h"
#include "cpu/z80/kl5c80a12.h"
diff --git a/src/mame/machine/ibm6580_fdc.cpp b/src/mame/machine/ibm6580_fdc.cpp
index baa10e83f37..bf278444c11 100644
--- a/src/mame/machine/ibm6580_fdc.cpp
+++ b/src/mame/machine/ibm6580_fdc.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Sergey Svishchev
+#include "emu.h"
#include "ibm6580_fdc.h"
diff --git a/src/mame/machine/ibm6580_fdc.h b/src/mame/machine/ibm6580_fdc.h
index 611554ef02f..b63bbfbfc2b 100644
--- a/src/mame/machine/ibm6580_fdc.h
+++ b/src/mame/machine/ibm6580_fdc.h
@@ -3,7 +3,6 @@
#ifndef DWFDC_H_
#define DWFDC_H_
-#include "emu.h"
#include "cpu/mcs48/mcs48.h"
#include "machine/i8255.h"
#include "machine/upd765.h"
diff --git a/src/mame/machine/ibm6580_kbd.cpp b/src/mame/machine/ibm6580_kbd.cpp
index 1ae0e34fe9c..edc28843960 100644
--- a/src/mame/machine/ibm6580_kbd.cpp
+++ b/src/mame/machine/ibm6580_kbd.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Sergey Svishchev
+#include "emu.h"
#include "ibm6580_kbd.h"
#define VERBOSE_DBG 0 /* general debug messages */
diff --git a/src/mame/machine/ibm6580_kbd.h b/src/mame/machine/ibm6580_kbd.h
index cfbf0c44607..bd6e53935bf 100644
--- a/src/mame/machine/ibm6580_kbd.h
+++ b/src/mame/machine/ibm6580_kbd.h
@@ -3,7 +3,6 @@
#ifndef DWKBD_H_
#define DWKBD_H_
-#include "emu.h"
#include "cpu/mcs48/mcs48.h"
#define MCFG_DW_KEYBOARD_OUT_DATA_HANDLER(_devcb) \
diff --git a/src/mame/machine/ie15_kbd.cpp b/src/mame/machine/ie15_kbd.cpp
index 414b302ed33..88fc6f2b134 100644
--- a/src/mame/machine/ie15_kbd.cpp
+++ b/src/mame/machine/ie15_kbd.cpp
@@ -7,6 +7,7 @@
***************************************************************************/
+#include "emu.h"
#include "machine/ie15_kbd.h"
/***************************************************************************
diff --git a/src/mame/machine/ie15_kbd.h b/src/mame/machine/ie15_kbd.h
index 7292dd1ff84..d2dbb3709a9 100644
--- a/src/mame/machine/ie15_kbd.h
+++ b/src/mame/machine/ie15_kbd.h
@@ -3,7 +3,6 @@
#ifndef __IE15_KEYBOARD_H__
#define __IE15_KEYBOARD_H__
-#include "emu.h"
#define IE_KB_ACK 1
diff --git a/src/mame/machine/igs036crypt.cpp b/src/mame/machine/igs036crypt.cpp
index 3f1785ff467..f57a996d9b2 100644
--- a/src/mame/machine/igs036crypt.cpp
+++ b/src/mame/machine/igs036crypt.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Andreas Naive,David Haywood
+#include "emu.h"
#include "igs036crypt.h"
/****************************************************************************
diff --git a/src/mame/machine/igs036crypt.h b/src/mame/machine/igs036crypt.h
index c4d559f48d0..915c012dbb2 100644
--- a/src/mame/machine/igs036crypt.h
+++ b/src/mame/machine/igs036crypt.h
@@ -3,7 +3,6 @@
#ifndef _IGS036CRYPT_H_
#define _IGS036CRYPT_H_
-#include "emu.h"
class igs036_decryptor
{
diff --git a/src/mame/machine/interpro_ioga.cpp b/src/mame/machine/interpro_ioga.cpp
index 67a47f2cfd0..ab183493c77 100644
--- a/src/mame/machine/interpro_ioga.cpp
+++ b/src/mame/machine/interpro_ioga.cpp
@@ -15,6 +15,7 @@
* TODO
* - too long to list
*/
+#include "emu.h"
#include "interpro_ioga.h"
#define VERBOSE 0
diff --git a/src/mame/machine/interpro_ioga.h b/src/mame/machine/interpro_ioga.h
index 2809601d98e..64876303948 100644
--- a/src/mame/machine/interpro_ioga.h
+++ b/src/mame/machine/interpro_ioga.h
@@ -6,7 +6,6 @@
#ifndef INTERPRO_IOGA_H_
#define INTERPRO_IOGA_H_
-#include "emu.h"
#define MCFG_INTERPRO_IOGA_ADD(_tag) \
MCFG_DEVICE_ADD(_tag, INTERPRO_IOGA, 0)
@@ -252,4 +251,4 @@ private:
// device type definition
extern const device_type INTERPRO_IOGA;
-#endif \ No newline at end of file
+#endif
diff --git a/src/mame/machine/interpro_mcga.cpp b/src/mame/machine/interpro_mcga.cpp
index d807f571bab..331910ddb10 100644
--- a/src/mame/machine/interpro_mcga.cpp
+++ b/src/mame/machine/interpro_mcga.cpp
@@ -11,6 +11,7 @@
* TODO
* - too long to list
*/
+#include "emu.h"
#include "interpro_mcga.h"
#define VERBOSE 0
@@ -86,4 +87,4 @@ READ16_MEMBER(interpro_mcga_device::read)
default:
return m_reg[offset];
}
-} \ No newline at end of file
+}
diff --git a/src/mame/machine/interpro_mcga.h b/src/mame/machine/interpro_mcga.h
index 4f3ecde78cc..35974888745 100644
--- a/src/mame/machine/interpro_mcga.h
+++ b/src/mame/machine/interpro_mcga.h
@@ -6,7 +6,6 @@
#ifndef INTERPRO_MCGA_H_
#define INTERPRO_MCGA_H_
-#include "emu.h"
// mcga control register
#define MCGA_CTRL_OPTMASK 0x00000003
@@ -42,4 +41,4 @@ private:
// device type definition
extern const device_type INTERPRO_MCGA;
-#endif \ No newline at end of file
+#endif
diff --git a/src/mame/machine/interpro_sga.cpp b/src/mame/machine/interpro_sga.cpp
index 102c58a2f0b..ee7b08905fe 100644
--- a/src/mame/machine/interpro_sga.cpp
+++ b/src/mame/machine/interpro_sga.cpp
@@ -11,6 +11,7 @@
* TODO
* - too long to list
*/
+#include "emu.h"
#include "interpro_sga.h"
#define VERBOSE 0
diff --git a/src/mame/machine/interpro_sga.h b/src/mame/machine/interpro_sga.h
index 06c2d1fba8f..b48dbe61829 100644
--- a/src/mame/machine/interpro_sga.h
+++ b/src/mame/machine/interpro_sga.h
@@ -6,7 +6,6 @@
#ifndef INTERPRO_SGA_H_
#define INTERPRO_SGA_H_
-#include "emu.h"
class interpro_sga_device : public device_t
{
@@ -68,4 +67,4 @@ private:
// device type definition
extern const device_type INTERPRO_SGA;
-#endif \ No newline at end of file
+#endif
diff --git a/src/mame/machine/isbc_208.cpp b/src/mame/machine/isbc_208.cpp
index e0aba484e01..6b0201b0e3c 100644
--- a/src/mame/machine/isbc_208.cpp
+++ b/src/mame/machine/isbc_208.cpp
@@ -3,6 +3,7 @@
// TODO: multibus
+#include "emu.h"
#include "isbc_208.h"
const device_type ISBC_208 = &device_creator<isbc_208_device>;
diff --git a/src/mame/machine/isbc_208.h b/src/mame/machine/isbc_208.h
index 43c08b9b98d..691266e0a67 100644
--- a/src/mame/machine/isbc_208.h
+++ b/src/mame/machine/isbc_208.h
@@ -4,7 +4,6 @@
#ifndef ISBC_208_H_
#define ISBC_208_H_
-#include "emu.h"
#include "formats/pc_dsk.h"
#include "machine/upd765.h"
#include "machine/am9517a.h"
diff --git a/src/mame/machine/isbc_215g.cpp b/src/mame/machine/isbc_215g.cpp
index e94622e9367..9408e05d223 100644
--- a/src/mame/machine/isbc_215g.cpp
+++ b/src/mame/machine/isbc_215g.cpp
@@ -6,6 +6,7 @@
// TODO: multibus
+#include "emu.h"
#include "isbc_215g.h"
const device_type ISBC_215G = &device_creator<isbc_215g_device>;
diff --git a/src/mame/machine/isbc_215g.h b/src/mame/machine/isbc_215g.h
index 0a71ae4c10a..3b13ee4326c 100644
--- a/src/mame/machine/isbc_215g.h
+++ b/src/mame/machine/isbc_215g.h
@@ -4,7 +4,6 @@
#ifndef ISBC_215G_H_
#define ISBC_215G_H_
-#include "emu.h"
#include "cpu/i8089/i8089.h"
#include "bus/isbx/isbx.h"
#include "imagedev/harddriv.h"
diff --git a/src/mame/machine/iteagle_fpga.cpp b/src/mame/machine/iteagle_fpga.cpp
index b36ed16b12d..561066b4164 100644
--- a/src/mame/machine/iteagle_fpga.cpp
+++ b/src/mame/machine/iteagle_fpga.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Ted Green
+#include "emu.h"
#include "iteagle_fpga.h"
#include "coreutil.h"
diff --git a/src/mame/machine/jvs13551.cpp b/src/mame/machine/jvs13551.cpp
index f08ee51d1fc..494ebad62fa 100644
--- a/src/mame/machine/jvs13551.cpp
+++ b/src/mame/machine/jvs13551.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Olivier Galibert
+#include "emu.h"
#include "jvs13551.h"
const device_type SEGA_837_13551 = &device_creator<sega_837_13551>;
diff --git a/src/mame/machine/jvs13551.h b/src/mame/machine/jvs13551.h
index 59038a4c84b..7a55a29f0d3 100644
--- a/src/mame/machine/jvs13551.h
+++ b/src/mame/machine/jvs13551.h
@@ -3,7 +3,6 @@
#ifndef __JVS13551_H__
#define __JVS13551_H__
-#include "emu.h"
#include "machine/jvsdev.h"
#define MCFG_SEGA_837_13551_DEVICE_ADD(_tag, _host, tilt, d0, d1, a0, a1, a2, a3, a4, a5, a6, a7, out) \
diff --git a/src/mame/machine/k573cass.cpp b/src/mame/machine/k573cass.cpp
index db096c04800..5919920338c 100644
--- a/src/mame/machine/k573cass.cpp
+++ b/src/mame/machine/k573cass.cpp
@@ -5,6 +5,7 @@
*
*/
+#include "emu.h"
#include "k573cass.h"
// class konami573_cassette_interface
diff --git a/src/mame/machine/k573mcr.cpp b/src/mame/machine/k573mcr.cpp
index a18a25e1d0c..273a4737c56 100644
--- a/src/mame/machine/k573mcr.cpp
+++ b/src/mame/machine/k573mcr.cpp
@@ -5,6 +5,7 @@
*
*/
+#include "emu.h"
#include "k573mcr.h"
/*
diff --git a/src/mame/machine/k573mcr.h b/src/mame/machine/k573mcr.h
index 7980321be3a..720f027fc9c 100644
--- a/src/mame/machine/k573mcr.h
+++ b/src/mame/machine/k573mcr.h
@@ -10,7 +10,6 @@
#ifndef __K573MCR_H__
#define __K573MCR_H__
-#include "emu.h"
extern const device_type KONAMI_573_MEMORY_CARD_READER;
diff --git a/src/mame/machine/k573msu.cpp b/src/mame/machine/k573msu.cpp
index d691a909942..0ccdcf591ed 100644
--- a/src/mame/machine/k573msu.cpp
+++ b/src/mame/machine/k573msu.cpp
@@ -5,6 +5,7 @@
*
*/
+#include "emu.h"
#include "k573msu.h"
/*
diff --git a/src/mame/machine/k573msu.h b/src/mame/machine/k573msu.h
index 2a6bbef1cba..64623d5ca82 100644
--- a/src/mame/machine/k573msu.h
+++ b/src/mame/machine/k573msu.h
@@ -10,7 +10,6 @@
#ifndef __K573MSU_H__
#define __K573MSU_H__
-#include "emu.h"
extern const device_type KONAMI_573_MULTI_SESSION_UNIT;
diff --git a/src/mame/machine/k573npu.cpp b/src/mame/machine/k573npu.cpp
index e9b0853a0d7..3664ddb09b8 100644
--- a/src/mame/machine/k573npu.cpp
+++ b/src/mame/machine/k573npu.cpp
@@ -5,6 +5,7 @@
*
*/
+#include "emu.h"
#include "k573npu.h"
/*
diff --git a/src/mame/machine/k573npu.h b/src/mame/machine/k573npu.h
index ec2302c25b7..e1c9fa35842 100644
--- a/src/mame/machine/k573npu.h
+++ b/src/mame/machine/k573npu.h
@@ -10,7 +10,6 @@
#ifndef __K573NPU_H__
#define __K573NPU_H__
-#include "emu.h"
extern const device_type KONAMI_573_NETWORK_PCB_UNIT;
diff --git a/src/mame/machine/k7659kb.cpp b/src/mame/machine/k7659kb.cpp
index 343e7c0330b..7466a67ecb5 100644
--- a/src/mame/machine/k7659kb.cpp
+++ b/src/mame/machine/k7659kb.cpp
@@ -6,6 +6,7 @@
*********************************************************************/
+#include "emu.h"
#include "k7659kb.h"
diff --git a/src/mame/machine/k7659kb.h b/src/mame/machine/k7659kb.h
index e84ce714b3a..d5ed7ab3ee4 100644
--- a/src/mame/machine/k7659kb.h
+++ b/src/mame/machine/k7659kb.h
@@ -12,7 +12,6 @@
#define __K7659_KEYBOARD__
-#include "emu.h"
diff --git a/src/mame/machine/kabuki.h b/src/mame/machine/kabuki.h
index ef7d375632e..5b2b01298f9 100644
--- a/src/mame/machine/kabuki.h
+++ b/src/mame/machine/kabuki.h
@@ -1,6 +1,5 @@
// license:BSD-3-Clause
// copyright-holders:Nicola Salmoria
-#include "emu.h"
void mgakuen2_decode(uint8_t *src, uint8_t *dst, int size);
void pang_decode(uint8_t *src, uint8_t *dst, int size);
diff --git a/src/mame/machine/kaypro.cpp b/src/mame/machine/kaypro.cpp
index c4e1d8fcaa2..66a9a4bfb28 100644
--- a/src/mame/machine/kaypro.cpp
+++ b/src/mame/machine/kaypro.cpp
@@ -2,6 +2,7 @@
// copyright-holders:Robbbert
+#include "emu.h"
#include "includes/kaypro.h"
diff --git a/src/mame/machine/km035.h b/src/mame/machine/km035.h
index a25f29bdfb6..bbc5afcdf1d 100644
--- a/src/mame/machine/km035.h
+++ b/src/mame/machine/km035.h
@@ -5,7 +5,6 @@
#ifndef __KM035_H__
#define __KM035_H__
-#include "emu.h"
#include "cpu/mcs48/mcs48.h"
#include "sound/beep.h"
diff --git a/src/mame/machine/lisa.cpp b/src/mame/machine/lisa.cpp
index e3ab084b671..69d4503b6b5 100644
--- a/src/mame/machine/lisa.cpp
+++ b/src/mame/machine/lisa.cpp
@@ -38,6 +38,7 @@
Raphael Nabet, 2000-2003
*/
+#include "emu.h"
#include "includes/lisa.h"
diff --git a/src/mame/machine/llc.cpp b/src/mame/machine/llc.cpp
index a3778208b25..bf9beffe2ce 100644
--- a/src/mame/machine/llc.cpp
+++ b/src/mame/machine/llc.cpp
@@ -9,6 +9,7 @@
****************************************************************************/
+#include "emu.h"
#include "includes/llc.h"
diff --git a/src/mame/machine/m20_8086.cpp b/src/mame/machine/m20_8086.cpp
index 58be78f198a..4fb0be656ec 100644
--- a/src/mame/machine/m20_8086.cpp
+++ b/src/mame/machine/m20_8086.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Carl
+#include "emu.h"
#include "m20_8086.h"
#include "machine/ram.h"
diff --git a/src/mame/machine/m20_8086.h b/src/mame/machine/m20_8086.h
index 67a715b7059..56f7a81e43a 100644
--- a/src/mame/machine/m20_8086.h
+++ b/src/mame/machine/m20_8086.h
@@ -3,7 +3,6 @@
#ifndef M20_8086_H_
#define M20_8086_H_
-#include "emu.h"
#include "cpu/i86/i86.h"
#include "machine/pic8259.h"
diff --git a/src/mame/machine/m20_kbd.cpp b/src/mame/machine/m20_kbd.cpp
index 00cfdd08a56..3d90493277f 100644
--- a/src/mame/machine/m20_kbd.cpp
+++ b/src/mame/machine/m20_kbd.cpp
@@ -1,6 +1,7 @@
// license:BSD-3-Clause
// copyright-holders:Carl,Vas Crabb
+#include "emu.h"
#include "machine/m20_kbd.h"
#include "machine/keyboard.ipp"
diff --git a/src/mame/machine/m24_kbd.cpp b/src/mame/machine/m24_kbd.cpp
index 2a3c7e7142f..b753ddbe532 100644
--- a/src/mame/machine/m24_kbd.cpp
+++ b/src/mame/machine/m24_kbd.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Carl
+#include "emu.h"
#include "m24_kbd.h"
const device_type M24_KEYBOARD = &device_creator<m24_keyboard_device>;
diff --git a/src/mame/machine/m24_kbd.h b/src/mame/machine/m24_kbd.h
index 70a3a8946b8..e8ce21b81cc 100644
--- a/src/mame/machine/m24_kbd.h
+++ b/src/mame/machine/m24_kbd.h
@@ -3,7 +3,6 @@
#ifndef M24KBD_H_
#define M24KBD_H_
-#include "emu.h"
#include "cpu/mcs48/mcs48.h"
#define MCFG_M24_KEYBOARD_OUT_DATA_HANDLER(_devcb) \
diff --git a/src/mame/machine/m24_z8000.cpp b/src/mame/machine/m24_z8000.cpp
index 9019ab3b109..73204a21acb 100644
--- a/src/mame/machine/m24_z8000.cpp
+++ b/src/mame/machine/m24_z8000.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Carl
+#include "emu.h"
#include "m24_z8000.h"
const device_type M24_Z8000 = &device_creator<m24_z8000_device>;
diff --git a/src/mame/machine/m24_z8000.h b/src/mame/machine/m24_z8000.h
index aca70039736..e0eac4ef2ca 100644
--- a/src/mame/machine/m24_z8000.h
+++ b/src/mame/machine/m24_z8000.h
@@ -3,7 +3,6 @@
#ifndef M24_Z8000_H_
#define M24_Z8000_H_
-#include "emu.h"
#include "cpu/z8000/z8000.h"
#include "machine/i8251.h"
#include "machine/pit8253.h"
diff --git a/src/mame/machine/m2comm.h b/src/mame/machine/m2comm.h
index 0b9cc9731fb..5145b59d54b 100644
--- a/src/mame/machine/m2comm.h
+++ b/src/mame/machine/m2comm.h
@@ -7,7 +7,6 @@
#define __M2COMM_SIMULATION__
-#include "emu.h"
#define MCFG_M2COMM_ADD(_tag ) \
MCFG_DEVICE_ADD(_tag, M2COMM, 0)
diff --git a/src/mame/machine/mackbd.h b/src/mame/machine/mackbd.h
index 621d1143b26..e36acad7e33 100644
--- a/src/mame/machine/mackbd.h
+++ b/src/mame/machine/mackbd.h
@@ -5,7 +5,6 @@
#ifndef __MACKBD_H__
#define __MACKBD_H__
-#include "emu.h"
diff --git a/src/mame/machine/mbc55x.cpp b/src/mame/machine/mbc55x.cpp
index 99c6c6d2cd7..44586083a9b 100644
--- a/src/mame/machine/mbc55x.cpp
+++ b/src/mame/machine/mbc55x.cpp
@@ -9,6 +9,7 @@
2011-01-29.
*****************************************************************************/
+#include "emu.h"
#include <functional>
#include "includes/mbc55x.h"
diff --git a/src/mame/machine/mbee.cpp b/src/mame/machine/mbee.cpp
index 992066db3d0..0fd17f6c88e 100644
--- a/src/mame/machine/mbee.cpp
+++ b/src/mame/machine/mbee.cpp
@@ -11,6 +11,7 @@
****************************************************************************/
+#include "emu.h"
#include "includes/mbee.h"
#include "machine/z80bin.h"
diff --git a/src/mame/machine/mc80.cpp b/src/mame/machine/mc80.cpp
index 3be03fa4f98..2b6423ec25d 100644
--- a/src/mame/machine/mc80.cpp
+++ b/src/mame/machine/mc80.cpp
@@ -9,6 +9,7 @@
****************************************************************************/
+#include "emu.h"
#include "includes/mc80.h"
/*****************************************************************************/
diff --git a/src/mame/machine/meters.h b/src/mame/machine/meters.h
index 3233789a481..f248d9295a9 100644
--- a/src/mame/machine/meters.h
+++ b/src/mame/machine/meters.h
@@ -14,7 +14,6 @@
#ifndef __METERS_H__
#define __METERS_H__
-#include "emu.h"
#define MCFG_METERS_NUMBER(_number) \
diff --git a/src/mame/machine/midikbd.cpp b/src/mame/machine/midikbd.cpp
index e0b8ce8478c..3b6ece1ce9d 100644
--- a/src/mame/machine/midikbd.cpp
+++ b/src/mame/machine/midikbd.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Carl
+#include "emu.h"
#include "machine/midikbd.h"
const device_type MIDI_KBD = &device_creator<midi_keyboard_device>;
diff --git a/src/mame/machine/midikbd.h b/src/mame/machine/midikbd.h
index e2862f8bd93..84c811c237d 100644
--- a/src/mame/machine/midikbd.h
+++ b/src/mame/machine/midikbd.h
@@ -3,7 +3,6 @@
#ifndef MIDIKBD_H_
#define MIDIKBD_H_
-#include "emu.h"
#define MCFG_MIDI_KBD_ADD(_tag, _devcb, _clock) \
MCFG_DEVICE_ADD(_tag, MIDI_KBD, _clock) \
diff --git a/src/mame/machine/mm1kb.cpp b/src/mame/machine/mm1kb.cpp
index 157c1558e15..dd620968e8a 100644
--- a/src/mame/machine/mm1kb.cpp
+++ b/src/mame/machine/mm1kb.cpp
@@ -6,6 +6,7 @@
*********************************************************************/
+#include "emu.h"
#include "mm1kb.h"
diff --git a/src/mame/machine/mm1kb.h b/src/mame/machine/mm1kb.h
index c81bac4fa58..f5c19f7e74c 100644
--- a/src/mame/machine/mm1kb.h
+++ b/src/mame/machine/mm1kb.h
@@ -11,7 +11,6 @@
#ifndef __MM1_KEYBOARD__
#define __MM1_KEYBOARD__
-#include "emu.h"
#include "sound/samples.h"
diff --git a/src/mame/machine/ms7004.h b/src/mame/machine/ms7004.h
index 6453b9dfc90..4847e4b66e2 100644
--- a/src/mame/machine/ms7004.h
+++ b/src/mame/machine/ms7004.h
@@ -5,7 +5,6 @@
#ifndef __MS7004_H__
#define __MS7004_H__
-#include "emu.h"
#include "cpu/mcs48/mcs48.h"
#include "machine/i8243.h"
#include "sound/beep.h"
diff --git a/src/mame/machine/msx.cpp b/src/mame/machine/msx.cpp
index d88b618aaf8..28daab967be 100644
--- a/src/mame/machine/msx.cpp
+++ b/src/mame/machine/msx.cpp
@@ -13,6 +13,7 @@
* - wd2793, nms8255
*/
+#include "emu.h"
#include "includes/msx.h"
#define VERBOSE 0
diff --git a/src/mame/machine/mz80.cpp b/src/mame/machine/mz80.cpp
index 9b2b1f09807..cf62ee5546d 100644
--- a/src/mame/machine/mz80.cpp
+++ b/src/mame/machine/mz80.cpp
@@ -8,6 +8,7 @@
****************************************************************************/
+#include "emu.h"
#include "includes/mz80.h"
diff --git a/src/mame/machine/nextkbd.cpp b/src/mame/machine/nextkbd.cpp
index f742dd2a43e..64c5df5ddc2 100644
--- a/src/mame/machine/nextkbd.cpp
+++ b/src/mame/machine/nextkbd.cpp
@@ -1,6 +1,7 @@
// license:BSD-3-Clause
// copyright-holders:Olivier Galibert
+#include "emu.h"
#include "nextkbd.h"
const device_type NEXTKBD = &device_creator<nextkbd_device>;
diff --git a/src/mame/machine/nextkbd.h b/src/mame/machine/nextkbd.h
index 4d0ed219178..41b183a12ec 100644
--- a/src/mame/machine/nextkbd.h
+++ b/src/mame/machine/nextkbd.h
@@ -3,7 +3,6 @@
#ifndef __NEXTKBD_H__
#define __NEXTKBD_H__
-#include "emu.h"
#define MCFG_NEXTKBD_INT_CHANGE_CALLBACK(_write) \
devcb = &nextkbd_device::set_int_change_wr_callback(*device, DEVCB_##_write);
diff --git a/src/mame/machine/ngen_kb.cpp b/src/mame/machine/ngen_kb.cpp
index c42f2b72e64..30001eb6a21 100644
--- a/src/mame/machine/ngen_kb.cpp
+++ b/src/mame/machine/ngen_kb.cpp
@@ -8,6 +8,7 @@
the serial keyboard which may not be desirable.
*/
+#include "emu.h"
#include "ngen_kb.h"
ngen_keyboard_device::ngen_keyboard_device(const machine_config& mconfig, const char* tag, device_t* owner, uint32_t clock)
diff --git a/src/mame/machine/ns11prot.cpp b/src/mame/machine/ns11prot.cpp
index c357b8d82eb..b323cbd2e7d 100644
--- a/src/mame/machine/ns11prot.cpp
+++ b/src/mame/machine/ns11prot.cpp
@@ -5,6 +5,7 @@
*
*/
+#include "emu.h"
#include "ns11prot.h"
ns11_keycus_device::ns11_keycus_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
diff --git a/src/mame/machine/ns11prot.h b/src/mame/machine/ns11prot.h
index b548fd19871..de9af03b7d6 100644
--- a/src/mame/machine/ns11prot.h
+++ b/src/mame/machine/ns11prot.h
@@ -5,7 +5,6 @@
*
*/
-#include "emu.h"
class ns11_keycus_device : public device_t
{
diff --git a/src/mame/machine/octo_kbd.cpp b/src/mame/machine/octo_kbd.cpp
index e0c50d035a8..7c12b1cfd90 100644
--- a/src/mame/machine/octo_kbd.cpp
+++ b/src/mame/machine/octo_kbd.cpp
@@ -1,6 +1,7 @@
// license:BSD-3-Clause
// copyright-holders:Barry Rodewald
+#include "emu.h"
#include "machine/octo_kbd.h"
#include "machine/keyboard.ipp"
diff --git a/src/mame/machine/p2000t.cpp b/src/mame/machine/p2000t.cpp
index 099a98be629..81b639c8814 100644
--- a/src/mame/machine/p2000t.cpp
+++ b/src/mame/machine/p2000t.cpp
@@ -9,6 +9,7 @@
**********************************************************************/
+#include "emu.h"
#include "includes/p2000t.h"
#define P2000M_101F_CASDAT 0x01
diff --git a/src/mame/machine/pc1512kb.cpp b/src/mame/machine/pc1512kb.cpp
index 4e0a4db6e20..dbd6a14e958 100644
--- a/src/mame/machine/pc1512kb.cpp
+++ b/src/mame/machine/pc1512kb.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "pc1512kb.h"
diff --git a/src/mame/machine/pc1512kb.h b/src/mame/machine/pc1512kb.h
index 9dccac573e3..8f9865d1771 100644
--- a/src/mame/machine/pc1512kb.h
+++ b/src/mame/machine/pc1512kb.h
@@ -12,7 +12,6 @@
#define __PC1512_KEYBOARD__
-#include "emu.h"
#include "bus/vcs_ctrl/ctrl.h"
#include "cpu/mcs48/mcs48.h"
diff --git a/src/mame/machine/pc9801_cbus.cpp b/src/mame/machine/pc9801_cbus.cpp
index 25e99e56742..065bbe19e47 100644
--- a/src/mame/machine/pc9801_cbus.cpp
+++ b/src/mame/machine/pc9801_cbus.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "pc9801_cbus.h"
diff --git a/src/mame/machine/pc9801_cbus.h b/src/mame/machine/pc9801_cbus.h
index 408fcd414ad..b3d8b85c142 100644
--- a/src/mame/machine/pc9801_cbus.h
+++ b/src/mame/machine/pc9801_cbus.h
@@ -10,7 +10,6 @@
#ifndef __PC9801_SLOTCBUS__
#define __PC9801_SLOTCBUS__
-#include "emu.h"
//**************************************************************************
diff --git a/src/mame/machine/pc9801_cd.cpp b/src/mame/machine/pc9801_cd.cpp
index a47c9103971..8e9216fc005 100644
--- a/src/mame/machine/pc9801_cd.cpp
+++ b/src/mame/machine/pc9801_cd.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:smf
+#include "emu.h"
#include "pc9801_cd.h"
// device type definition
diff --git a/src/mame/machine/pcd_kbd.cpp b/src/mame/machine/pcd_kbd.cpp
index 704e71b5c58..b05eaa8ab1c 100644
--- a/src/mame/machine/pcd_kbd.cpp
+++ b/src/mame/machine/pcd_kbd.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Carl
+#include "emu.h"
#include "pcd_kbd.h"
const device_type PCD_KEYBOARD = &device_creator<pcd_keyboard_device>;
diff --git a/src/mame/machine/pcd_kbd.h b/src/mame/machine/pcd_kbd.h
index e44e38bbec9..6542ecdbc60 100644
--- a/src/mame/machine/pcd_kbd.h
+++ b/src/mame/machine/pcd_kbd.h
@@ -3,7 +3,6 @@
#ifndef PCD_KBD_H_
#define PCD_KBD_H_
-#include "emu.h"
#include "cpu/mcs48/mcs48.h"
#include "sound/speaker.h"
diff --git a/src/mame/machine/pp01.cpp b/src/mame/machine/pp01.cpp
index ade836c627a..186a5ac609e 100644
--- a/src/mame/machine/pp01.cpp
+++ b/src/mame/machine/pp01.cpp
@@ -9,6 +9,7 @@
****************************************************************************/
+#include "emu.h"
#include "includes/pp01.h"
diff --git a/src/mame/machine/prof80mmu.cpp b/src/mame/machine/prof80mmu.cpp
index a981d08c3e9..cc8af9d6790 100644
--- a/src/mame/machine/prof80mmu.cpp
+++ b/src/mame/machine/prof80mmu.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "prof80mmu.h"
diff --git a/src/mame/machine/prof80mmu.h b/src/mame/machine/prof80mmu.h
index 5820b31ca66..f6694ac7a1f 100644
--- a/src/mame/machine/prof80mmu.h
+++ b/src/mame/machine/prof80mmu.h
@@ -11,7 +11,6 @@
#ifndef __PROF80_MMU__
#define __PROF80_MMU__
-#include "emu.h"
diff --git a/src/mame/machine/qimi.cpp b/src/mame/machine/qimi.cpp
index c49de90a854..7bbfbe903af 100644
--- a/src/mame/machine/qimi.cpp
+++ b/src/mame/machine/qimi.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "qimi.h"
diff --git a/src/mame/machine/qimi.h b/src/mame/machine/qimi.h
index 8ec534509ab..f35cbf1f749 100644
--- a/src/mame/machine/qimi.h
+++ b/src/mame/machine/qimi.h
@@ -11,7 +11,6 @@
#ifndef __QIMI__
#define __QIMI__
-#include "emu.h"
diff --git a/src/mame/machine/qx10kbd.cpp b/src/mame/machine/qx10kbd.cpp
index 59fac18aedc..14a91372c78 100644
--- a/src/mame/machine/qx10kbd.cpp
+++ b/src/mame/machine/qx10kbd.cpp
@@ -2,6 +2,7 @@
// copyright-holders:Carl
// TODO: dump 8049 mcu; key repeat; LEDs
+#include "emu.h"
#include "machine/qx10kbd.h"
#include "machine/keyboard.ipp"
diff --git a/src/mame/machine/rm380z.cpp b/src/mame/machine/rm380z.cpp
index a6931c93677..158f26cf182 100644
--- a/src/mame/machine/rm380z.cpp
+++ b/src/mame/machine/rm380z.cpp
@@ -8,6 +8,7 @@ RM 380Z machine
*/
+#include "emu.h"
#include "includes/rm380z.h"
diff --git a/src/mame/machine/rmnimbus.cpp b/src/mame/machine/rmnimbus.cpp
index 2604d9c9072..d6db1e65580 100644
--- a/src/mame/machine/rmnimbus.cpp
+++ b/src/mame/machine/rmnimbus.cpp
@@ -59,6 +59,7 @@ chdman createhd -o ST125N.chd -chs 41921,1,1 -ss 512
*/
+#include "emu.h"
#include <functional>
#include "includes/rmnimbus.h"
diff --git a/src/mame/machine/rmnkbd.cpp b/src/mame/machine/rmnkbd.cpp
index f12f4aea91f..be3304ec472 100644
--- a/src/mame/machine/rmnkbd.cpp
+++ b/src/mame/machine/rmnkbd.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Carl,Vas Crabb
+#include "emu.h"
#include "machine/rmnkbd.h"
#include "machine/keyboard.ipp"
diff --git a/src/mame/machine/segabb.cpp b/src/mame/machine/segabb.cpp
index dc62f67f6e0..aa03b4e483e 100644
--- a/src/mame/machine/segabb.cpp
+++ b/src/mame/machine/segabb.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Olivier Galibert
+#include "emu.h"
#include "segabb.h"
const device_type SEGA_LINDBERGH_BASEBOARD = &device_creator<sega_lindbergh_baseboard_device>;
diff --git a/src/mame/machine/segacrp2_device.h b/src/mame/machine/segacrp2_device.h
index 624252880bb..ddbe1cfb8d5 100644
--- a/src/mame/machine/segacrp2_device.h
+++ b/src/mame/machine/segacrp2_device.h
@@ -10,7 +10,6 @@
#define MCFG_SEGAZ80_SET_DECRYPTED_TAG(_tag) \
segacrp2_z80_device::set_decrypted_tag(*device, _tag);
-#include "emu.h"
#include "cpu/z80/z80.h"
// base class
diff --git a/src/mame/machine/segacrpt_device.h b/src/mame/machine/segacrpt_device.h
index 0e2a289f6fa..66395bf1e2c 100644
--- a/src/mame/machine/segacrpt_device.h
+++ b/src/mame/machine/segacrpt_device.h
@@ -23,7 +23,6 @@
segacrpt_z80_device::set_banksize(*device, _banksize);
-#include "emu.h"
#include "cpu/z80/z80.h"
// base class
diff --git a/src/mame/machine/slapstic.cpp b/src/mame/machine/slapstic.cpp
index 373bfdc5cd0..0361b53f4d7 100644
--- a/src/mame/machine/slapstic.cpp
+++ b/src/mame/machine/slapstic.cpp
@@ -181,6 +181,7 @@
*************************************************************************/
+#include "emu.h"
#include "includes/slapstic.h"
diff --git a/src/mame/machine/sorcerer.cpp b/src/mame/machine/sorcerer.cpp
index b140bf7094e..ecbae9c1836 100644
--- a/src/mame/machine/sorcerer.cpp
+++ b/src/mame/machine/sorcerer.cpp
@@ -6,6 +6,7 @@
*******************************************************************************/
+#include "emu.h"
#include "includes/sorcerer.h"
#include "machine/z80bin.h"
diff --git a/src/mame/machine/special.cpp b/src/mame/machine/special.cpp
index 9f1e23b3631..d13a8624b92 100644
--- a/src/mame/machine/special.cpp
+++ b/src/mame/machine/special.cpp
@@ -11,6 +11,7 @@
+#include "emu.h"
#include "includes/special.h"
diff --git a/src/mame/machine/st0016.cpp b/src/mame/machine/st0016.cpp
index 58ab23b9f4c..d39d6c1bc41 100644
--- a/src/mame/machine/st0016.cpp
+++ b/src/mame/machine/st0016.cpp
@@ -2,6 +2,7 @@
// copyright-holders:Tomasz Slanina, David Haywood
/* ST0016 - CPU (z80) + Sound + Video */
+#include "emu.h"
#include "st0016.h"
const device_type ST0016_CPU = &device_creator<st0016_cpu_device>;
diff --git a/src/mame/machine/st0016.h b/src/mame/machine/st0016.h
index 75c61d4f68c..c82e4eacfdb 100644
--- a/src/mame/machine/st0016.h
+++ b/src/mame/machine/st0016.h
@@ -7,7 +7,6 @@
#ifndef __ST0016_CPU__
#define __ST0016_CPU__
-#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/st0016.h"
diff --git a/src/mame/machine/subsino.h b/src/mame/machine/subsino.h
index 23f97da0c4b..8b68bd1902a 100644
--- a/src/mame/machine/subsino.h
+++ b/src/mame/machine/subsino.h
@@ -3,7 +3,6 @@
#ifndef __MACHINE_SUBSINO__
#define __MACHINE_SUBSINO__
-#include "emu.h"
extern const uint8_t crsbingo_xors[8];
extern const uint8_t sharkpy_xors [8];
diff --git a/src/mame/machine/super80.cpp b/src/mame/machine/super80.cpp
index 1c481e2191b..8b23b1edfe4 100644
--- a/src/mame/machine/super80.cpp
+++ b/src/mame/machine/super80.cpp
@@ -2,6 +2,7 @@
// copyright-holders:Robbbert
/* Super80.c written by Robbbert, 2005-2009. See driver source for documentation. */
+#include "emu.h"
#include "includes/super80.h"
#include "machine/z80bin.h"
diff --git a/src/mame/machine/swim.cpp b/src/mame/machine/swim.cpp
index df9beec8afa..cac2f6ed387 100644
--- a/src/mame/machine/swim.cpp
+++ b/src/mame/machine/swim.cpp
@@ -9,6 +9,7 @@
*********************************************************************/
+#include "emu.h"
#include "machine/swim.h"
diff --git a/src/mame/machine/tandy2kb.cpp b/src/mame/machine/tandy2kb.cpp
index fd975ed3a84..ff76291c1ff 100644
--- a/src/mame/machine/tandy2kb.cpp
+++ b/src/mame/machine/tandy2kb.cpp
@@ -6,6 +6,7 @@
*********************************************************************/
+#include "emu.h"
#include "tandy2kb.h"
diff --git a/src/mame/machine/tandy2kb.h b/src/mame/machine/tandy2kb.h
index aa6befb3667..b2ad63a38f1 100644
--- a/src/mame/machine/tandy2kb.h
+++ b/src/mame/machine/tandy2kb.h
@@ -11,7 +11,6 @@
#ifndef __TANDY2K_KEYBOARD__
#define __TANDY2K_KEYBOARD__
-#include "emu.h"
#include "cpu/mcs48/mcs48.h"
diff --git a/src/mame/machine/teleprinter.cpp b/src/mame/machine/teleprinter.cpp
index 8ffc4144794..d93c498e371 100644
--- a/src/mame/machine/teleprinter.cpp
+++ b/src/mame/machine/teleprinter.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Miodrag Milanovic
+#include "emu.h"
#include "teleprinter.h"
static const uint8_t teleprinter_font[128*8] =
diff --git a/src/mame/machine/thomflop.cpp b/src/mame/machine/thomflop.cpp
index 864fd36c9c4..6bb7416c51f 100644
--- a/src/mame/machine/thomflop.cpp
+++ b/src/mame/machine/thomflop.cpp
@@ -8,6 +8,7 @@
**********************************************************************/
+#include "emu.h"
#include "includes/thomson.h"
#include "machine/wd_fdc.h"
diff --git a/src/mame/machine/trs80.cpp b/src/mame/machine/trs80.cpp
index 1d9a77d0e90..ce847330e1f 100644
--- a/src/mame/machine/trs80.cpp
+++ b/src/mame/machine/trs80.cpp
@@ -13,6 +13,7 @@ MAX_SECTORS 5 and granules of sectors
***************************************************************************/
+#include "emu.h"
#include "includes/trs80.h"
diff --git a/src/mame/machine/trs80m2kb.cpp b/src/mame/machine/trs80m2kb.cpp
index 761d6c5d35e..0fe207f1ab0 100644
--- a/src/mame/machine/trs80m2kb.cpp
+++ b/src/mame/machine/trs80m2kb.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "trs80m2kb.h"
diff --git a/src/mame/machine/trs80m2kb.h b/src/mame/machine/trs80m2kb.h
index f41a3f0a666..bf8a45f3606 100644
--- a/src/mame/machine/trs80m2kb.h
+++ b/src/mame/machine/trs80m2kb.h
@@ -11,7 +11,6 @@
#ifndef __TRS80M2_KEYBOARD__
#define __TRS80M2_KEYBOARD__
-#include "emu.h"
#include "cpu/mcs48/mcs48.h"
#include "sound/discrete.h"
diff --git a/src/mame/machine/upd65031.cpp b/src/mame/machine/upd65031.cpp
index 0e54f374bac..6a98da0660c 100644
--- a/src/mame/machine/upd65031.cpp
+++ b/src/mame/machine/upd65031.cpp
@@ -22,6 +22,7 @@
*********************************************************************/
+#include "emu.h"
#include "upd65031.h"
diff --git a/src/mame/machine/upd65031.h b/src/mame/machine/upd65031.h
index ce13ad05942..aad871e80c6 100644
--- a/src/mame/machine/upd65031.h
+++ b/src/mame/machine/upd65031.h
@@ -11,7 +11,6 @@
#ifndef __UPD65031__
#define __UPD65031__
-#include "emu.h"
diff --git a/src/mame/machine/v1050kb.cpp b/src/mame/machine/v1050kb.cpp
index 977c85ba29a..05f7114e8c9 100644
--- a/src/mame/machine/v1050kb.cpp
+++ b/src/mame/machine/v1050kb.cpp
@@ -6,6 +6,7 @@
*********************************************************************/
+#include "emu.h"
#include "v1050kb.h"
diff --git a/src/mame/machine/v1050kb.h b/src/mame/machine/v1050kb.h
index 3fb1cb9da3d..052748b394b 100644
--- a/src/mame/machine/v1050kb.h
+++ b/src/mame/machine/v1050kb.h
@@ -11,7 +11,6 @@
#ifndef __V1050_KEYBOARD__
#define __V1050_KEYBOARD__
-#include "emu.h"
#include "cpu/mcs48/mcs48.h"
#include "sound/discrete.h"
diff --git a/src/mame/machine/vector06.cpp b/src/mame/machine/vector06.cpp
index 259dfed9127..efe3e81ff0d 100644
--- a/src/mame/machine/vector06.cpp
+++ b/src/mame/machine/vector06.cpp
@@ -9,6 +9,7 @@
****************************************************************************/
+#include "emu.h"
#include "includes/vector06.h"
diff --git a/src/mame/machine/victor9k_fdc.cpp b/src/mame/machine/victor9k_fdc.cpp
index d0bd89baf2d..d23f62126a2 100644
--- a/src/mame/machine/victor9k_fdc.cpp
+++ b/src/mame/machine/victor9k_fdc.cpp
@@ -40,6 +40,7 @@
*/
+#include "emu.h"
#include "victor9k_fdc.h"
diff --git a/src/mame/machine/victor9k_fdc.h b/src/mame/machine/victor9k_fdc.h
index 98e1d491507..dcd82226fdd 100644
--- a/src/mame/machine/victor9k_fdc.h
+++ b/src/mame/machine/victor9k_fdc.h
@@ -11,7 +11,6 @@
#ifndef __VICTOR_9000_FDC__
#define __VICTOR_9000_FDC__
-#include "emu.h"
#include "cpu/mcs48/mcs48.h"
#include "formats/victor9k_dsk.h"
#include "imagedev/floppy.h"
diff --git a/src/mame/machine/victor9kb.cpp b/src/mame/machine/victor9kb.cpp
index a683a51295f..9fb6e882caf 100644
--- a/src/mame/machine/victor9kb.cpp
+++ b/src/mame/machine/victor9kb.cpp
@@ -334,6 +334,7 @@ Y11 104 103 102 101 100 99 98 97 kN/A k. k00 k0 RGHT LEFT PAUS
*/
+#include "emu.h"
#include "victor9kb.h"
diff --git a/src/mame/machine/victor9kb.h b/src/mame/machine/victor9kb.h
index 53e51b0d608..5cf750c59ae 100644
--- a/src/mame/machine/victor9kb.h
+++ b/src/mame/machine/victor9kb.h
@@ -12,7 +12,6 @@
#define __VICTOR9K_KEYBOARD__
-#include "emu.h"
#include "cpu/mcs48/mcs48.h"
diff --git a/src/mame/machine/wangpckb.cpp b/src/mame/machine/wangpckb.cpp
index 9f272fd2652..e502814d13e 100644
--- a/src/mame/machine/wangpckb.cpp
+++ b/src/mame/machine/wangpckb.cpp
@@ -49,6 +49,7 @@ Notes:
*/
+#include "emu.h"
#include "wangpckb.h"
diff --git a/src/mame/machine/wangpckb.h b/src/mame/machine/wangpckb.h
index 1b357341a61..a621d9e8f88 100644
--- a/src/mame/machine/wangpckb.h
+++ b/src/mame/machine/wangpckb.h
@@ -12,7 +12,6 @@
#define __WANGPC_KEYBOARD__
-#include "emu.h"
#include "cpu/mcs51/mcs51.h"
#include "sound/sn76496.h"
diff --git a/src/mame/machine/wpc.cpp b/src/mame/machine/wpc.cpp
index f2e184bb060..346daf954a1 100644
--- a/src/mame/machine/wpc.cpp
+++ b/src/mame/machine/wpc.cpp
@@ -6,6 +6,7 @@
* Created on: 7/10/2013
*/
+#include "emu.h"
#include "wpc.h"
#define LOG_WPC (0)
diff --git a/src/mame/machine/wpc.h b/src/mame/machine/wpc.h
index f35aa1bf593..146c0f74754 100644
--- a/src/mame/machine/wpc.h
+++ b/src/mame/machine/wpc.h
@@ -9,7 +9,6 @@
#ifndef WPC_H_
#define WPC_H_
-#include "emu.h"
/* A = Alpha-numeric
* M = DMD
diff --git a/src/mame/machine/wswan.cpp b/src/mame/machine/wswan.cpp
index 65d88be4235..96d95c8d21d 100644
--- a/src/mame/machine/wswan.cpp
+++ b/src/mame/machine/wswan.cpp
@@ -17,6 +17,7 @@ TODO:
***************************************************************************/
+#include "emu.h"
#include "includes/wswan.h"
#include "render.h"
diff --git a/src/mame/machine/x1.cpp b/src/mame/machine/x1.cpp
index c50ed99e3ef..cb724cd326f 100644
--- a/src/mame/machine/x1.cpp
+++ b/src/mame/machine/x1.cpp
@@ -1,6 +1,7 @@
// license:LGPL-2.1+
// copyright-holders:Angelo Salese, Barry Rodewald
+#include "emu.h"
#include "includes/x1.h"
diff --git a/src/mame/machine/x68k_hdc.cpp b/src/mame/machine/x68k_hdc.cpp
index e6005313056..cb8400b18e5 100644
--- a/src/mame/machine/x68k_hdc.cpp
+++ b/src/mame/machine/x68k_hdc.cpp
@@ -17,6 +17,7 @@
*/
+#include "emu.h"
#include "x68k_hdc.h"
#include "imagedev/harddriv.h"
#include "image.h"
diff --git a/src/mame/machine/x68k_hdc.h b/src/mame/machine/x68k_hdc.h
index 3f5677790c8..0a4f5222531 100644
--- a/src/mame/machine/x68k_hdc.h
+++ b/src/mame/machine/x68k_hdc.h
@@ -6,7 +6,6 @@
*/
-#include "emu.h"
enum
{
diff --git a/src/mame/machine/x68k_kbd.cpp b/src/mame/machine/x68k_kbd.cpp
index 40ca743a6b5..94c49450f87 100644
--- a/src/mame/machine/x68k_kbd.cpp
+++ b/src/mame/machine/x68k_kbd.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Barry Rodewald,Vas Crabb
+#include "emu.h"
#include "machine/x68k_kbd.h"
#include "machine/keyboard.ipp"
diff --git a/src/mame/machine/x820kb.cpp b/src/mame/machine/x820kb.cpp
index aa235fc9b27..569ce6270bb 100644
--- a/src/mame/machine/x820kb.cpp
+++ b/src/mame/machine/x820kb.cpp
@@ -40,6 +40,7 @@ Notes:
*/
+#include "emu.h"
#include "x820kb.h"
diff --git a/src/mame/machine/x820kb.h b/src/mame/machine/x820kb.h
index cea0e009e9e..0edf355d032 100644
--- a/src/mame/machine/x820kb.h
+++ b/src/mame/machine/x820kb.h
@@ -11,7 +11,6 @@
#ifndef __XEROX_820_KEYBOARD__
#define __XEROX_820_KEYBOARD__
-#include "emu.h"
#include "cpu/mcs48/mcs48.h"
diff --git a/src/mame/machine/znmcu.cpp b/src/mame/machine/znmcu.cpp
index a61baa1ab14..3ef5f405388 100644
--- a/src/mame/machine/znmcu.cpp
+++ b/src/mame/machine/znmcu.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:smf
+#include "emu.h"
#include "znmcu.h"
const device_type ZNMCU = &device_creator<znmcu_device>;
diff --git a/src/mame/machine/znmcu.h b/src/mame/machine/znmcu.h
index d69c70197d4..b7c19c89331 100644
--- a/src/mame/machine/znmcu.h
+++ b/src/mame/machine/znmcu.h
@@ -5,7 +5,6 @@
#ifndef __ZNMCU_H__
#define __ZNMCU_H__
-#include "emu.h"
extern const device_type ZNMCU;
diff --git a/src/mame/machine/zs01.cpp b/src/mame/machine/zs01.cpp
index c112f208ab2..1c2d60343e4 100644
--- a/src/mame/machine/zs01.cpp
+++ b/src/mame/machine/zs01.cpp
@@ -9,6 +9,7 @@
*
*/
+#include "emu.h"
#include "machine/zs01.h"
#define VERBOSE_LEVEL ( 0 )
diff --git a/src/mame/machine/zx.cpp b/src/mame/machine/zx.cpp
index 3876cd5de4c..2850033fd79 100644
--- a/src/mame/machine/zx.cpp
+++ b/src/mame/machine/zx.cpp
@@ -8,6 +8,7 @@
****************************************************************************/
+#include "emu.h"
#include "includes/zx.h"
DRIVER_INIT_MEMBER(zx_state,zx)
diff --git a/src/mame/machine/zx8302.h b/src/mame/machine/zx8302.h
index 515e2dce2ef..679438cfa0e 100644
--- a/src/mame/machine/zx8302.h
+++ b/src/mame/machine/zx8302.h
@@ -34,7 +34,6 @@
#ifndef __ZX8302__
#define __ZX8302__
-#include "emu.h"
///*************************************************************************