summaryrefslogtreecommitdiffstats
path: root/src/devices/cpu
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) (github)
tree6f1693d59aa53be8c76ffe3bcf7fbc72f8546453 /src/devices/cpu
parentc49b631153be9efc3a7e7b6172c17f5418843c0b (diff)
downloadmame-a2557f1b02478c5aaa1fdfa00204ac2e219319a1.tar.bz2
mame-a2557f1b02478c5aaa1fdfa00204ac2e219319a1.zip
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/devices/cpu')
-rw-r--r--src/devices/cpu/8x300/8x300.cpp1
-rw-r--r--src/devices/cpu/8x300/8x300.h1
-rw-r--r--src/devices/cpu/alto2/a2curt.cpp1
-rw-r--r--src/devices/cpu/alto2/a2dht.cpp1
-rw-r--r--src/devices/cpu/alto2/a2disk.cpp1
-rw-r--r--src/devices/cpu/alto2/a2disp.cpp1
-rw-r--r--src/devices/cpu/alto2/a2dvt.cpp1
-rw-r--r--src/devices/cpu/alto2/a2dwt.cpp1
-rw-r--r--src/devices/cpu/alto2/a2emu.cpp1
-rw-r--r--src/devices/cpu/alto2/a2ether.cpp1
-rw-r--r--src/devices/cpu/alto2/a2hw.cpp1
-rw-r--r--src/devices/cpu/alto2/a2kbd.cpp1
-rw-r--r--src/devices/cpu/alto2/a2ksec.cpp1
-rw-r--r--src/devices/cpu/alto2/a2kwd.cpp1
-rw-r--r--src/devices/cpu/alto2/a2mem.cpp1
-rw-r--r--src/devices/cpu/alto2/a2mouse.cpp1
-rw-r--r--src/devices/cpu/alto2/a2mrt.cpp1
-rw-r--r--src/devices/cpu/alto2/a2part.cpp1
-rw-r--r--src/devices/cpu/alto2/a2ram.cpp1
-rw-r--r--src/devices/cpu/alto2/a2roms.cpp1
-rw-r--r--src/devices/cpu/alto2/a2roms.h1
-rw-r--r--src/devices/cpu/alto2/alto2cpu.cpp1
-rw-r--r--src/devices/cpu/alto2/alto2cpu.h1
-rw-r--r--src/devices/cpu/alto2/alto2dsm.cpp1
-rw-r--r--src/devices/cpu/amis2000/amis2000.cpp1
-rw-r--r--src/devices/cpu/amis2000/amis2000.h1
-rw-r--r--src/devices/cpu/amis2000/amis2000op.cpp1
-rw-r--r--src/devices/cpu/arm7/lpc210x.cpp1
-rw-r--r--src/devices/cpu/arm7/lpc210x.h1
-rw-r--r--src/devices/cpu/dsp56k/dsp56dsm.cpp1
-rw-r--r--src/devices/cpu/dsp56k/dsp56k.cpp1
-rw-r--r--src/devices/cpu/dsp56k/dsp56k.h1
-rw-r--r--src/devices/cpu/dsp56k/dsp56mem.cpp1
-rw-r--r--src/devices/cpu/dsp56k/dsp56pcu.cpp1
-rw-r--r--src/devices/cpu/dsp56k/inst.cpp1
-rw-r--r--src/devices/cpu/dsp56k/opcode.cpp1
-rw-r--r--src/devices/cpu/dsp56k/opcode.h1
-rw-r--r--src/devices/cpu/dsp56k/pmove.cpp1
-rw-r--r--src/devices/cpu/dsp56k/pmove.h1
-rw-r--r--src/devices/cpu/dsp56k/tables.cpp1
-rw-r--r--src/devices/cpu/dsp56k/tables.h1
-rw-r--r--src/devices/cpu/e0c6200/e0c6200.cpp1
-rw-r--r--src/devices/cpu/e0c6200/e0c6200.h1
-rw-r--r--src/devices/cpu/e0c6200/e0c6200op.cpp1
-rw-r--r--src/devices/cpu/e0c6200/e0c6s46.cpp1
-rw-r--r--src/devices/cpu/es5510/es5510.h1
-rw-r--r--src/devices/cpu/esrip/esrip.h1
-rw-r--r--src/devices/cpu/h6280/h6280.cpp1
-rw-r--r--src/devices/cpu/h6280/h6280.h1
-rw-r--r--src/devices/cpu/hmcs40/hmcs40.cpp1
-rw-r--r--src/devices/cpu/hmcs40/hmcs40.h1
-rw-r--r--src/devices/cpu/hmcs40/hmcs40op.cpp1
-rw-r--r--src/devices/cpu/i8089/i8089.cpp1
-rw-r--r--src/devices/cpu/i8089/i8089.h1
-rw-r--r--src/devices/cpu/i8089/i8089_channel.h1
-rw-r--r--src/devices/cpu/i86/i186.cpp1
-rw-r--r--src/devices/cpu/i86/i186.h1
-rw-r--r--src/devices/cpu/i86/i286.cpp1
-rw-r--r--src/devices/cpu/i86/i86.h1
-rw-r--r--src/devices/cpu/melps4/m58846.cpp1
-rw-r--r--src/devices/cpu/melps4/melps4.cpp1
-rw-r--r--src/devices/cpu/melps4/melps4.h1
-rw-r--r--src/devices/cpu/melps4/melps4op.cpp1
-rw-r--r--src/devices/cpu/psx/dma.h1
-rw-r--r--src/devices/cpu/psx/gte.h1
-rw-r--r--src/devices/cpu/psx/irq.cpp1
-rw-r--r--src/devices/cpu/psx/irq.h1
-rw-r--r--src/devices/cpu/psx/mdec.h1
-rw-r--r--src/devices/cpu/psx/psx.h1
-rw-r--r--src/devices/cpu/psx/rcnt.cpp1
-rw-r--r--src/devices/cpu/psx/rcnt.h1
-rw-r--r--src/devices/cpu/psx/sio.cpp1
-rw-r--r--src/devices/cpu/psx/sio.h1
-rw-r--r--src/devices/cpu/rsp/rsp.h1
-rw-r--r--src/devices/cpu/sm510/kb1013vk1-2core.cpp1
-rw-r--r--src/devices/cpu/sm510/kb1013vk1-2op.cpp1
-rw-r--r--src/devices/cpu/sm510/sm500core.cpp1
-rw-r--r--src/devices/cpu/sm510/sm500op.cpp1
-rw-r--r--src/devices/cpu/sm510/sm510.cpp1
-rw-r--r--src/devices/cpu/sm510/sm510.h1
-rw-r--r--src/devices/cpu/sm510/sm510core.cpp1
-rw-r--r--src/devices/cpu/sm510/sm510op.cpp1
-rw-r--r--src/devices/cpu/sm510/sm511core.cpp1
-rw-r--r--src/devices/cpu/tms1000/tms0270.cpp1
-rw-r--r--src/devices/cpu/tms1000/tms0970.cpp1
-rw-r--r--src/devices/cpu/tms1000/tms0980.cpp1
-rw-r--r--src/devices/cpu/tms1000/tms1000.cpp1
-rw-r--r--src/devices/cpu/tms1000/tms1100.cpp1
-rw-r--r--src/devices/cpu/tms1000/tms1400.cpp1
-rw-r--r--src/devices/cpu/tms1000/tms1k_base.cpp1
-rw-r--r--src/devices/cpu/tms1000/tms1k_base.h1
-rw-r--r--src/devices/cpu/tms1000/tp0320.cpp1
-rw-r--r--src/devices/cpu/tms7000/tms7000.cpp1
-rw-r--r--src/devices/cpu/tms7000/tms7000.h1
-rw-r--r--src/devices/cpu/tms7000/tms7000op.cpp1
-rw-r--r--src/devices/cpu/tms9900/ti990_10.cpp1
-rw-r--r--src/devices/cpu/tms9900/ti990_10.h1
-rw-r--r--src/devices/cpu/tms9900/tms9900.cpp1
-rw-r--r--src/devices/cpu/tms9900/tms9900.h1
-rw-r--r--src/devices/cpu/tms9900/tms9980a.cpp1
-rw-r--r--src/devices/cpu/tms9900/tms9980a.h1
-rw-r--r--src/devices/cpu/tms9900/tms9995.cpp1
-rw-r--r--src/devices/cpu/tms9900/tms9995.h1
-rw-r--r--src/devices/cpu/ucom4/ucom4.cpp1
-rw-r--r--src/devices/cpu/ucom4/ucom4.h1
-rw-r--r--src/devices/cpu/ucom4/ucom4op.cpp1
-rw-r--r--src/devices/cpu/z80/kl5c80a12.cpp1
-rw-r--r--src/devices/cpu/z80/kl5c80a12.h1
-rw-r--r--src/devices/cpu/z80/tmpz84c011.cpp1
-rw-r--r--src/devices/cpu/z80/tmpz84c011.h1
-rw-r--r--src/devices/cpu/z80/tmpz84c015.cpp1
-rw-r--r--src/devices/cpu/z80/tmpz84c015.h1
112 files changed, 74 insertions, 38 deletions
diff --git a/src/devices/cpu/8x300/8x300.cpp b/src/devices/cpu/8x300/8x300.cpp
index c9ec6839e9e..8d17550efa0 100644
--- a/src/devices/cpu/8x300/8x300.cpp
+++ b/src/devices/cpu/8x300/8x300.cpp
@@ -9,6 +9,7 @@
* Written by Barry Rodewald
*/
+#include "emu.h"
#include "8x300.h"
#include "debugger.h"
diff --git a/src/devices/cpu/8x300/8x300.h b/src/devices/cpu/8x300/8x300.h
index 45d3f71cd91..d26afc55748 100644
--- a/src/devices/cpu/8x300/8x300.h
+++ b/src/devices/cpu/8x300/8x300.h
@@ -10,7 +10,6 @@
#ifndef _8X300_H_
#define _8X300_H_
-#include "emu.h"
// Register enumeration
enum
diff --git a/src/devices/cpu/alto2/a2curt.cpp b/src/devices/cpu/alto2/a2curt.cpp
index cf334a287cf..c371ecb1c33 100644
--- a/src/devices/cpu/alto2/a2curt.cpp
+++ b/src/devices/cpu/alto2/a2curt.cpp
@@ -5,6 +5,7 @@
* Xerox AltoII cursor task
*
*****************************************************************************/
+#include "emu.h"
#include "alto2cpu.h"
/**
diff --git a/src/devices/cpu/alto2/a2dht.cpp b/src/devices/cpu/alto2/a2dht.cpp
index 620a5491817..75144deb2c0 100644
--- a/src/devices/cpu/alto2/a2dht.cpp
+++ b/src/devices/cpu/alto2/a2dht.cpp
@@ -5,6 +5,7 @@
* Xerox AltoII display horizontal task
*
*****************************************************************************/
+#include "emu.h"
#include "alto2cpu.h"
/*
diff --git a/src/devices/cpu/alto2/a2disk.cpp b/src/devices/cpu/alto2/a2disk.cpp
index 8a8d8f0d1d3..b9d44dacc9f 100644
--- a/src/devices/cpu/alto2/a2disk.cpp
+++ b/src/devices/cpu/alto2/a2disk.cpp
@@ -5,6 +5,7 @@
* Xerox AltoII disk interface
*
*****************************************************************************/
+#include "emu.h"
#include "alto2cpu.h"
#define GET_KADDR_SECTOR(kaddr) X_RDBITS(kaddr,16, 0, 3) //!< get sector number from address register
diff --git a/src/devices/cpu/alto2/a2disp.cpp b/src/devices/cpu/alto2/a2disp.cpp
index 0102cd8a73f..ea850e6a82d 100644
--- a/src/devices/cpu/alto2/a2disp.cpp
+++ b/src/devices/cpu/alto2/a2disp.cpp
@@ -5,6 +5,7 @@
* Xerox AltoII display interface
*
*****************************************************************************/
+#include "emu.h"
#include "alto2cpu.h"
#include "a2roms.h"
diff --git a/src/devices/cpu/alto2/a2dvt.cpp b/src/devices/cpu/alto2/a2dvt.cpp
index 157774931f8..df4786f4164 100644
--- a/src/devices/cpu/alto2/a2dvt.cpp
+++ b/src/devices/cpu/alto2/a2dvt.cpp
@@ -5,6 +5,7 @@
* Xerox AltoII display vertical task
*
*****************************************************************************/
+#include "emu.h"
#include "alto2cpu.h"
/*
diff --git a/src/devices/cpu/alto2/a2dwt.cpp b/src/devices/cpu/alto2/a2dwt.cpp
index 752a1ab9660..6876dbc193d 100644
--- a/src/devices/cpu/alto2/a2dwt.cpp
+++ b/src/devices/cpu/alto2/a2dwt.cpp
@@ -5,6 +5,7 @@
* Xerox AltoII display word task
*
*****************************************************************************/
+#include "emu.h"
#include "alto2cpu.h"
/*
diff --git a/src/devices/cpu/alto2/a2emu.cpp b/src/devices/cpu/alto2/a2emu.cpp
index bd0fb8d16f6..c5a4caccb76 100644
--- a/src/devices/cpu/alto2/a2emu.cpp
+++ b/src/devices/cpu/alto2/a2emu.cpp
@@ -5,6 +5,7 @@
* Xerox AltoII emulator task
*
*****************************************************************************/
+#include "emu.h"
#include "alto2cpu.h"
/** @brief CTL2K_U3 address line for F2 function */
diff --git a/src/devices/cpu/alto2/a2ether.cpp b/src/devices/cpu/alto2/a2ether.cpp
index 97d2fe6399e..7af15ffbad0 100644
--- a/src/devices/cpu/alto2/a2ether.cpp
+++ b/src/devices/cpu/alto2/a2ether.cpp
@@ -5,6 +5,7 @@
* Xerox AltoII ethernet task
*
*****************************************************************************/
+#include "emu.h"
#include "alto2cpu.h"
#include "a2roms.h"
diff --git a/src/devices/cpu/alto2/a2hw.cpp b/src/devices/cpu/alto2/a2hw.cpp
index 43dc4709a38..c8faab079da 100644
--- a/src/devices/cpu/alto2/a2hw.cpp
+++ b/src/devices/cpu/alto2/a2hw.cpp
@@ -5,6 +5,7 @@
* Xerox AltoII memory mapped I/O hardware
*
*****************************************************************************/
+#include "emu.h"
#include "alto2cpu.h"
#include "a2roms.h"
diff --git a/src/devices/cpu/alto2/a2kbd.cpp b/src/devices/cpu/alto2/a2kbd.cpp
index bb7105686fe..1939a852340 100644
--- a/src/devices/cpu/alto2/a2kbd.cpp
+++ b/src/devices/cpu/alto2/a2kbd.cpp
@@ -5,6 +5,7 @@
* Xerox AltoII memory mapped I/O keyboard
*
*****************************************************************************/
+#include "emu.h"
#include "alto2cpu.h"
/**
diff --git a/src/devices/cpu/alto2/a2ksec.cpp b/src/devices/cpu/alto2/a2ksec.cpp
index 6ba05395877..220a7591bb6 100644
--- a/src/devices/cpu/alto2/a2ksec.cpp
+++ b/src/devices/cpu/alto2/a2ksec.cpp
@@ -5,6 +5,7 @@
* Xerox AltoII disk sector task
*
*****************************************************************************/
+#include "emu.h"
#include "alto2cpu.h"
//! f1_ksec_block early: block the disk sector task
diff --git a/src/devices/cpu/alto2/a2kwd.cpp b/src/devices/cpu/alto2/a2kwd.cpp
index e312debecf9..d235642e7c3 100644
--- a/src/devices/cpu/alto2/a2kwd.cpp
+++ b/src/devices/cpu/alto2/a2kwd.cpp
@@ -5,6 +5,7 @@
* Xerox AltoII disk word task
*
*****************************************************************************/
+#include "emu.h"
#include "alto2cpu.h"
//! f1_kwd_block early: block the disk word task
diff --git a/src/devices/cpu/alto2/a2mem.cpp b/src/devices/cpu/alto2/a2mem.cpp
index 932acc1f729..216b9429be7 100644
--- a/src/devices/cpu/alto2/a2mem.cpp
+++ b/src/devices/cpu/alto2/a2mem.cpp
@@ -5,6 +5,7 @@
* Xerox AltoII memory interface
*
*****************************************************************************/
+#include "emu.h"
#include "alto2cpu.h"
#define PUT_EVEN(dword,word) X_WRBITS(dword,32, 0,15,word)
diff --git a/src/devices/cpu/alto2/a2mouse.cpp b/src/devices/cpu/alto2/a2mouse.cpp
index 7f18e7b7280..4ee209e6c1d 100644
--- a/src/devices/cpu/alto2/a2mouse.cpp
+++ b/src/devices/cpu/alto2/a2mouse.cpp
@@ -5,6 +5,7 @@
* Xerox AltoII mouse interface
*
*****************************************************************************/
+#include "emu.h"
#include "alto2cpu.h"
#include "a2roms.h"
diff --git a/src/devices/cpu/alto2/a2mrt.cpp b/src/devices/cpu/alto2/a2mrt.cpp
index c072a23129c..758688571c6 100644
--- a/src/devices/cpu/alto2/a2mrt.cpp
+++ b/src/devices/cpu/alto2/a2mrt.cpp
@@ -5,6 +5,7 @@
* Xerox AltoII memory refresh task
*
*****************************************************************************/
+#include "emu.h"
#include "alto2cpu.h"
//! f1_mrt_block early: block the display word task
diff --git a/src/devices/cpu/alto2/a2part.cpp b/src/devices/cpu/alto2/a2part.cpp
index 7e28c2d1da7..f5feb4d8947 100644
--- a/src/devices/cpu/alto2/a2part.cpp
+++ b/src/devices/cpu/alto2/a2part.cpp
@@ -5,6 +5,7 @@
* Xerox AltoII parity task
*
*****************************************************************************/
+#include "emu.h"
#include "alto2cpu.h"
//! called by the CPU when the parity task becomes active
diff --git a/src/devices/cpu/alto2/a2ram.cpp b/src/devices/cpu/alto2/a2ram.cpp
index 83930364c8b..39996f98fa7 100644
--- a/src/devices/cpu/alto2/a2ram.cpp
+++ b/src/devices/cpu/alto2/a2ram.cpp
@@ -5,6 +5,7 @@
* Xerox AltoII RAM related functions
*
*****************************************************************************/
+#include "emu.h"
#include "alto2cpu.h"
#define DEBUG_WRTRAM 0 //!< define to 1 to print CRAM writes
diff --git a/src/devices/cpu/alto2/a2roms.cpp b/src/devices/cpu/alto2/a2roms.cpp
index ec262d1be27..7eab1e34212 100644
--- a/src/devices/cpu/alto2/a2roms.cpp
+++ b/src/devices/cpu/alto2/a2roms.cpp
@@ -5,6 +5,7 @@
* Xerox AltoII PROM loading and decoding
*
*****************************************************************************/
+#include "emu.h"
#include "alto2cpu.h"
#include "a2roms.h"
diff --git a/src/devices/cpu/alto2/a2roms.h b/src/devices/cpu/alto2/a2roms.h
index e320239fc86..1d1cc149660 100644
--- a/src/devices/cpu/alto2/a2roms.h
+++ b/src/devices/cpu/alto2/a2roms.h
@@ -8,7 +8,6 @@
#ifndef _CPU_A2ROMS_H_
#define _CPU_A2ROMS_H_
-#include "emu.h"
/**
* @brief structure to define a ROM's or PROM's loading options
diff --git a/src/devices/cpu/alto2/alto2cpu.cpp b/src/devices/cpu/alto2/alto2cpu.cpp
index f2f566b1dfe..ad88171abd2 100644
--- a/src/devices/cpu/alto2/alto2cpu.cpp
+++ b/src/devices/cpu/alto2/alto2cpu.cpp
@@ -5,6 +5,7 @@
* Xerox AltoII CPU core
*
*****************************************************************************/
+#include "emu.h"
#include "alto2cpu.h"
#include "a2roms.h"
diff --git a/src/devices/cpu/alto2/alto2cpu.h b/src/devices/cpu/alto2/alto2cpu.h
index eb275154216..56133711001 100644
--- a/src/devices/cpu/alto2/alto2cpu.h
+++ b/src/devices/cpu/alto2/alto2cpu.h
@@ -10,7 +10,6 @@
#define ALTO2_TAG "alto2"
-#include "emu.h"
#include "debugger.h"
#include "sound/speaker.h"
#include "machine/diablo_hd.h"
diff --git a/src/devices/cpu/alto2/alto2dsm.cpp b/src/devices/cpu/alto2/alto2dsm.cpp
index 65c5d0b4acd..b70c35d182c 100644
--- a/src/devices/cpu/alto2/alto2dsm.cpp
+++ b/src/devices/cpu/alto2/alto2dsm.cpp
@@ -4,6 +4,7 @@
* Xerox AltoII disassembler
*
**********************************************************/
+#include "emu.h"
#include "alto2cpu.h"
#define loc_DASTART 0000420 // display list header
diff --git a/src/devices/cpu/amis2000/amis2000.cpp b/src/devices/cpu/amis2000/amis2000.cpp
index c79c858780c..0dde5fed2ee 100644
--- a/src/devices/cpu/amis2000/amis2000.cpp
+++ b/src/devices/cpu/amis2000/amis2000.cpp
@@ -18,6 +18,7 @@
*/
+#include "emu.h"
#include "amis2000.h"
#include "debugger.h"
diff --git a/src/devices/cpu/amis2000/amis2000.h b/src/devices/cpu/amis2000/amis2000.h
index f72e5a5322d..d411a1b5f60 100644
--- a/src/devices/cpu/amis2000/amis2000.h
+++ b/src/devices/cpu/amis2000/amis2000.h
@@ -9,7 +9,6 @@
#ifndef _AMIS2000_H_
#define _AMIS2000_H_
-#include "emu.h"
// generic input pins (4 bits each)
diff --git a/src/devices/cpu/amis2000/amis2000op.cpp b/src/devices/cpu/amis2000/amis2000op.cpp
index 685be166c3e..e67ee6d153b 100644
--- a/src/devices/cpu/amis2000/amis2000op.cpp
+++ b/src/devices/cpu/amis2000/amis2000op.cpp
@@ -3,6 +3,7 @@
// AMI S2000 opcode handlers
+#include "emu.h"
#include "amis2000.h"
diff --git a/src/devices/cpu/arm7/lpc210x.cpp b/src/devices/cpu/arm7/lpc210x.cpp
index 28205774f30..57b917ab235 100644
--- a/src/devices/cpu/arm7/lpc210x.cpp
+++ b/src/devices/cpu/arm7/lpc210x.cpp
@@ -12,6 +12,7 @@
***************************************************************************/
+#include "emu.h"
#include "lpc210x.h"
const device_type LPC2103 = &device_creator<lpc210x_device>;
diff --git a/src/devices/cpu/arm7/lpc210x.h b/src/devices/cpu/arm7/lpc210x.h
index 53f4e28a798..581560a3a62 100644
--- a/src/devices/cpu/arm7/lpc210x.h
+++ b/src/devices/cpu/arm7/lpc210x.h
@@ -6,7 +6,6 @@
#ifndef __LPC2103__
#define __LPC2103__
-#include "emu.h"
#include "arm7.h"
#include "arm7core.h"
diff --git a/src/devices/cpu/dsp56k/dsp56dsm.cpp b/src/devices/cpu/dsp56k/dsp56dsm.cpp
index 133cfc40509..5ca4aab30a0 100644
--- a/src/devices/cpu/dsp56k/dsp56dsm.cpp
+++ b/src/devices/cpu/dsp56k/dsp56dsm.cpp
@@ -8,6 +8,7 @@
***************************************************************************/
+#include "emu.h"
#include "opcode.h"
#include "emu.h"
diff --git a/src/devices/cpu/dsp56k/dsp56k.cpp b/src/devices/cpu/dsp56k/dsp56k.cpp
index a4ace1425a8..47d090c6ec0 100644
--- a/src/devices/cpu/dsp56k/dsp56k.cpp
+++ b/src/devices/cpu/dsp56k/dsp56k.cpp
@@ -31,6 +31,7 @@
- 1-21 Vectored exception requests on the Host Interface!
***************************************************************************/
+#include "emu.h"
#include "opcode.h"
#include "emu.h"
diff --git a/src/devices/cpu/dsp56k/dsp56k.h b/src/devices/cpu/dsp56k/dsp56k.h
index 443dd811508..6053aa0557a 100644
--- a/src/devices/cpu/dsp56k/dsp56k.h
+++ b/src/devices/cpu/dsp56k/dsp56k.h
@@ -14,7 +14,6 @@
#ifndef __DSP56K_H__
#define __DSP56K_H__
-#include "emu.h"
// IRQ Lines
diff --git a/src/devices/cpu/dsp56k/dsp56mem.cpp b/src/devices/cpu/dsp56k/dsp56mem.cpp
index ad8cfd6320e..31ed7503acb 100644
--- a/src/devices/cpu/dsp56k/dsp56mem.cpp
+++ b/src/devices/cpu/dsp56k/dsp56mem.cpp
@@ -3,6 +3,7 @@
// This file contains functions which handle the On-Chip peripheral Memory Map
// as well as the Host Interface and the SSI0/SSI1 Serial Interfaces.
+#include "emu.h"
#include "dsp56mem.h"
#include "dsp56pcu.h"
diff --git a/src/devices/cpu/dsp56k/dsp56pcu.cpp b/src/devices/cpu/dsp56k/dsp56pcu.cpp
index 2c7da64c1ed..245d83e7d87 100644
--- a/src/devices/cpu/dsp56k/dsp56pcu.cpp
+++ b/src/devices/cpu/dsp56k/dsp56pcu.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Andrew Gardner
+#include "emu.h"
#include "dsp56pcu.h"
#include "dsp56mem.h"
diff --git a/src/devices/cpu/dsp56k/inst.cpp b/src/devices/cpu/dsp56k/inst.cpp
index c07320fc5b3..d7c99777338 100644
--- a/src/devices/cpu/dsp56k/inst.cpp
+++ b/src/devices/cpu/dsp56k/inst.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Andrew Gardner
+#include "emu.h"
#include "inst.h"
#include "emu.h"
diff --git a/src/devices/cpu/dsp56k/opcode.cpp b/src/devices/cpu/dsp56k/opcode.cpp
index cdffaba030c..efd1ce6156e 100644
--- a/src/devices/cpu/dsp56k/opcode.cpp
+++ b/src/devices/cpu/dsp56k/opcode.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Andrew Gardner
+#include "emu.h"
#include <stdio.h>
#include "opcode.h"
diff --git a/src/devices/cpu/dsp56k/opcode.h b/src/devices/cpu/dsp56k/opcode.h
index 2fbc1a69d39..704602d17f3 100644
--- a/src/devices/cpu/dsp56k/opcode.h
+++ b/src/devices/cpu/dsp56k/opcode.h
@@ -3,7 +3,6 @@
#ifndef __DSP56K_OPCODE_H__
#define __DSP56K_OPCODE_H__
-#include "emu.h"
#include "inst.h"
#include "pmove.h"
diff --git a/src/devices/cpu/dsp56k/pmove.cpp b/src/devices/cpu/dsp56k/pmove.cpp
index b57a8850154..15a13eb9ecf 100644
--- a/src/devices/cpu/dsp56k/pmove.cpp
+++ b/src/devices/cpu/dsp56k/pmove.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Andrew Gardner
+#include "emu.h"
#include "pmove.h"
namespace DSP56K
diff --git a/src/devices/cpu/dsp56k/pmove.h b/src/devices/cpu/dsp56k/pmove.h
index 8e4ecaa5fde..86d0932cf2f 100644
--- a/src/devices/cpu/dsp56k/pmove.h
+++ b/src/devices/cpu/dsp56k/pmove.h
@@ -3,7 +3,6 @@
#ifndef __DSP56K_PARALLEL_MOVE_H__
#define __DSP56K_PARALLEL_MOVE_H__
-#include "emu.h"
#include "opcode.h"
#include "tables.h"
diff --git a/src/devices/cpu/dsp56k/tables.cpp b/src/devices/cpu/dsp56k/tables.cpp
index 72a46bfa0ee..fac697f8fa8 100644
--- a/src/devices/cpu/dsp56k/tables.cpp
+++ b/src/devices/cpu/dsp56k/tables.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Andrew Gardner
+#include "emu.h"
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
diff --git a/src/devices/cpu/dsp56k/tables.h b/src/devices/cpu/dsp56k/tables.h
index 2b590dc9027..05c11db908b 100644
--- a/src/devices/cpu/dsp56k/tables.h
+++ b/src/devices/cpu/dsp56k/tables.h
@@ -6,7 +6,6 @@
#include <stdio.h>
#include <stdlib.h>
-#include "emu.h"
#include "dsp56k.h"
namespace DSP56K
diff --git a/src/devices/cpu/e0c6200/e0c6200.cpp b/src/devices/cpu/e0c6200/e0c6200.cpp
index e78351b19aa..ace906943a0 100644
--- a/src/devices/cpu/e0c6200/e0c6200.cpp
+++ b/src/devices/cpu/e0c6200/e0c6200.cpp
@@ -18,6 +18,7 @@
*/
+#include "emu.h"
#include "e0c6200.h"
#include "debugger.h"
diff --git a/src/devices/cpu/e0c6200/e0c6200.h b/src/devices/cpu/e0c6200/e0c6200.h
index 4a38ae8fbf8..5f250d4f444 100644
--- a/src/devices/cpu/e0c6200/e0c6200.h
+++ b/src/devices/cpu/e0c6200/e0c6200.h
@@ -9,7 +9,6 @@
#ifndef _E0C6200_H_
#define _E0C6200_H_
-#include "emu.h"
class e0c6200_cpu_device : public cpu_device
diff --git a/src/devices/cpu/e0c6200/e0c6200op.cpp b/src/devices/cpu/e0c6200/e0c6200op.cpp
index 94295e43889..93ab8011f7d 100644
--- a/src/devices/cpu/e0c6200/e0c6200op.cpp
+++ b/src/devices/cpu/e0c6200/e0c6200op.cpp
@@ -3,6 +3,7 @@
// E0C6200 opcode handlers
+#include "emu.h"
#include "e0c6200.h"
diff --git a/src/devices/cpu/e0c6200/e0c6s46.cpp b/src/devices/cpu/e0c6200/e0c6s46.cpp
index 49a754adf33..bc82ebd5c25 100644
--- a/src/devices/cpu/e0c6200/e0c6s46.cpp
+++ b/src/devices/cpu/e0c6200/e0c6s46.cpp
@@ -15,6 +15,7 @@
*/
+#include "emu.h"
#include "e0c6s46.h"
enum
diff --git a/src/devices/cpu/es5510/es5510.h b/src/devices/cpu/es5510/es5510.h
index 4d85cb87e5c..89da725c28e 100644
--- a/src/devices/cpu/es5510/es5510.h
+++ b/src/devices/cpu/es5510/es5510.h
@@ -12,7 +12,6 @@
#ifndef __ES5510_H__
#define __ES5510_H__
-#include "emu.h"
class es5510_device : public cpu_device {
public:
diff --git a/src/devices/cpu/esrip/esrip.h b/src/devices/cpu/esrip/esrip.h
index 42f397ca5b4..7af07d8f7c4 100644
--- a/src/devices/cpu/esrip/esrip.h
+++ b/src/devices/cpu/esrip/esrip.h
@@ -11,7 +11,6 @@
#ifndef _ESRIP_H
#define _ESRIP_H
-#include "emu.h"
/***************************************************************************
COMPILE-TIME DEFINITIONS
diff --git a/src/devices/cpu/h6280/h6280.cpp b/src/devices/cpu/h6280/h6280.cpp
index a3fae0075f5..8a4c7aa7bca 100644
--- a/src/devices/cpu/h6280/h6280.cpp
+++ b/src/devices/cpu/h6280/h6280.cpp
@@ -110,6 +110,7 @@
******************************************************************************/
+#include "emu.h"
#include "h6280.h"
#include "debugger.h"
diff --git a/src/devices/cpu/h6280/h6280.h b/src/devices/cpu/h6280/h6280.h
index 66b7386b399..7e4bf9cf9e8 100644
--- a/src/devices/cpu/h6280/h6280.h
+++ b/src/devices/cpu/h6280/h6280.h
@@ -17,7 +17,6 @@
#ifndef __H6280_H__
#define __H6280_H__
-#include "emu.h"
#define LAZY_FLAGS 0
diff --git a/src/devices/cpu/hmcs40/hmcs40.cpp b/src/devices/cpu/hmcs40/hmcs40.cpp
index fcc61b40fe7..0023956f8d4 100644
--- a/src/devices/cpu/hmcs40/hmcs40.cpp
+++ b/src/devices/cpu/hmcs40/hmcs40.cpp
@@ -14,6 +14,7 @@
#define IS_PMOS 0
#define IS_CMOS ~0
+#include "emu.h"
#include "hmcs40.h"
#include "debugger.h"
diff --git a/src/devices/cpu/hmcs40/hmcs40.h b/src/devices/cpu/hmcs40/hmcs40.h
index 1eaed0bab37..9bd2e3f82a5 100644
--- a/src/devices/cpu/hmcs40/hmcs40.h
+++ b/src/devices/cpu/hmcs40/hmcs40.h
@@ -9,7 +9,6 @@
#ifndef _HMCS40_H_
#define _HMCS40_H_
-#include "emu.h"
// I/O ports setup
diff --git a/src/devices/cpu/hmcs40/hmcs40op.cpp b/src/devices/cpu/hmcs40/hmcs40op.cpp
index da89ff44fe7..e554ec8ac45 100644
--- a/src/devices/cpu/hmcs40/hmcs40op.cpp
+++ b/src/devices/cpu/hmcs40/hmcs40op.cpp
@@ -3,6 +3,7 @@
// HMCS40 opcode handlers
+#include "emu.h"
#include "hmcs40.h"
diff --git a/src/devices/cpu/i8089/i8089.cpp b/src/devices/cpu/i8089/i8089.cpp
index 234e2e33503..a18d62b7f4a 100644
--- a/src/devices/cpu/i8089/i8089.cpp
+++ b/src/devices/cpu/i8089/i8089.cpp
@@ -6,6 +6,7 @@
***************************************************************************/
+#include "emu.h"
#include "i8089.h"
#include "i8089_channel.h"
diff --git a/src/devices/cpu/i8089/i8089.h b/src/devices/cpu/i8089/i8089.h
index 81c84089300..5f69c0b42e7 100644
--- a/src/devices/cpu/i8089/i8089.h
+++ b/src/devices/cpu/i8089/i8089.h
@@ -11,7 +11,6 @@
#ifndef __I8089_H__
#define __I8089_H__
-#include "emu.h"
#include "i8089_channel.h"
diff --git a/src/devices/cpu/i8089/i8089_channel.h b/src/devices/cpu/i8089/i8089_channel.h
index e95975c28c3..914ed70bfbe 100644
--- a/src/devices/cpu/i8089/i8089_channel.h
+++ b/src/devices/cpu/i8089/i8089_channel.h
@@ -13,7 +13,6 @@
#ifndef __I8089_CHANNEL_H__
#define __I8089_CHANNEL_H__
-#include "emu.h"
#include "i8089.h"
diff --git a/src/devices/cpu/i86/i186.cpp b/src/devices/cpu/i86/i186.cpp
index cd280c3b3e0..da0359e649b 100644
--- a/src/devices/cpu/i86/i186.cpp
+++ b/src/devices/cpu/i86/i186.cpp
@@ -3,6 +3,7 @@
// Peripheral code from rmnimbus driver by Phill Harvey-Smith which is
// based on the Leland sound driver by Aaron Giles and Paul Leaman
+#include "emu.h"
#include "i186.h"
#include "debugger.h"
#include "i86inline.h"
diff --git a/src/devices/cpu/i86/i186.h b/src/devices/cpu/i86/i186.h
index bfc4f14cb07..58ff24d3ac2 100644
--- a/src/devices/cpu/i86/i186.h
+++ b/src/devices/cpu/i86/i186.h
@@ -3,7 +3,6 @@
#ifndef I186_H__
#define I186_H__
-#include "emu.h"
#include "i86.h"
extern const device_type I80186;
diff --git a/src/devices/cpu/i86/i286.cpp b/src/devices/cpu/i86/i286.cpp
index c399c302fe9..f28438853ea 100644
--- a/src/devices/cpu/i86/i286.cpp
+++ b/src/devices/cpu/i86/i286.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Carl
+#include "emu.h"
#include "i286.h"
#include "debugger.h"
#include "i86inline.h"
diff --git a/src/devices/cpu/i86/i86.h b/src/devices/cpu/i86/i86.h
index ecdf97ae2b2..70c4f3bcad9 100644
--- a/src/devices/cpu/i86/i86.h
+++ b/src/devices/cpu/i86/i86.h
@@ -3,7 +3,6 @@
#ifndef __I8086_H__
#define __I8086_H__
-#include "emu.h"
/////////////////////////////////////////////////////////////////
diff --git a/src/devices/cpu/melps4/m58846.cpp b/src/devices/cpu/melps4/m58846.cpp
index 261876c3eef..b581f689300 100644
--- a/src/devices/cpu/melps4/m58846.cpp
+++ b/src/devices/cpu/melps4/m58846.cpp
@@ -6,6 +6,7 @@
*/
+#include "emu.h"
#include "m58846.h"
diff --git a/src/devices/cpu/melps4/melps4.cpp b/src/devices/cpu/melps4/melps4.cpp
index d1cd36cda32..896966c5882 100644
--- a/src/devices/cpu/melps4/melps4.cpp
+++ b/src/devices/cpu/melps4/melps4.cpp
@@ -37,6 +37,7 @@
*/
+#include "emu.h"
#include "melps4.h"
#include "debugger.h"
diff --git a/src/devices/cpu/melps4/melps4.h b/src/devices/cpu/melps4/melps4.h
index 3605cd441f2..ba641efcd7f 100644
--- a/src/devices/cpu/melps4/melps4.h
+++ b/src/devices/cpu/melps4/melps4.h
@@ -9,7 +9,6 @@
#ifndef _MELPS4_H_
#define _MELPS4_H_
-#include "emu.h"
// I/O ports setup
diff --git a/src/devices/cpu/melps4/melps4op.cpp b/src/devices/cpu/melps4/melps4op.cpp
index 44d17ae2d4c..755d5a10ef1 100644
--- a/src/devices/cpu/melps4/melps4op.cpp
+++ b/src/devices/cpu/melps4/melps4op.cpp
@@ -3,6 +3,7 @@
// MELPS 4 opcode handlers
+#include "emu.h"
#include "melps4.h"
diff --git a/src/devices/cpu/psx/dma.h b/src/devices/cpu/psx/dma.h
index 6a39a29ca5e..eeb68ac0161 100644
--- a/src/devices/cpu/psx/dma.h
+++ b/src/devices/cpu/psx/dma.h
@@ -12,7 +12,6 @@
#ifndef __PSXDMA_H__
#define __PSXDMA_H__
-#include "emu.h"
extern const device_type PSX_DMA;
diff --git a/src/devices/cpu/psx/gte.h b/src/devices/cpu/psx/gte.h
index d6da63e1f5e..a577c317718 100644
--- a/src/devices/cpu/psx/gte.h
+++ b/src/devices/cpu/psx/gte.h
@@ -12,7 +12,6 @@
#ifndef __PSXGTE_H__
#define __PSXGTE_H__
-#include "emu.h"
#define GTE_SF( op ) ( ( op >> 19 ) & 1 )
#define GTE_MX( op ) ( ( op >> 17 ) & 3 )
diff --git a/src/devices/cpu/psx/irq.cpp b/src/devices/cpu/psx/irq.cpp
index 50ed189abc5..06f1d345ac3 100644
--- a/src/devices/cpu/psx/irq.cpp
+++ b/src/devices/cpu/psx/irq.cpp
@@ -7,6 +7,7 @@
*
*/
+#include "emu.h"
#include "psx.h"
#include "irq.h"
diff --git a/src/devices/cpu/psx/irq.h b/src/devices/cpu/psx/irq.h
index 7cc83e8cfb3..d90b0b1365c 100644
--- a/src/devices/cpu/psx/irq.h
+++ b/src/devices/cpu/psx/irq.h
@@ -12,7 +12,6 @@
#ifndef __PSXIRQ_H__
#define __PSXIRQ_H__
-#include "emu.h"
extern const device_type PSX_IRQ;
diff --git a/src/devices/cpu/psx/mdec.h b/src/devices/cpu/psx/mdec.h
index 7b237a51145..7dc2c20fb5d 100644
--- a/src/devices/cpu/psx/mdec.h
+++ b/src/devices/cpu/psx/mdec.h
@@ -12,7 +12,6 @@
#ifndef __PSXMDEC_H__
#define __PSXMDEC_H__
-#include "emu.h"
extern const device_type PSX_MDEC;
diff --git a/src/devices/cpu/psx/psx.h b/src/devices/cpu/psx/psx.h
index 2c2d8cdd17b..fd210ae3220 100644
--- a/src/devices/cpu/psx/psx.h
+++ b/src/devices/cpu/psx/psx.h
@@ -12,7 +12,6 @@
#ifndef __PSXCPU_H__
#define __PSXCPU_H__
-#include "emu.h"
#include "machine/ram.h"
#include "dma.h"
#include "gte.h"
diff --git a/src/devices/cpu/psx/rcnt.cpp b/src/devices/cpu/psx/rcnt.cpp
index c54af348ade..aeaf90488f9 100644
--- a/src/devices/cpu/psx/rcnt.cpp
+++ b/src/devices/cpu/psx/rcnt.cpp
@@ -7,6 +7,7 @@
*
*/
+#include "emu.h"
#include "rcnt.h"
#define VERBOSE_LEVEL ( 0 )
diff --git a/src/devices/cpu/psx/rcnt.h b/src/devices/cpu/psx/rcnt.h
index 69af108c44d..d56b3a6531a 100644
--- a/src/devices/cpu/psx/rcnt.h
+++ b/src/devices/cpu/psx/rcnt.h
@@ -12,7 +12,6 @@
#ifndef __PSXRCNT_H__
#define __PSXRCNT_H__
-#include "emu.h"
extern const device_type PSX_RCNT;
diff --git a/src/devices/cpu/psx/sio.cpp b/src/devices/cpu/psx/sio.cpp
index e3fe2924ea5..270e44f2c2a 100644
--- a/src/devices/cpu/psx/sio.cpp
+++ b/src/devices/cpu/psx/sio.cpp
@@ -7,6 +7,7 @@
*
*/
+#include "emu.h"
#include "sio.h"
#define VERBOSE_LEVEL ( 0 )
diff --git a/src/devices/cpu/psx/sio.h b/src/devices/cpu/psx/sio.h
index d8516b799e2..4f2df7f912b 100644
--- a/src/devices/cpu/psx/sio.h
+++ b/src/devices/cpu/psx/sio.h
@@ -12,7 +12,6 @@
#ifndef __PSXSIO_H__
#define __PSXSIO_H__
-#include "emu.h"
extern const device_type PSX_SIO0;
extern const device_type PSX_SIO1;
diff --git a/src/devices/cpu/rsp/rsp.h b/src/devices/cpu/rsp/rsp.h
index cee8dfa2dde..578fd89b482 100644
--- a/src/devices/cpu/rsp/rsp.h
+++ b/src/devices/cpu/rsp/rsp.h
@@ -14,7 +14,6 @@
#ifndef __RSP_H__
#define __RSP_H__
-#include "emu.h"
#include "cpu/drcfe.h"
#include "cpu/drcuml.h"
diff --git a/src/devices/cpu/sm510/kb1013vk1-2core.cpp b/src/devices/cpu/sm510/kb1013vk1-2core.cpp
index a6848bb7696..85fd4b74a81 100644
--- a/src/devices/cpu/sm510/kb1013vk1-2core.cpp
+++ b/src/devices/cpu/sm510/kb1013vk1-2core.cpp
@@ -6,6 +6,7 @@
*/
+#include "emu.h"
#include "kb1013vk1-2.h"
#include "debugger.h"
diff --git a/src/devices/cpu/sm510/kb1013vk1-2op.cpp b/src/devices/cpu/sm510/kb1013vk1-2op.cpp
index 3c5fcc548e7..377739190be 100644
--- a/src/devices/cpu/sm510/kb1013vk1-2op.cpp
+++ b/src/devices/cpu/sm510/kb1013vk1-2op.cpp
@@ -3,6 +3,7 @@
// KB1013VK1-2 opcode handlers
+#include "emu.h"
#include "kb1013vk1-2.h"
diff --git a/src/devices/cpu/sm510/sm500core.cpp b/src/devices/cpu/sm510/sm500core.cpp
index 370a4c14ebd..5e6041831a2 100644
--- a/src/devices/cpu/sm510/sm500core.cpp
+++ b/src/devices/cpu/sm510/sm500core.cpp
@@ -6,6 +6,7 @@
*/
+#include "emu.h"
#include "sm500.h"
#include "debugger.h"
diff --git a/src/devices/cpu/sm510/sm500op.cpp b/src/devices/cpu/sm510/sm500op.cpp
index ee4571b4e76..2fd8089e39d 100644
--- a/src/devices/cpu/sm510/sm500op.cpp
+++ b/src/devices/cpu/sm510/sm500op.cpp
@@ -3,6 +3,7 @@
// SM500 opcode handlers
+#include "emu.h"
#include "sm500.h"
diff --git a/src/devices/cpu/sm510/sm510.cpp b/src/devices/cpu/sm510/sm510.cpp
index 6fcd0fe21b5..ab1b4cb0ebb 100644
--- a/src/devices/cpu/sm510/sm510.cpp
+++ b/src/devices/cpu/sm510/sm510.cpp
@@ -34,6 +34,7 @@
*/
+#include "emu.h"
#include "sm510.h"
#include "debugger.h"
diff --git a/src/devices/cpu/sm510/sm510.h b/src/devices/cpu/sm510/sm510.h
index fe9e01484d1..03b9147e66e 100644
--- a/src/devices/cpu/sm510/sm510.h
+++ b/src/devices/cpu/sm510/sm510.h
@@ -9,7 +9,6 @@
#ifndef _SM510_H_
#define _SM510_H_
-#include "emu.h"
// I/O ports setup
diff --git a/src/devices/cpu/sm510/sm510core.cpp b/src/devices/cpu/sm510/sm510core.cpp
index c886c178cfa..323d2eb84e4 100644
--- a/src/devices/cpu/sm510/sm510core.cpp
+++ b/src/devices/cpu/sm510/sm510core.cpp
@@ -6,6 +6,7 @@
*/
+#include "emu.h"
#include "sm510.h"
#include "debugger.h"
diff --git a/src/devices/cpu/sm510/sm510op.cpp b/src/devices/cpu/sm510/sm510op.cpp
index 01ab9eee9d9..b8cc68de21f 100644
--- a/src/devices/cpu/sm510/sm510op.cpp
+++ b/src/devices/cpu/sm510/sm510op.cpp
@@ -3,6 +3,7 @@
// shared opcode handlers
+#include "emu.h"
#include "sm510.h"
diff --git a/src/devices/cpu/sm510/sm511core.cpp b/src/devices/cpu/sm510/sm511core.cpp
index a241ef09b52..f71e93a968e 100644
--- a/src/devices/cpu/sm510/sm511core.cpp
+++ b/src/devices/cpu/sm510/sm511core.cpp
@@ -6,6 +6,7 @@
*/
+#include "emu.h"
#include "sm510.h"
#include "debugger.h"
diff --git a/src/devices/cpu/tms1000/tms0270.cpp b/src/devices/cpu/tms1000/tms0270.cpp
index 8c09fa49bea..48d6aa516d0 100644
--- a/src/devices/cpu/tms1000/tms0270.cpp
+++ b/src/devices/cpu/tms1000/tms0270.cpp
@@ -6,6 +6,7 @@
*/
+#include "emu.h"
#include "tms0270.h"
#include "debugger.h"
diff --git a/src/devices/cpu/tms1000/tms0970.cpp b/src/devices/cpu/tms1000/tms0970.cpp
index 0f67ffa4055..6bf398272e0 100644
--- a/src/devices/cpu/tms1000/tms0970.cpp
+++ b/src/devices/cpu/tms1000/tms0970.cpp
@@ -6,6 +6,7 @@
*/
+#include "emu.h"
#include "tms0970.h"
#include "debugger.h"
diff --git a/src/devices/cpu/tms1000/tms0980.cpp b/src/devices/cpu/tms1000/tms0980.cpp
index cb4a00adbde..0057db927a2 100644
--- a/src/devices/cpu/tms1000/tms0980.cpp
+++ b/src/devices/cpu/tms1000/tms0980.cpp
@@ -6,6 +6,7 @@
*/
+#include "emu.h"
#include "tms0980.h"
#include "debugger.h"
diff --git a/src/devices/cpu/tms1000/tms1000.cpp b/src/devices/cpu/tms1000/tms1000.cpp
index a971b3e01b8..2f97dedd360 100644
--- a/src/devices/cpu/tms1000/tms1000.cpp
+++ b/src/devices/cpu/tms1000/tms1000.cpp
@@ -6,6 +6,7 @@
*/
+#include "emu.h"
#include "tms1000.h"
#include "debugger.h"
diff --git a/src/devices/cpu/tms1000/tms1100.cpp b/src/devices/cpu/tms1000/tms1100.cpp
index f896f60d9eb..a49469aa920 100644
--- a/src/devices/cpu/tms1000/tms1100.cpp
+++ b/src/devices/cpu/tms1000/tms1100.cpp
@@ -6,6 +6,7 @@
*/
+#include "emu.h"
#include "tms1100.h"
#include "debugger.h"
diff --git a/src/devices/cpu/tms1000/tms1400.cpp b/src/devices/cpu/tms1000/tms1400.cpp
index d8f12700289..ece13f4968e 100644
--- a/src/devices/cpu/tms1000/tms1400.cpp
+++ b/src/devices/cpu/tms1000/tms1400.cpp
@@ -9,6 +9,7 @@
*/
+#include "emu.h"
#include "tms1400.h"
#include "debugger.h"
diff --git a/src/devices/cpu/tms1000/tms1k_base.cpp b/src/devices/cpu/tms1000/tms1k_base.cpp
index 8caa62493c7..8ea2eedfec8 100644
--- a/src/devices/cpu/tms1000/tms1k_base.cpp
+++ b/src/devices/cpu/tms1000/tms1k_base.cpp
@@ -65,6 +65,7 @@ unknown cycle: CME, SSE, SSS
*/
+#include "emu.h"
#include "tms1k_base.h"
#include "debugger.h"
diff --git a/src/devices/cpu/tms1000/tms1k_base.h b/src/devices/cpu/tms1000/tms1k_base.h
index 2363bccabca..98f7e61ed2e 100644
--- a/src/devices/cpu/tms1000/tms1k_base.h
+++ b/src/devices/cpu/tms1000/tms1k_base.h
@@ -12,7 +12,6 @@
#ifndef _TMS1KBASE_H_
#define _TMS1KBASE_H_
-#include "emu.h"
#include "machine/pla.h"
diff --git a/src/devices/cpu/tms1000/tp0320.cpp b/src/devices/cpu/tms1000/tp0320.cpp
index 03c66c87e7f..f6b162ca728 100644
--- a/src/devices/cpu/tms1000/tp0320.cpp
+++ b/src/devices/cpu/tms1000/tp0320.cpp
@@ -9,6 +9,7 @@
*/
+#include "emu.h"
#include "tp0320.h"
#include "debugger.h"
diff --git a/src/devices/cpu/tms7000/tms7000.cpp b/src/devices/cpu/tms7000/tms7000.cpp
index 9e810a02407..a064d0fc9ad 100644
--- a/src/devices/cpu/tms7000/tms7000.cpp
+++ b/src/devices/cpu/tms7000/tms7000.cpp
@@ -17,6 +17,7 @@
*****************************************************************************/
+#include "emu.h"
#include "tms7000.h"
// TMS7000 is the most basic one, 128 bytes internal RAM and no internal ROM.
diff --git a/src/devices/cpu/tms7000/tms7000.h b/src/devices/cpu/tms7000/tms7000.h
index 84298d8fa05..91bc2faec93 100644
--- a/src/devices/cpu/tms7000/tms7000.h
+++ b/src/devices/cpu/tms7000/tms7000.h
@@ -11,7 +11,6 @@
#ifndef __TMS7000_H__
#define __TMS7000_H__
-#include "emu.h"
#include "debugger.h"
diff --git a/src/devices/cpu/tms7000/tms7000op.cpp b/src/devices/cpu/tms7000/tms7000op.cpp
index dcc2db25a44..d960b37ec6d 100644
--- a/src/devices/cpu/tms7000/tms7000op.cpp
+++ b/src/devices/cpu/tms7000/tms7000op.cpp
@@ -3,6 +3,7 @@
// TMS7000 opcode handlers
+#include "emu.h"
#include "tms7000.h"
// flag helpers
diff --git a/src/devices/cpu/tms9900/ti990_10.cpp b/src/devices/cpu/tms9900/ti990_10.cpp
index 8b0a1b5bed6..586f8bee8c9 100644
--- a/src/devices/cpu/tms9900/ti990_10.cpp
+++ b/src/devices/cpu/tms9900/ti990_10.cpp
@@ -23,6 +23,7 @@
**** This is WORK IN PROGRESS ****
*/
+#include "emu.h"
#include "ti990_10.h"
/*
diff --git a/src/devices/cpu/tms9900/ti990_10.h b/src/devices/cpu/tms9900/ti990_10.h
index 8b49abbff41..5e33d03435f 100644
--- a/src/devices/cpu/tms9900/ti990_10.h
+++ b/src/devices/cpu/tms9900/ti990_10.h
@@ -8,7 +8,6 @@
#ifndef __TI990_10_H__
#define __TI990_10_H__
-#include "emu.h"
#include "debugger.h"
#include "tms99com.h"
diff --git a/src/devices/cpu/tms9900/tms9900.cpp b/src/devices/cpu/tms9900/tms9900.cpp
index f5b95e4392f..5181d9cd1c7 100644
--- a/src/devices/cpu/tms9900/tms9900.cpp
+++ b/src/devices/cpu/tms9900/tms9900.cpp
@@ -108,6 +108,7 @@
Michael Zapf, June 2012
*/
+#include "emu.h"
#include "tms9900.h"
#define NOPRG -1
diff --git a/src/devices/cpu/tms9900/tms9900.h b/src/devices/cpu/tms9900/tms9900.h
index 0a110285637..2380e9e815f 100644
--- a/src/devices/cpu/tms9900/tms9900.h
+++ b/src/devices/cpu/tms9900/tms9900.h
@@ -11,7 +11,6 @@
#ifndef __TMS9900_H__
#define __TMS9900_H__
-#include "emu.h"
#include "debugger.h"
#include "tms99com.h"
diff --git a/src/devices/cpu/tms9900/tms9980a.cpp b/src/devices/cpu/tms9900/tms9980a.cpp
index b6466c52463..46c76797d81 100644
--- a/src/devices/cpu/tms9900/tms9980a.cpp
+++ b/src/devices/cpu/tms9900/tms9980a.cpp
@@ -51,6 +51,7 @@
Michael Zapf, 2012
*/
+#include "emu.h"
#include "tms9980a.h"
/*
diff --git a/src/devices/cpu/tms9900/tms9980a.h b/src/devices/cpu/tms9900/tms9980a.h
index 8a7a409f2b8..9ffbab84a58 100644
--- a/src/devices/cpu/tms9900/tms9980a.h
+++ b/src/devices/cpu/tms9900/tms9980a.h
@@ -8,7 +8,6 @@
#ifndef __TMS9980A_H__
#define __TMS9980A_H__
-#include "emu.h"
#include "debugger.h"
#include "tms9900.h"
diff --git a/src/devices/cpu/tms9900/tms9995.cpp b/src/devices/cpu/tms9900/tms9995.cpp
index 67665324a5a..ec12a230276 100644
--- a/src/devices/cpu/tms9900/tms9995.cpp
+++ b/src/devices/cpu/tms9900/tms9995.cpp
@@ -89,6 +89,7 @@
Michael Zapf, June 2012
*/
+#include "emu.h"
#include "tms9995.h"
#define NOPRG -1
diff --git a/src/devices/cpu/tms9900/tms9995.h b/src/devices/cpu/tms9900/tms9995.h
index 57c92db775b..cbbaaa0c3ce 100644
--- a/src/devices/cpu/tms9900/tms9995.h
+++ b/src/devices/cpu/tms9900/tms9995.h
@@ -10,7 +10,6 @@
#ifndef __TMS9995_H__
#define __TMS9995_H__
-#include "emu.h"
#include "debugger.h"
#include "tms99com.h"
diff --git a/src/devices/cpu/ucom4/ucom4.cpp b/src/devices/cpu/ucom4/ucom4.cpp
index aca4996b5fa..3d2b164672f 100644
--- a/src/devices/cpu/ucom4/ucom4.cpp
+++ b/src/devices/cpu/ucom4/ucom4.cpp
@@ -20,6 +20,7 @@
*/
+#include "emu.h"
#include "ucom4.h"
#include "debugger.h"
diff --git a/src/devices/cpu/ucom4/ucom4.h b/src/devices/cpu/ucom4/ucom4.h
index 0dcd43df7f5..851ac4ad423 100644
--- a/src/devices/cpu/ucom4/ucom4.h
+++ b/src/devices/cpu/ucom4/ucom4.h
@@ -9,7 +9,6 @@
#ifndef _UCOM4_H_
#define _UCOM4_H_
-#include "emu.h"
// I/O ports setup
diff --git a/src/devices/cpu/ucom4/ucom4op.cpp b/src/devices/cpu/ucom4/ucom4op.cpp
index 67d12a95dad..4a988cc34e2 100644
--- a/src/devices/cpu/ucom4/ucom4op.cpp
+++ b/src/devices/cpu/ucom4/ucom4op.cpp
@@ -3,6 +3,7 @@
// uCOM-4 opcode handlers
+#include "emu.h"
#include "ucom4.h"
diff --git a/src/devices/cpu/z80/kl5c80a12.cpp b/src/devices/cpu/z80/kl5c80a12.cpp
index 954a6933aa9..fcf8f577a27 100644
--- a/src/devices/cpu/z80/kl5c80a12.cpp
+++ b/src/devices/cpu/z80/kl5c80a12.cpp
@@ -13,6 +13,7 @@
***************************************************************************/
+#include "emu.h"
#include "kl5c80a12.h"
const device_type KL5C80A12 = &device_creator<kl5c80a12_device>;
diff --git a/src/devices/cpu/z80/kl5c80a12.h b/src/devices/cpu/z80/kl5c80a12.h
index 534dbfa9e7f..a4e9fc66cea 100644
--- a/src/devices/cpu/z80/kl5c80a12.h
+++ b/src/devices/cpu/z80/kl5c80a12.h
@@ -18,7 +18,6 @@
#ifndef __KL5C80A12__
#define __KL5C80A12__
-#include "emu.h"
#include "z80.h"
#include "machine/z80ctc.h"
diff --git a/src/devices/cpu/z80/tmpz84c011.cpp b/src/devices/cpu/z80/tmpz84c011.cpp
index 970db6624bd..2ae617f502d 100644
--- a/src/devices/cpu/z80/tmpz84c011.cpp
+++ b/src/devices/cpu/z80/tmpz84c011.cpp
@@ -10,6 +10,7 @@
***************************************************************************/
+#include "emu.h"
#include "tmpz84c011.h"
const device_type TMPZ84C011 = &device_creator<tmpz84c011_device>;
diff --git a/src/devices/cpu/z80/tmpz84c011.h b/src/devices/cpu/z80/tmpz84c011.h
index bd9a77dca4e..9eaa3e2b0c3 100644
--- a/src/devices/cpu/z80/tmpz84c011.h
+++ b/src/devices/cpu/z80/tmpz84c011.h
@@ -12,7 +12,6 @@
#ifndef __TMPZ84C011__
#define __TMPZ84C011__
-#include "emu.h"
#include "z80.h"
#include "machine/z80ctc.h"
diff --git a/src/devices/cpu/z80/tmpz84c015.cpp b/src/devices/cpu/z80/tmpz84c015.cpp
index 19a7279f31f..b00a7013b5d 100644
--- a/src/devices/cpu/z80/tmpz84c015.cpp
+++ b/src/devices/cpu/z80/tmpz84c015.cpp
@@ -12,6 +12,7 @@
***************************************************************************/
+#include "emu.h"
#include "tmpz84c015.h"
const device_type TMPZ84C015 = &device_creator<tmpz84c015_device>;
diff --git a/src/devices/cpu/z80/tmpz84c015.h b/src/devices/cpu/z80/tmpz84c015.h
index 4efab045f24..90ee3154530 100644
--- a/src/devices/cpu/z80/tmpz84c015.h
+++ b/src/devices/cpu/z80/tmpz84c015.h
@@ -12,7 +12,6 @@
#ifndef __TMPZ84C015__
#define __TMPZ84C015__
-#include "emu.h"
#include "z80.h"
#include "machine/z80dart.h"
#include "machine/z80ctc.h"