summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/includes
diff options
context:
space:
mode:
authorGravatarGravatar Olivier Galibert <galibert@pobox.com>2017-02-11 18:23:11 +0100
committerGravatarGravatar Olivier Galibert <galibert@pobox.com>2017-02-11 18:31:20 +0100
commita2557f1b02478c5aaa1fdfa00204ac2e219319a1 (patch)
tree6f1693d59aa53be8c76ffe3bcf7fbc72f8546453 /src/mame/includes
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/includes')
-rw-r--r--src/mame/includes/adam.h1
-rw-r--r--src/mame/includes/apollo.h1
-rw-r--r--src/mame/includes/apple2.h1
-rw-r--r--src/mame/includes/aquarius.h1
-rw-r--r--src/mame/includes/arcadia.h1
-rw-r--r--src/mame/includes/atom.h1
-rw-r--r--src/mame/includes/aussiebyte.h1
-rw-r--r--src/mame/includes/bebox.h1
-rw-r--r--src/mame/includes/bullet.h1
-rw-r--r--src/mame/includes/bw12.h1
-rw-r--r--src/mame/includes/bw2.h1
-rw-r--r--src/mame/includes/c80.h1
-rw-r--r--src/mame/includes/cgc7900.h1
-rw-r--r--src/mame/includes/channelf.h1
-rw-r--r--src/mame/includes/cidelsa.h1
-rw-r--r--src/mame/includes/coco.h1
-rw-r--r--src/mame/includes/coleco.h1
-rw-r--r--src/mame/includes/comx35.h1
-rw-r--r--src/mame/includes/coolpool.h1
-rw-r--r--src/mame/includes/cosmicos.h1
-rw-r--r--src/mame/includes/crvision.h1
-rw-r--r--src/mame/includes/cybiko.h1
-rw-r--r--src/mame/includes/dm7000.h1
-rw-r--r--src/mame/includes/einstein.h1
-rw-r--r--src/mame/includes/elf.h1
-rw-r--r--src/mame/includes/eti660.h1
-rw-r--r--src/mame/includes/fidelbase.h1
-rw-r--r--src/mame/includes/fmtowns.h1
-rw-r--r--src/mame/includes/gamecom.h1
-rw-r--r--src/mame/includes/goldstar.h1
-rw-r--r--src/mame/includes/gottlieb.h1
-rw-r--r--src/mame/includes/hh_tms1k.h1
-rw-r--r--src/mame/includes/hh_ucom4.h1
-rw-r--r--src/mame/includes/hp9845.h1
-rw-r--r--src/mame/includes/huebler.h1
-rw-r--r--src/mame/includes/imds2.h1
-rw-r--r--src/mame/includes/interpro.h3
-rw-r--r--src/mame/includes/kaypro.h1
-rw-r--r--src/mame/includes/kim1.h1
-rw-r--r--src/mame/includes/lc80.h1
-rw-r--r--src/mame/includes/lisa.h1
-rw-r--r--src/mame/includes/llc.h1
-rw-r--r--src/mame/includes/mbc55x.h1
-rw-r--r--src/mame/includes/mbee.h1
-rw-r--r--src/mame/includes/mc80.h1
-rw-r--r--src/mame/includes/meadows.h1
-rw-r--r--src/mame/includes/mpf1.h1
-rw-r--r--src/mame/includes/mpz80.h1
-rw-r--r--src/mame/includes/msx.h1
-rw-r--r--src/mame/includes/multfish.h1
-rw-r--r--src/mame/includes/mz80.h1
-rw-r--r--src/mame/includes/newbrain.h1
-rw-r--r--src/mame/includes/next.h1
-rw-r--r--src/mame/includes/novagbase.h1
-rw-r--r--src/mame/includes/osi.h1
-rw-r--r--src/mame/includes/p2000t.h1
-rw-r--r--src/mame/includes/pc1512.h1
-rw-r--r--src/mame/includes/pc8001.h1
-rw-r--r--src/mame/includes/pc8401a.h1
-rw-r--r--src/mame/includes/pcw16.h1
-rw-r--r--src/mame/includes/phc25.h1
-rw-r--r--src/mame/includes/poly880.h1
-rw-r--r--src/mame/includes/pp01.h1
-rw-r--r--src/mame/includes/psikyo4.h1
-rw-r--r--src/mame/includes/px8.h1
-rw-r--r--src/mame/includes/rm380z.h1
-rw-r--r--src/mame/includes/rmnimbus.h1
-rw-r--r--src/mame/includes/sage2.h1
-rw-r--r--src/mame/includes/sg1000.h1
-rw-r--r--src/mame/includes/slapstic.h1
-rw-r--r--src/mame/includes/softbox.h1
-rw-r--r--src/mame/includes/sorcerer.h1
-rw-r--r--src/mame/includes/special.h1
-rw-r--r--src/mame/includes/super6.h1
-rw-r--r--src/mame/includes/super80.h1
-rw-r--r--src/mame/includes/swtpc09.h1
-rw-r--r--src/mame/includes/tandy2k.h1
-rw-r--r--src/mame/includes/tdv2324.h1
-rw-r--r--src/mame/includes/tek405x.h1
-rw-r--r--src/mame/includes/thomson.h1
-rw-r--r--src/mame/includes/tiki100.h1
-rw-r--r--src/mame/includes/tmc1800.h1
-rw-r--r--src/mame/includes/tmc2000e.h1
-rw-r--r--src/mame/includes/tmc600.h1
-rw-r--r--src/mame/includes/tranz330.h1
-rw-r--r--src/mame/includes/trs80.h1
-rw-r--r--src/mame/includes/trs80m2.h1
-rw-r--r--src/mame/includes/ut88.h1
-rw-r--r--src/mame/includes/v1050.h1
-rw-r--r--src/mame/includes/vc4000.h1
-rw-r--r--src/mame/includes/vcs80.h1
-rw-r--r--src/mame/includes/vector06.h1
-rw-r--r--src/mame/includes/vidbrain.h1
-rw-r--r--src/mame/includes/vip.h1
-rw-r--r--src/mame/includes/wpc_dot.h1
-rw-r--r--src/mame/includes/wswan.h1
-rw-r--r--src/mame/includes/x07.h1
-rw-r--r--src/mame/includes/x1.h1
-rw-r--r--src/mame/includes/xerox820.h1
-rw-r--r--src/mame/includes/xor100.h1
-rw-r--r--src/mame/includes/z88.h1
-rw-r--r--src/mame/includes/zaccaria.h1
-rw-r--r--src/mame/includes/zerozone.h1
-rw-r--r--src/mame/includes/zodiack.h1
-rw-r--r--src/mame/includes/zx.h1
105 files changed, 1 insertions, 106 deletions
diff --git a/src/mame/includes/adam.h b/src/mame/includes/adam.h
index 4d4e4643160..55bb08f829e 100644
--- a/src/mame/includes/adam.h
+++ b/src/mame/includes/adam.h
@@ -5,7 +5,6 @@
#ifndef ADAM_H_
#define ADAM_H_
-#include "emu.h"
#include "bus/adam/exp.h"
#include "bus/adamnet/adamnet.h"
#include "bus/coleco/ctrl.h"
diff --git a/src/mame/includes/apollo.h b/src/mame/includes/apollo.h
index 98d91efdf65..4f44b57e066 100644
--- a/src/mame/includes/apollo.h
+++ b/src/mame/includes/apollo.h
@@ -13,7 +13,6 @@
#ifndef APOLLO_H_
#define APOLLO_H_
-#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "bus/rs232/rs232.h"
diff --git a/src/mame/includes/apple2.h b/src/mame/includes/apple2.h
index 0596bd91af2..2c3c64a573d 100644
--- a/src/mame/includes/apple2.h
+++ b/src/mame/includes/apple2.h
@@ -11,7 +11,6 @@
#ifndef APPLE2_H_
#define APPLE2_H_
-#include "emu.h"
#include "cpu/m6502/m6502.h"
#include "cpu/m6502/m65c02.h"
#include "bus/a2bus/a2bus.h"
diff --git a/src/mame/includes/aquarius.h b/src/mame/includes/aquarius.h
index 25adea20e3b..e4304aff451 100644
--- a/src/mame/includes/aquarius.h
+++ b/src/mame/includes/aquarius.h
@@ -9,7 +9,6 @@
#ifndef __AQUARIUS__
#define __AQUARIUS__
-#include "emu.h"
#include "cpu/z80/z80.h"
#include "video/tea1002.h"
#include "imagedev/cassette.h"
diff --git a/src/mame/includes/arcadia.h b/src/mame/includes/arcadia.h
index 97e51c8b392..4e8904748ff 100644
--- a/src/mame/includes/arcadia.h
+++ b/src/mame/includes/arcadia.h
@@ -9,7 +9,6 @@
#ifndef ARCADIA_H_
#define ARCADIA_H_
-#include "emu.h"
#include "cpu/s2650/s2650.h"
#include "audio/arcadia.h"
diff --git a/src/mame/includes/atom.h b/src/mame/includes/atom.h
index 28d85c967fc..450117ec53f 100644
--- a/src/mame/includes/atom.h
+++ b/src/mame/includes/atom.h
@@ -6,7 +6,6 @@
#define __ATOM__
-#include "emu.h"
#include "cpu/m6502/m6502.h"
#include "imagedev/cassette.h"
#include "imagedev/flopdrv.h"
diff --git a/src/mame/includes/aussiebyte.h b/src/mame/includes/aussiebyte.h
index 0ec8c3c1115..e3723bcb284 100644
--- a/src/mame/includes/aussiebyte.h
+++ b/src/mame/includes/aussiebyte.h
@@ -6,7 +6,6 @@
Includes
************************************************************/
-#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/z80/z80daisy.h"
#include "machine/z80ctc.h"
diff --git a/src/mame/includes/bebox.h b/src/mame/includes/bebox.h
index 65dfebd9895..61128f08717 100644
--- a/src/mame/includes/bebox.h
+++ b/src/mame/includes/bebox.h
@@ -11,7 +11,6 @@
#ifndef BEBOX_H_
#define BEBOX_H_
-#include "emu.h"
#include "machine/53c810.h"
#include "machine/am9517a.h"
#include "machine/idectrl.h"
diff --git a/src/mame/includes/bullet.h b/src/mame/includes/bullet.h
index 4b3c9b8f564..3b9ca19b9f4 100644
--- a/src/mame/includes/bullet.h
+++ b/src/mame/includes/bullet.h
@@ -5,7 +5,6 @@
#ifndef __BULLET__
#define __BULLET__
-#include "emu.h"
#include "cpu/z80/z80.h"
#include "bus/centronics/ctronics.h"
#include "machine/ram.h"
diff --git a/src/mame/includes/bw12.h b/src/mame/includes/bw12.h
index 31a97242293..115748f796e 100644
--- a/src/mame/includes/bw12.h
+++ b/src/mame/includes/bw12.h
@@ -3,7 +3,6 @@
#ifndef __BW12__
#define __BW12__
-#include "emu.h"
#include "cpu/z80/z80.h"
#include "machine/ram.h"
#include "formats/bw12_dsk.h"
diff --git a/src/mame/includes/bw2.h b/src/mame/includes/bw2.h
index 22e5876ce7e..067fe96a983 100644
--- a/src/mame/includes/bw2.h
+++ b/src/mame/includes/bw2.h
@@ -5,7 +5,6 @@
#ifndef __BW2__
#define __BW2__
-#include "emu.h"
#include "bus/bw2/exp.h"
#include "cpu/z80/z80.h"
#include "formats/bw2_dsk.h"
diff --git a/src/mame/includes/c80.h b/src/mame/includes/c80.h
index 0f96980fc8d..de52c65a364 100644
--- a/src/mame/includes/c80.h
+++ b/src/mame/includes/c80.h
@@ -4,7 +4,6 @@
#define __C80__
-#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/z80/z80daisy.h"
#include "machine/z80pio.h"
diff --git a/src/mame/includes/cgc7900.h b/src/mame/includes/cgc7900.h
index 9d8b6420f2f..03a72078403 100644
--- a/src/mame/includes/cgc7900.h
+++ b/src/mame/includes/cgc7900.h
@@ -6,7 +6,6 @@
#define __CGC7900__
-#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "cpu/mcs48/mcs48.h"
#include "machine/ram.h"
diff --git a/src/mame/includes/channelf.h b/src/mame/includes/channelf.h
index 5eef8bbb4e5..d9dc71da016 100644
--- a/src/mame/includes/channelf.h
+++ b/src/mame/includes/channelf.h
@@ -9,7 +9,6 @@
#ifndef CHANNELF_H_
#define CHANNELF_H_
-#include "emu.h"
#include "cpu/f8/f8.h"
#include "audio/channelf.h"
diff --git a/src/mame/includes/cidelsa.h b/src/mame/includes/cidelsa.h
index a881c31ca75..4fecb52f077 100644
--- a/src/mame/includes/cidelsa.h
+++ b/src/mame/includes/cidelsa.h
@@ -6,7 +6,6 @@
#define __CIDELSA__
-#include "emu.h"
#include "cpu/cosmac/cosmac.h"
#include "cpu/cop400/cop400.h"
#include "sound/cdp1869.h"
diff --git a/src/mame/includes/coco.h b/src/mame/includes/coco.h
index 8853b3155eb..06920b09a10 100644
--- a/src/mame/includes/coco.h
+++ b/src/mame/includes/coco.h
@@ -14,7 +14,6 @@
#define __COCO__
-#include "emu.h"
#include "imagedev/cassette.h"
#include "bus/rs232/rs232.h"
#include "machine/6821pia.h"
diff --git a/src/mame/includes/coleco.h b/src/mame/includes/coleco.h
index 65117fc5660..63b519240fd 100644
--- a/src/mame/includes/coleco.h
+++ b/src/mame/includes/coleco.h
@@ -6,7 +6,6 @@
#define __COLECO__
-#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/sn76496.h"
#include "video/tms9928a.h"
diff --git a/src/mame/includes/comx35.h b/src/mame/includes/comx35.h
index 3e80113f906..dad520607e0 100644
--- a/src/mame/includes/comx35.h
+++ b/src/mame/includes/comx35.h
@@ -5,7 +5,6 @@
#ifndef __COMX35__
#define __COMX35__
-#include "emu.h"
#include "bus/comx35/exp.h"
#include "cpu/cosmac/cosmac.h"
#include "imagedev/cassette.h"
diff --git a/src/mame/includes/coolpool.h b/src/mame/includes/coolpool.h
index 9b5f14f8545..2516afaf1c1 100644
--- a/src/mame/includes/coolpool.h
+++ b/src/mame/includes/coolpool.h
@@ -2,7 +2,6 @@
// copyright-holders:Aaron Giles,Nicola Salmoria
#define NVRAM_UNLOCK_SEQ_LEN 10
-#include "emu.h"
#include "cpu/tms34010/tms34010.h"
#include "video/tlc34076.h"
diff --git a/src/mame/includes/cosmicos.h b/src/mame/includes/cosmicos.h
index 6b7a8c5015d..ad558efc0f3 100644
--- a/src/mame/includes/cosmicos.h
+++ b/src/mame/includes/cosmicos.h
@@ -5,7 +5,6 @@
#ifndef __COSMICOS__
#define __COSMICOS__
-#include "emu.h"
#include "cpu/cosmac/cosmac.h"
#include "imagedev/cassette.h"
#include "machine/ram.h"
diff --git a/src/mame/includes/crvision.h b/src/mame/includes/crvision.h
index 342ef6d34e5..f1f3043128f 100644
--- a/src/mame/includes/crvision.h
+++ b/src/mame/includes/crvision.h
@@ -5,7 +5,6 @@
#define __CRVISION__
-#include "emu.h"
#include "cpu/m6502/m6502.h"
#include "imagedev/cassette.h"
#include "machine/6821pia.h"
diff --git a/src/mame/includes/cybiko.h b/src/mame/includes/cybiko.h
index f9558a42643..d1386f79233 100644
--- a/src/mame/includes/cybiko.h
+++ b/src/mame/includes/cybiko.h
@@ -18,7 +18,6 @@
#define CYBIKO_H_
/* Core includes */
-#include "emu.h"
#include "sound/speaker.h"
/* Components */
diff --git a/src/mame/includes/dm7000.h b/src/mame/includes/dm7000.h
index 97af2a1785a..b50ee550e78 100644
--- a/src/mame/includes/dm7000.h
+++ b/src/mame/includes/dm7000.h
@@ -3,7 +3,6 @@
#ifndef DM7000_H_
#define DM7000_H_
-#include "emu.h"
#include "cpu/powerpc/ppc.h"
#include "machine/terminal.h"
diff --git a/src/mame/includes/einstein.h b/src/mame/includes/einstein.h
index 437acdc689e..43b646f7eac 100644
--- a/src/mame/includes/einstein.h
+++ b/src/mame/includes/einstein.h
@@ -9,7 +9,6 @@
#ifndef EINSTEIN_H_
#define EINSTEIN_H_
-#include "emu.h"
#include "video/mc6845.h"
#include "cpu/z80/z80daisy.h"
#include "machine/wd_fdc.h"
diff --git a/src/mame/includes/elf.h b/src/mame/includes/elf.h
index b75626f4ea8..1f737576319 100644
--- a/src/mame/includes/elf.h
+++ b/src/mame/includes/elf.h
@@ -6,7 +6,6 @@
#define __INCLUDES_ELF__
-#include "emu.h"
#include "cpu/cosmac/cosmac.h"
#include "imagedev/cassette.h"
#include "imagedev/snapquik.h"
diff --git a/src/mame/includes/eti660.h b/src/mame/includes/eti660.h
index 06bf77dbd4c..034f75879e3 100644
--- a/src/mame/includes/eti660.h
+++ b/src/mame/includes/eti660.h
@@ -5,7 +5,6 @@
#ifndef __ETI660__
#define __ETI660__
-#include "emu.h"
#include "cpu/cosmac/cosmac.h"
#include "imagedev/cassette.h"
#include "imagedev/snapquik.h"
diff --git a/src/mame/includes/fidelbase.h b/src/mame/includes/fidelbase.h
index 1f36fdc490b..589d53157e1 100644
--- a/src/mame/includes/fidelbase.h
+++ b/src/mame/includes/fidelbase.h
@@ -6,7 +6,6 @@
*
******************************************************************************/
-#include "emu.h"
#include "sound/dac.h"
#include "sound/s14001a.h"
#include "bus/generic/slot.h"
diff --git a/src/mame/includes/fmtowns.h b/src/mame/includes/fmtowns.h
index e761dc2c4ee..cb85294f8a7 100644
--- a/src/mame/includes/fmtowns.h
+++ b/src/mame/includes/fmtowns.h
@@ -4,7 +4,6 @@
#define FMTOWNS_H_
-#include "emu.h"
#include "cpu/i386/i386.h"
#include "sound/2612intf.h"
#include "sound/rf5c68.h"
diff --git a/src/mame/includes/gamecom.h b/src/mame/includes/gamecom.h
index 430a76c33da..f3156b83132 100644
--- a/src/mame/includes/gamecom.h
+++ b/src/mame/includes/gamecom.h
@@ -13,7 +13,6 @@
#ifndef GAMECOM_H_
#define GAMECOM_H_
-#include "emu.h"
#include "cpu/sm8500/sm8500.h"
#include "sound/dac.h"
#include "bus/generic/slot.h"
diff --git a/src/mame/includes/goldstar.h b/src/mame/includes/goldstar.h
index 22a3876b7ad..4e5c45eee2f 100644
--- a/src/mame/includes/goldstar.h
+++ b/src/mame/includes/goldstar.h
@@ -1,6 +1,5 @@
// license:BSD-3-Clause
// copyright-holders:David Haywood, Roberto Fresca, Vas Crabb
-#include "emu.h"
#include "machine/ds2401.h"
#include "machine/ticket.h"
diff --git a/src/mame/includes/gottlieb.h b/src/mame/includes/gottlieb.h
index 2dddb114062..efb49c910f6 100644
--- a/src/mame/includes/gottlieb.h
+++ b/src/mame/includes/gottlieb.h
@@ -6,7 +6,6 @@
***************************************************************************/
-#include "emu.h"
#include "audio/gottlieb.h"
#include "cpu/i86/i86.h"
#include "cpu/m6502/m6502.h"
diff --git a/src/mame/includes/hh_tms1k.h b/src/mame/includes/hh_tms1k.h
index 35b27a579ab..a6b3093f169 100644
--- a/src/mame/includes/hh_tms1k.h
+++ b/src/mame/includes/hh_tms1k.h
@@ -9,7 +9,6 @@
#ifndef _HH_TMS1K_H_
#define _HH_TMS1K_H_
-#include "emu.h"
#include "cpu/tms1000/tms1000.h"
#include "cpu/tms1000/tms1100.h"
#include "cpu/tms1000/tms1400.h"
diff --git a/src/mame/includes/hh_ucom4.h b/src/mame/includes/hh_ucom4.h
index 8328809c09a..883e379685a 100644
--- a/src/mame/includes/hh_ucom4.h
+++ b/src/mame/includes/hh_ucom4.h
@@ -10,7 +10,6 @@
#define _HH_UCOM4_H_
-#include "emu.h"
#include "rendlay.h"
#include "cpu/ucom4/ucom4.h"
#include "sound/speaker.h"
diff --git a/src/mame/includes/hp9845.h b/src/mame/includes/hp9845.h
index d26fe8f0583..8dc44ca5f0c 100644
--- a/src/mame/includes/hp9845.h
+++ b/src/mame/includes/hp9845.h
@@ -6,7 +6,6 @@
#ifndef _HP9845_H_
#define _HP9845_H_
-#include "emu.h"
#include "cpu/hphybrid/hphybrid.h"
#include "machine/hp_taco.h"
#include "sound/beep.h"
diff --git a/src/mame/includes/huebler.h b/src/mame/includes/huebler.h
index a47ec0c30bc..4a6a452f379 100644
--- a/src/mame/includes/huebler.h
+++ b/src/mame/includes/huebler.h
@@ -10,7 +10,6 @@
#define Z80PIO1_TAG "z80pio1"
#define Z80PIO2_TAG "z80pio2"
-#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/z80/z80daisy.h"
#include "imagedev/cassette.h"
diff --git a/src/mame/includes/imds2.h b/src/mame/includes/imds2.h
index 2fe530afee0..dc03bfbaeb8 100644
--- a/src/mame/includes/imds2.h
+++ b/src/mame/includes/imds2.h
@@ -5,7 +5,6 @@
#ifndef _IMDS2_H_
#define _IMDS2_H_
-#include "emu.h"
#include "cpu/i8085/i8085.h"
#include "cpu/mcs48/mcs48.h"
#include "machine/i8257.h"
diff --git a/src/mame/includes/interpro.h b/src/mame/includes/interpro.h
index 6ae135b552c..927d626f5a0 100644
--- a/src/mame/includes/interpro.h
+++ b/src/mame/includes/interpro.h
@@ -6,7 +6,6 @@
#ifndef INTERPRO_H_
#define INTERPRO_H_
-#include "emu.h"
#include "cpu/clipper/clipper.h"
#include "machine/cammu.h"
@@ -128,4 +127,4 @@ private:
uint16_t m_system_reg[4];
};
-#endif \ No newline at end of file
+#endif
diff --git a/src/mame/includes/kaypro.h b/src/mame/includes/kaypro.h
index 93aa0c05638..1d8a994d53d 100644
--- a/src/mame/includes/kaypro.h
+++ b/src/mame/includes/kaypro.h
@@ -1,6 +1,5 @@
// license:BSD-3-Clause
// copyright-holders:Robbbert
-#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/z80/z80daisy.h"
#include "machine/z80pio.h"
diff --git a/src/mame/includes/kim1.h b/src/mame/includes/kim1.h
index 0f4d9b67a0e..1f951a92e31 100644
--- a/src/mame/includes/kim1.h
+++ b/src/mame/includes/kim1.h
@@ -11,7 +11,6 @@
#ifndef __KIM1__
#define __KIM1__
-#include "emu.h"
#include "softlist.h"
#include "cpu/m6502/m6502.h"
#include "machine/mos6530.h"
diff --git a/src/mame/includes/lc80.h b/src/mame/includes/lc80.h
index 6671e3717d2..730ce855aca 100644
--- a/src/mame/includes/lc80.h
+++ b/src/mame/includes/lc80.h
@@ -4,7 +4,6 @@
#define __LC80__
-#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/z80/z80daisy.h"
#include "imagedev/cassette.h"
diff --git a/src/mame/includes/lisa.h b/src/mame/includes/lisa.h
index ec6cea36036..2cdff88dc05 100644
--- a/src/mame/includes/lisa.h
+++ b/src/mame/includes/lisa.h
@@ -11,7 +11,6 @@
#ifndef LISA_H_
#define LISA_H_
-#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "machine/6522via.h"
#include "machine/8530scc.h"
diff --git a/src/mame/includes/llc.h b/src/mame/includes/llc.h
index 56637c0b71d..02dd97d6fd1 100644
--- a/src/mame/includes/llc.h
+++ b/src/mame/includes/llc.h
@@ -9,7 +9,6 @@
#ifndef LLC_H_
#define LLC_H_
-#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/z80/z80daisy.h"
#include "machine/z80pio.h"
diff --git a/src/mame/includes/mbc55x.h b/src/mame/includes/mbc55x.h
index 3948c7be120..9bd469f27fb 100644
--- a/src/mame/includes/mbc55x.h
+++ b/src/mame/includes/mbc55x.h
@@ -8,7 +8,6 @@
2011-01-29.
*/
-#include "emu.h"
#include "cpu/i86/i86.h"
#include "machine/ram.h"
#include "bus/centronics/ctronics.h"
diff --git a/src/mame/includes/mbee.h b/src/mame/includes/mbee.h
index f23093fccca..a509cb2bdec 100644
--- a/src/mame/includes/mbee.h
+++ b/src/mame/includes/mbee.h
@@ -9,7 +9,6 @@
#ifndef MBEE_H_
#define MBEE_H_
-#include "emu.h"
#include "imagedev/snapquik.h"
#include "machine/z80pio.h"
#include "machine/8530scc.h"
diff --git a/src/mame/includes/mc80.h b/src/mame/includes/mc80.h
index 2ce4e7fef6b..a55db5e3aa9 100644
--- a/src/mame/includes/mc80.h
+++ b/src/mame/includes/mc80.h
@@ -9,7 +9,6 @@
#ifndef MC80_H_
#define MC80_H_
-#include "emu.h"
#include "cpu/z80/z80.h"
#include "machine/z80ctc.h"
#include "machine/z80pio.h"
diff --git a/src/mame/includes/meadows.h b/src/mame/includes/meadows.h
index 2425ac89a36..f5a583bc1c5 100644
--- a/src/mame/includes/meadows.h
+++ b/src/mame/includes/meadows.h
@@ -5,7 +5,6 @@
Meadows S2650 hardware
*************************************************************************/
-#include "emu.h"
#include "cpu/s2650/s2650.h"
#include "sound/dac.h"
#include "sound/samples.h"
diff --git a/src/mame/includes/mpf1.h b/src/mame/includes/mpf1.h
index 5db907ce6d8..71de176aab5 100644
--- a/src/mame/includes/mpf1.h
+++ b/src/mame/includes/mpf1.h
@@ -6,7 +6,6 @@
#define __MPF1__
-#include "emu.h"
#include "machine/spchrom.h"
#include "cpu/z80/z80.h"
#include "cpu/z80/z80daisy.h"
diff --git a/src/mame/includes/mpz80.h b/src/mame/includes/mpz80.h
index 0d4c778d74b..ee39922b5d2 100644
--- a/src/mame/includes/mpz80.h
+++ b/src/mame/includes/mpz80.h
@@ -5,7 +5,6 @@
#ifndef __MPZ80__
#define __MPZ80__
-#include "emu.h"
#include "bus/s100/s100.h"
#include "cpu/z80/z80.h"
#include "machine/ram.h"
diff --git a/src/mame/includes/msx.h b/src/mame/includes/msx.h
index f331cc25256..a0fa175eef5 100644
--- a/src/mame/includes/msx.h
+++ b/src/mame/includes/msx.h
@@ -9,7 +9,6 @@
#ifndef __MSX_H__
#define __MSX_H__
-#include "emu.h"
#include "cpu/z80/z80.h"
#include "machine/i8255.h"
#include "machine/rp5c01.h"
diff --git a/src/mame/includes/multfish.h b/src/mame/includes/multfish.h
index 101ebdf1fef..c6be80c49d7 100644
--- a/src/mame/includes/multfish.h
+++ b/src/mame/includes/multfish.h
@@ -3,7 +3,6 @@
/* Multifish */
-#include "emu.h"
#include "sound/ay8910.h"
#include "cpu/z80/z80.h"
#include "machine/timekpr.h"
diff --git a/src/mame/includes/mz80.h b/src/mame/includes/mz80.h
index 0ded0e5ac30..6c96fb94dbb 100644
--- a/src/mame/includes/mz80.h
+++ b/src/mame/includes/mz80.h
@@ -9,7 +9,6 @@
#ifndef MZ80_H_
#define MZ80_H_
-#include "emu.h"
#include "cpu/z80/z80.h"
#include "machine/i8255.h"
#include "machine/pit8253.h"
diff --git a/src/mame/includes/newbrain.h b/src/mame/includes/newbrain.h
index 979b3dc14b5..9b97f7028aa 100644
--- a/src/mame/includes/newbrain.h
+++ b/src/mame/includes/newbrain.h
@@ -6,7 +6,6 @@
#define __NEWBRAIN__
-#include "emu.h"
#include "bus/newbrain/exp.h"
#include "bus/rs232/rs232.h"
#include "cpu/z80/z80.h"
diff --git a/src/mame/includes/next.h b/src/mame/includes/next.h
index 2ec74741a0e..b50ed43d41a 100644
--- a/src/mame/includes/next.h
+++ b/src/mame/includes/next.h
@@ -5,7 +5,6 @@
#ifndef __NEXT__
#define __NEXT__
-#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "machine/nscsi_bus.h"
#include "machine/mccs1850.h"
diff --git a/src/mame/includes/novagbase.h b/src/mame/includes/novagbase.h
index 6516525804e..b0e25131b5a 100644
--- a/src/mame/includes/novagbase.h
+++ b/src/mame/includes/novagbase.h
@@ -6,7 +6,6 @@
*
******************************************************************************/
-#include "emu.h"
#include "sound/beep.h"
#include "video/hd44780.h"
diff --git a/src/mame/includes/osi.h b/src/mame/includes/osi.h
index 783159cd634..9dafbf9a284 100644
--- a/src/mame/includes/osi.h
+++ b/src/mame/includes/osi.h
@@ -6,7 +6,6 @@
#define __OSI__
-#include "emu.h"
#include "cpu/m6502/m6502.h"
#include "formats/basicdsk.h"
#include "imagedev/cassette.h"
diff --git a/src/mame/includes/p2000t.h b/src/mame/includes/p2000t.h
index 7b8a895d343..7264b1087ee 100644
--- a/src/mame/includes/p2000t.h
+++ b/src/mame/includes/p2000t.h
@@ -9,7 +9,6 @@
#ifndef P2000T_H_
#define P2000T_H_
-#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/speaker.h"
#include "video/saa5050.h"
diff --git a/src/mame/includes/pc1512.h b/src/mame/includes/pc1512.h
index dd8f5fcb213..9105325a790 100644
--- a/src/mame/includes/pc1512.h
+++ b/src/mame/includes/pc1512.h
@@ -5,7 +5,6 @@
#ifndef __PC1512__
#define __PC1512__
-#include "emu.h"
#include "bus/centronics/ctronics.h"
#include "bus/isa/isa.h"
#include "bus/isa/isa_cards.h"
diff --git a/src/mame/includes/pc8001.h b/src/mame/includes/pc8001.h
index 72a353381bf..c5c89011ab1 100644
--- a/src/mame/includes/pc8001.h
+++ b/src/mame/includes/pc8001.h
@@ -6,7 +6,6 @@
#define __PC8001__
-#include "emu.h"
#include "cpu/z80/z80.h"
#include "imagedev/cassette.h"
#include "machine/buffer.h"
diff --git a/src/mame/includes/pc8401a.h b/src/mame/includes/pc8401a.h
index 2d3fd53dfd8..a1058e4d641 100644
--- a/src/mame/includes/pc8401a.h
+++ b/src/mame/includes/pc8401a.h
@@ -6,7 +6,6 @@
#define __PC8401A__
-#include "emu.h"
#include "cpu/z80/z80.h"
#include "machine/i8255.h"
#include "machine/i8251.h"
diff --git a/src/mame/includes/pcw16.h b/src/mame/includes/pcw16.h
index ca70412feea..343fd86bf89 100644
--- a/src/mame/includes/pcw16.h
+++ b/src/mame/includes/pcw16.h
@@ -9,7 +9,6 @@
#ifndef PCW16_H_
#define PCW16_H_
-#include "emu.h"
#include "cpu/z80/z80.h"
#include "machine/upd765.h" /* FDC superio */
#include "machine/pc_lpt.h" /* PC-Parallel Port */
diff --git a/src/mame/includes/phc25.h b/src/mame/includes/phc25.h
index a33d2c2d911..5b772545813 100644
--- a/src/mame/includes/phc25.h
+++ b/src/mame/includes/phc25.h
@@ -6,7 +6,6 @@
#define __PHC25__
-#include "emu.h"
#include "cpu/z80/z80.h"
#include "imagedev/cassette.h"
#include "sound/wave.h"
diff --git a/src/mame/includes/poly880.h b/src/mame/includes/poly880.h
index 71b7f1bb60b..ceca63efc3f 100644
--- a/src/mame/includes/poly880.h
+++ b/src/mame/includes/poly880.h
@@ -6,7 +6,6 @@
#define __POLY880__
-#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/z80/z80daisy.h"
#include "imagedev/cassette.h"
diff --git a/src/mame/includes/pp01.h b/src/mame/includes/pp01.h
index 055f0b3bd0b..c7d0e44466d 100644
--- a/src/mame/includes/pp01.h
+++ b/src/mame/includes/pp01.h
@@ -9,7 +9,6 @@
#ifndef PP01_H_
#define PP01_H_
-#include "emu.h"
#include "cpu/i8085/i8085.h"
#include "machine/ram.h"
#include "machine/i8251.h"
diff --git a/src/mame/includes/psikyo4.h b/src/mame/includes/psikyo4.h
index 4ebf652ca96..2913b9560da 100644
--- a/src/mame/includes/psikyo4.h
+++ b/src/mame/includes/psikyo4.h
@@ -8,7 +8,6 @@
#define MASTER_CLOCK 57272700 // main oscillator frequency
-#include "emu.h"
#include "cpu/sh2/sh2.h"
#include "sound/ymf278b.h"
#include "machine/eepromser.h"
diff --git a/src/mame/includes/px8.h b/src/mame/includes/px8.h
index 9eeef2c41f9..dbda1fbc660 100644
--- a/src/mame/includes/px8.h
+++ b/src/mame/includes/px8.h
@@ -6,7 +6,6 @@
#define __PX8__
-#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/m6800/m6800.h"
#include "imagedev/cassette.h"
diff --git a/src/mame/includes/rm380z.h b/src/mame/includes/rm380z.h
index 7448b710ad4..41532a64ec7 100644
--- a/src/mame/includes/rm380z.h
+++ b/src/mame/includes/rm380z.h
@@ -10,7 +10,6 @@ Research Machines RM 380Z
#ifndef RM380Z_H_
#define RM380Z_H_
-#include "emu.h"
#include "cpu/z80/z80.h"
#include "imagedev/cassette.h"
#include "machine/ram.h"
diff --git a/src/mame/includes/rmnimbus.h b/src/mame/includes/rmnimbus.h
index 79004424e7c..e5b4e479a49 100644
--- a/src/mame/includes/rmnimbus.h
+++ b/src/mame/includes/rmnimbus.h
@@ -7,7 +7,6 @@
Phill Harvey-Smith
2009-11-29.
*/
-#include "emu.h"
#include "cpu/i86/i186.h"
#include "machine/z80dart.h"
#include "machine/wd_fdc.h"
diff --git a/src/mame/includes/sage2.h b/src/mame/includes/sage2.h
index 6d3c2b25e8a..ee375c24748 100644
--- a/src/mame/includes/sage2.h
+++ b/src/mame/includes/sage2.h
@@ -1,7 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Curt Coder
-#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "bus/centronics/ctronics.h"
#include "machine/i8251.h"
diff --git a/src/mame/includes/sg1000.h b/src/mame/includes/sg1000.h
index efa24e6c683..169a298cf5d 100644
--- a/src/mame/includes/sg1000.h
+++ b/src/mame/includes/sg1000.h
@@ -3,7 +3,6 @@
#ifndef __SG1000__
#define __SG1000__
-#include "emu.h"
#include "cpu/z80/z80.h"
#include "formats/sf7000_dsk.h"
#include "imagedev/printer.h"
diff --git a/src/mame/includes/slapstic.h b/src/mame/includes/slapstic.h
index 58cae0cc752..f3fdbb9a48c 100644
--- a/src/mame/includes/slapstic.h
+++ b/src/mame/includes/slapstic.h
@@ -16,7 +16,6 @@
#ifndef __SLAPSTIC__
#define __SLAPSTIC__
-#include "emu.h"
#include "cpu/m6800/m6800.h"
#include "cpu/m68000/m68000.h"
diff --git a/src/mame/includes/softbox.h b/src/mame/includes/softbox.h
index 1ebd857424c..8bce05cfd80 100644
--- a/src/mame/includes/softbox.h
+++ b/src/mame/includes/softbox.h
@@ -5,7 +5,6 @@
#ifndef __SOFTBOX__
#define __SOFTBOX__
-#include "emu.h"
#include "bus/ieee488/ieee488.h"
#include "bus/imi7000/imi7000.h"
#include "cpu/z80/z80.h"
diff --git a/src/mame/includes/sorcerer.h b/src/mame/includes/sorcerer.h
index 825bc18802e..06d7c2c3bda 100644
--- a/src/mame/includes/sorcerer.h
+++ b/src/mame/includes/sorcerer.h
@@ -9,7 +9,6 @@
#ifndef SORCERER_H_
#define SORCERER_H_
-#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/wave.h"
#include "machine/ay31015.h"
diff --git a/src/mame/includes/special.h b/src/mame/includes/special.h
index ed0dcb3b3d2..0e40d43dcdf 100644
--- a/src/mame/includes/special.h
+++ b/src/mame/includes/special.h
@@ -9,7 +9,6 @@
#ifndef SPECIAL_H_
#define SPECIAL_H_
-#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/i8085/i8085.h"
#include "audio/special.h"
diff --git a/src/mame/includes/super6.h b/src/mame/includes/super6.h
index 64f09aef418..0ec8fc2729c 100644
--- a/src/mame/includes/super6.h
+++ b/src/mame/includes/super6.h
@@ -5,7 +5,6 @@
#ifndef __SUPER6__
#define __SUPER6__
-#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/z80/z80daisy.h"
#include "machine/com8116.h"
diff --git a/src/mame/includes/super80.h b/src/mame/includes/super80.h
index da9eead1427..797846c68f8 100644
--- a/src/mame/includes/super80.h
+++ b/src/mame/includes/super80.h
@@ -1,6 +1,5 @@
// license:BSD-3-Clause
// copyright-holders:Robbbert
-#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/z80/z80daisy.h"
#include "sound/wave.h"
diff --git a/src/mame/includes/swtpc09.h b/src/mame/includes/swtpc09.h
index f648223c73c..7e43cf2ea35 100644
--- a/src/mame/includes/swtpc09.h
+++ b/src/mame/includes/swtpc09.h
@@ -9,7 +9,6 @@
#ifndef swtpc09_H_
#define swtpc09_H_
-#include "emu.h"
#include "cpu/m6809/m6809.h"
#include "video/generic.h"
#include "machine/wd_fdc.h"
diff --git a/src/mame/includes/tandy2k.h b/src/mame/includes/tandy2k.h
index 07be28a202d..25f480eaa20 100644
--- a/src/mame/includes/tandy2k.h
+++ b/src/mame/includes/tandy2k.h
@@ -3,7 +3,6 @@
#ifndef __TANDY2K__
#define __TANDY2K__
-#include "emu.h"
#include "bus/centronics/ctronics.h"
#include "bus/rs232/rs232.h"
#include "cpu/i86/i186.h"
diff --git a/src/mame/includes/tdv2324.h b/src/mame/includes/tdv2324.h
index b1f5bdff5ab..3d360ee6b07 100644
--- a/src/mame/includes/tdv2324.h
+++ b/src/mame/includes/tdv2324.h
@@ -6,7 +6,6 @@
#define __TDV2324__
-#include "emu.h"
#include "cpu/i8085/i8085.h"
#include "cpu/m6800/m6800.h"
#include "imagedev/harddriv.h"
diff --git a/src/mame/includes/tek405x.h b/src/mame/includes/tek405x.h
index d248d9734d4..175d2f090c5 100644
--- a/src/mame/includes/tek405x.h
+++ b/src/mame/includes/tek405x.h
@@ -5,7 +5,6 @@
#ifndef __TEK405X__
#define __TEK405X__
-#include "emu.h"
#include "cpu/m6800/m6800.h"
#include "machine/ram.h"
#include "machine/6821pia.h"
diff --git a/src/mame/includes/thomson.h b/src/mame/includes/thomson.h
index a0c0745b7f9..72c95620e48 100644
--- a/src/mame/includes/thomson.h
+++ b/src/mame/includes/thomson.h
@@ -11,7 +11,6 @@
#ifndef _THOMSON_H_
#define _THOMSON_H_
-#include "emu.h"
#include "bus/rs232/rs232.h"
#include "cpu/m6809/m6809.h"
#include "machine/6821pia.h"
diff --git a/src/mame/includes/tiki100.h b/src/mame/includes/tiki100.h
index 0cd8c7b1ae5..3cd378c4140 100644
--- a/src/mame/includes/tiki100.h
+++ b/src/mame/includes/tiki100.h
@@ -5,7 +5,6 @@
#ifndef __TIKI100__
#define __TIKI100__
-#include "emu.h"
#include "bus/centronics/ctronics.h"
#include "bus/rs232/rs232.h"
#include "bus/tiki100/exp.h"
diff --git a/src/mame/includes/tmc1800.h b/src/mame/includes/tmc1800.h
index 89d9dce03f0..9ac6ab12f91 100644
--- a/src/mame/includes/tmc1800.h
+++ b/src/mame/includes/tmc1800.h
@@ -6,7 +6,6 @@
#define __TMC1800__
-#include "emu.h"
#include "cpu/cosmac/cosmac.h"
#include "imagedev/cassette.h"
#include "imagedev/snapquik.h"
diff --git a/src/mame/includes/tmc2000e.h b/src/mame/includes/tmc2000e.h
index c79c16b2380..890813d5e99 100644
--- a/src/mame/includes/tmc2000e.h
+++ b/src/mame/includes/tmc2000e.h
@@ -6,7 +6,6 @@
#define __TMC2000E__
-#include "emu.h"
#include "cpu/cosmac/cosmac.h"
#include "imagedev/cassette.h"
#include "machine/ram.h"
diff --git a/src/mame/includes/tmc600.h b/src/mame/includes/tmc600.h
index 8d36e3c8b38..3519f210718 100644
--- a/src/mame/includes/tmc600.h
+++ b/src/mame/includes/tmc600.h
@@ -6,7 +6,6 @@
#define __TMC600__
-#include "emu.h"
#include "cpu/cosmac/cosmac.h"
#include "imagedev/cassette.h"
#include "imagedev/snapquik.h"
diff --git a/src/mame/includes/tranz330.h b/src/mame/includes/tranz330.h
index 2bcd7f35d87..8555b5a2237 100644
--- a/src/mame/includes/tranz330.h
+++ b/src/mame/includes/tranz330.h
@@ -6,7 +6,6 @@
#define VERIFONE_TRANZ330_H
// single-driver build must have emu.h here
-#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/z80/z80daisy.h"
diff --git a/src/mame/includes/trs80.h b/src/mame/includes/trs80.h
index 2ebbe72230e..e3dd0d739a5 100644
--- a/src/mame/includes/trs80.h
+++ b/src/mame/includes/trs80.h
@@ -9,7 +9,6 @@
#ifndef TRS80_H_
#define TRS80_H_
-#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/speaker.h"
#include "sound/wave.h"
diff --git a/src/mame/includes/trs80m2.h b/src/mame/includes/trs80m2.h
index 55809a5f9ca..151b57b667c 100644
--- a/src/mame/includes/trs80m2.h
+++ b/src/mame/includes/trs80m2.h
@@ -6,7 +6,6 @@
#define __TRS80M2__
-#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/z80/z80daisy.h"
#include "cpu/mcs48/mcs48.h"
diff --git a/src/mame/includes/ut88.h b/src/mame/includes/ut88.h
index 112ab400fc0..e25128df05a 100644
--- a/src/mame/includes/ut88.h
+++ b/src/mame/includes/ut88.h
@@ -9,7 +9,6 @@
#ifndef UT88_H_
#define UT88_H_
-#include "emu.h"
#include "cpu/i8085/i8085.h"
#include "sound/dac.h"
#include "sound/wave.h"
diff --git a/src/mame/includes/v1050.h b/src/mame/includes/v1050.h
index 839a1afc80b..2c6ea33a5b1 100644
--- a/src/mame/includes/v1050.h
+++ b/src/mame/includes/v1050.h
@@ -5,7 +5,6 @@
#ifndef __V1050__
#define __V1050__
-#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/m6502/m6502.h"
#include "bus/centronics/ctronics.h"
diff --git a/src/mame/includes/vc4000.h b/src/mame/includes/vc4000.h
index e5d19193633..1c8605db3e0 100644
--- a/src/mame/includes/vc4000.h
+++ b/src/mame/includes/vc4000.h
@@ -10,7 +10,6 @@
#ifndef VC4000_H_
#define VC4000_H_
-#include "emu.h"
#include "audio/vc4000.h"
#include "cpu/s2650/s2650.h"
#include "imagedev/snapquik.h"
diff --git a/src/mame/includes/vcs80.h b/src/mame/includes/vcs80.h
index adb956251a2..c44d8014f2b 100644
--- a/src/mame/includes/vcs80.h
+++ b/src/mame/includes/vcs80.h
@@ -6,7 +6,6 @@
#define __VCS80__
-#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/z80/z80daisy.h"
#include "machine/z80pio.h"
diff --git a/src/mame/includes/vector06.h b/src/mame/includes/vector06.h
index 423f1f4b519..dc0b320ac92 100644
--- a/src/mame/includes/vector06.h
+++ b/src/mame/includes/vector06.h
@@ -9,7 +9,6 @@
#ifndef VECTOR06_H_
#define VECTOR06_H_
-#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/i8085/i8085.h"
#include "sound/speaker.h"
diff --git a/src/mame/includes/vidbrain.h b/src/mame/includes/vidbrain.h
index ba9b082bd7d..cc4aa98c00d 100644
--- a/src/mame/includes/vidbrain.h
+++ b/src/mame/includes/vidbrain.h
@@ -5,7 +5,6 @@
#ifndef __VIDBRAIN__
#define __VIDBRAIN__
-#include "emu.h"
#include "bus/vidbrain/exp.h"
#include "cpu/f8/f8.h"
#include "machine/f3853.h"
diff --git a/src/mame/includes/vip.h b/src/mame/includes/vip.h
index fe576620ee5..3e7ae9b67db 100644
--- a/src/mame/includes/vip.h
+++ b/src/mame/includes/vip.h
@@ -5,7 +5,6 @@
#ifndef __VIP__
#define __VIP__
-#include "emu.h"
#include "bus/vip/byteio.h"
#include "bus/vip/exp.h"
#include "cpu/cosmac/cosmac.h"
diff --git a/src/mame/includes/wpc_dot.h b/src/mame/includes/wpc_dot.h
index 54473262f12..92dd863d15c 100644
--- a/src/mame/includes/wpc_dot.h
+++ b/src/mame/includes/wpc_dot.h
@@ -10,7 +10,6 @@
#ifndef WPC_DOT_H_
#define WPC_DOT_H_
-#include "emu.h"
#include "cpu/m6809/m6809.h"
#include "audio/wpcsnd.h"
#include "audio/dcs.h"
diff --git a/src/mame/includes/wswan.h b/src/mame/includes/wswan.h
index 0b37017b21b..f3945a2f3fe 100644
--- a/src/mame/includes/wswan.h
+++ b/src/mame/includes/wswan.h
@@ -14,7 +14,6 @@
#define INTERNAL_EEPROM_SIZE 1024
-#include "emu.h"
#include "cpu/v30mz/v30mz.h"
#include "machine/nvram.h"
#include "audio/wswan.h"
diff --git a/src/mame/includes/x07.h b/src/mame/includes/x07.h
index f7a50e012f8..89d20d835d7 100644
--- a/src/mame/includes/x07.h
+++ b/src/mame/includes/x07.h
@@ -6,7 +6,6 @@
*********************************************************************/
-#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/beep.h"
#include "machine/nvram.h"
diff --git a/src/mame/includes/x1.h b/src/mame/includes/x1.h
index 528a9657fc2..3329e1b883f 100644
--- a/src/mame/includes/x1.h
+++ b/src/mame/includes/x1.h
@@ -9,7 +9,6 @@
#ifndef X1_H_
#define X1_H_
-#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/z80/z80daisy.h"
#include "machine/z80ctc.h"
diff --git a/src/mame/includes/xerox820.h b/src/mame/includes/xerox820.h
index 55f36d2d005..a34116816de 100644
--- a/src/mame/includes/xerox820.h
+++ b/src/mame/includes/xerox820.h
@@ -3,7 +3,6 @@
#ifndef __XEROX820__
#define __XEROX820__
-#include "emu.h"
#include "bus/scsi/sa1403d.h"
#include "bus/rs232/rs232.h"
#include "cpu/z80/z80.h"
diff --git a/src/mame/includes/xor100.h b/src/mame/includes/xor100.h
index 8229a479044..63423cbf5fb 100644
--- a/src/mame/includes/xor100.h
+++ b/src/mame/includes/xor100.h
@@ -5,7 +5,6 @@
#ifndef __XOR100__
#define __XOR100__
-#include "emu.h"
#include "bus/s100/s100.h"
#include "cpu/z80/z80.h"
#include "machine/ram.h"
diff --git a/src/mame/includes/z88.h b/src/mame/includes/z88.h
index c982b59181f..33333086f06 100644
--- a/src/mame/includes/z88.h
+++ b/src/mame/includes/z88.h
@@ -9,7 +9,6 @@
#ifndef Z88_H_
#define Z88_H_
-#include "emu.h"
#include "cpu/z80/z80.h"
#include "machine/upd65031.h"
#include "machine/ram.h"
diff --git a/src/mame/includes/zaccaria.h b/src/mame/includes/zaccaria.h
index aa15339b8eb..c61ceebc22e 100644
--- a/src/mame/includes/zaccaria.h
+++ b/src/mame/includes/zaccaria.h
@@ -1,6 +1,5 @@
// license:BSD-3-Clause
// copyright-holders:Nicola Salmoria
-#include "emu.h"
#include "audio/zaccaria.h"
class zaccaria_state : public driver_device
diff --git a/src/mame/includes/zerozone.h b/src/mame/includes/zerozone.h
index 8935e86e9c7..bdebef88411 100644
--- a/src/mame/includes/zerozone.h
+++ b/src/mame/includes/zerozone.h
@@ -6,7 +6,6 @@
*************************************************************************/
-#include "emu.h"
#include "machine/gen_latch.h"
#include "cpu/z80/z80.h"
diff --git a/src/mame/includes/zodiack.h b/src/mame/includes/zodiack.h
index 44552ba365a..33039a43200 100644
--- a/src/mame/includes/zodiack.h
+++ b/src/mame/includes/zodiack.h
@@ -1,7 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Zsolt Vasvari
-#include "emu.h"
#include "cpu/z80/z80.h"
#include "machine/gen_latch.h"
diff --git a/src/mame/includes/zx.h b/src/mame/includes/zx.h
index b695f82f9ab..4f88bf23f25 100644
--- a/src/mame/includes/zx.h
+++ b/src/mame/includes/zx.h
@@ -9,7 +9,6 @@
#ifndef ZX_H_
#define ZX_H_
-#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/speaker.h"
#include "sound/wave.h"