summaryrefslogtreecommitdiffstatshomepage
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/devices/cpu/8x300/8x300.cpp1
-rw-r--r--src/devices/cpu/adsp2100/adsp2100.cpp1
-rw-r--r--src/devices/cpu/alpha/alpha.cpp2
-rw-r--r--src/devices/cpu/alto2/alto2cpu.h2
-rw-r--r--src/devices/cpu/am29000/am29000.cpp1
-rw-r--r--src/devices/cpu/apexc/apexc.cpp1
-rw-r--r--src/devices/cpu/arc/arc.cpp1
-rw-r--r--src/devices/cpu/arcompact/arcompact.cpp1
-rw-r--r--src/devices/cpu/arcompact/arcompact_execute.cpp1
-rw-r--r--src/devices/cpu/arm/arm.cpp1
-rw-r--r--src/devices/cpu/asap/asap.cpp1
-rw-r--r--src/devices/cpu/avr8/avr8.cpp1
-rw-r--r--src/devices/cpu/capricorn/capricorn.cpp1
-rw-r--r--src/devices/cpu/ccpu/ccpu.cpp1
-rw-r--r--src/devices/cpu/clipper/clipper.cpp1
-rw-r--r--src/devices/cpu/cop400/cop400.cpp1
-rw-r--r--src/devices/cpu/cosmac/cosmac.cpp1
-rw-r--r--src/devices/cpu/cp1610/cp1610.cpp1
-rw-r--r--src/devices/cpu/cubeqcpu/cubeqcpu.cpp1
-rw-r--r--src/devices/cpu/diablo/diablo1300.cpp1
-rw-r--r--src/devices/cpu/drcbec.cpp2
-rw-r--r--src/devices/cpu/drcbex64.cpp2
-rw-r--r--src/devices/cpu/drcbex86.cpp2
-rw-r--r--src/devices/cpu/dsp16/dsp16.cpp2
-rw-r--r--src/devices/cpu/dsp32/dsp32.cpp1
-rw-r--r--src/devices/cpu/dsp56000/dsp56000.cpp1
-rw-r--r--src/devices/cpu/dsp56156/dsp56156.cpp2
-rw-r--r--src/devices/cpu/dspp/dspp.cpp2
-rw-r--r--src/devices/cpu/dspp/dsppdrc.cpp1
-rw-r--r--src/devices/cpu/e132xs/e132xs.cpp2
-rw-r--r--src/devices/cpu/es5510/es5510.cpp1
-rw-r--r--src/devices/cpu/esrip/esrip.cpp1
-rw-r--r--src/devices/cpu/f8/f8.cpp1
-rw-r--r--src/devices/cpu/g65816/g65816o0.cpp1
-rw-r--r--src/devices/cpu/g65816/g65816o1.cpp1
-rw-r--r--src/devices/cpu/g65816/g65816o2.cpp1
-rw-r--r--src/devices/cpu/g65816/g65816o3.cpp1
-rw-r--r--src/devices/cpu/g65816/g65816o4.cpp1
-rw-r--r--src/devices/cpu/h6280/h6280.cpp1
-rw-r--r--src/devices/cpu/h8/h8.cpp1
-rw-r--r--src/devices/cpu/hcd62121/hcd62121.cpp2
-rw-r--r--src/devices/cpu/hd61700/hd61700.cpp2
-rw-r--r--src/devices/cpu/hphybrid/hphybrid.cpp1
-rw-r--r--src/devices/cpu/i386/i386.cpp1
-rw-r--r--src/devices/cpu/i8008/i8008.cpp1
-rw-r--r--src/devices/cpu/i8085/i8085.cpp1
-rw-r--r--src/devices/cpu/i8089/i8089_channel.cpp2
-rw-r--r--src/devices/cpu/i86/i186.cpp1
-rw-r--r--src/devices/cpu/i86/i286.cpp1
-rw-r--r--src/devices/cpu/i86/i86.cpp1
-rw-r--r--src/devices/cpu/i860/i860.cpp1
-rw-r--r--src/devices/cpu/i960/i960.cpp1
-rw-r--r--src/devices/cpu/ie15/ie15.cpp2
-rw-r--r--src/devices/cpu/jaguar/jaguar.cpp1
-rw-r--r--src/devices/cpu/ks0164/ks0164.cpp1
-rw-r--r--src/devices/cpu/lc8670/lc8670.cpp1
-rw-r--r--src/devices/cpu/lh5801/lh5801.cpp2
-rw-r--r--src/devices/cpu/lr35902/lr35902.cpp1
-rw-r--r--src/devices/cpu/m37710/m37710.cpp1
-rw-r--r--src/devices/cpu/m37710/m37710o0.cpp1
-rw-r--r--src/devices/cpu/m37710/m37710o1.cpp1
-rw-r--r--src/devices/cpu/m37710/m37710o2.cpp1
-rw-r--r--src/devices/cpu/m37710/m37710o3.cpp1
-rw-r--r--src/devices/cpu/m6502/m6502.cpp1
-rw-r--r--src/devices/cpu/m6800/m6800.cpp1
-rw-r--r--src/devices/cpu/m68000/m68kcpu.cpp1
-rw-r--r--src/devices/cpu/m6805/m6805.cpp2
-rw-r--r--src/devices/cpu/m6809/hd6309.cpp1
-rw-r--r--src/devices/cpu/m6809/konami.cpp1
-rw-r--r--src/devices/cpu/m6809/m6809.cpp1
-rw-r--r--src/devices/cpu/m88000/m88000.cpp2
-rw-r--r--src/devices/cpu/mb86233/mb86233.cpp1
-rw-r--r--src/devices/cpu/mb86235/mb86235.cpp2
-rw-r--r--src/devices/cpu/mb86235/mb86235drc.cpp1
-rw-r--r--src/devices/cpu/mb86235/mb86235ops.cpp1
-rw-r--r--src/devices/cpu/mb88xx/mb88xx.cpp1
-rw-r--r--src/devices/cpu/mc68hc11/mc68hc11.cpp1
-rw-r--r--src/devices/cpu/mcs40/mcs40.cpp1
-rw-r--r--src/devices/cpu/mcs48/mcs48.cpp2
-rw-r--r--src/devices/cpu/mcs51/axc51-core.cpp1
-rw-r--r--src/devices/cpu/mcs51/mcs51.cpp2
-rw-r--r--src/devices/cpu/mcs96/mcs96.cpp1
-rw-r--r--src/devices/cpu/minx/minx.cpp1
-rw-r--r--src/devices/cpu/mips/mips1.cpp1
-rw-r--r--src/devices/cpu/mips/mips3.cpp1
-rw-r--r--src/devices/cpu/mips/mips3drc.cpp1
-rw-r--r--src/devices/cpu/mips/ps2vu.cpp1
-rw-r--r--src/devices/cpu/mips/r4000.cpp2
-rw-r--r--src/devices/cpu/mn10200/mn10200.cpp1
-rw-r--r--src/devices/cpu/nanoprocessor/nanoprocessor.cpp1
-rw-r--r--src/devices/cpu/nec/nec.cpp2
-rw-r--r--src/devices/cpu/nec/v25.cpp2
-rw-r--r--src/devices/cpu/ns32000/ns32000.cpp2
-rw-r--r--src/devices/cpu/nuon/nuon.cpp1
-rw-r--r--src/devices/cpu/patinhofeio/patinho_feio.cpp1
-rw-r--r--src/devices/cpu/pdp1/pdp1.cpp1
-rw-r--r--src/devices/cpu/pdp8/pdp8.cpp1
-rw-r--r--src/devices/cpu/pic16c5x/pic16c5x.cpp1
-rw-r--r--src/devices/cpu/pic16c62x/pic16c62x.cpp1
-rw-r--r--src/devices/cpu/powerpc/ppcdrc.cpp1
-rw-r--r--src/devices/cpu/pps4/pps4.cpp1
-rw-r--r--src/devices/cpu/psx/psx.cpp1
-rw-r--r--src/devices/cpu/romp/romp.cpp1
-rw-r--r--src/devices/cpu/rsp/rsp.cpp2
-rw-r--r--src/devices/cpu/s2650/s2650.cpp1
-rw-r--r--src/devices/cpu/saturn/saturn.cpp2
-rw-r--r--src/devices/cpu/sc61860/sc61860.cpp1
-rw-r--r--src/devices/cpu/scmp/scmp.cpp2
-rw-r--r--src/devices/cpu/score/score.cpp1
-rw-r--r--src/devices/cpu/scudsp/scudsp.cpp2
-rw-r--r--src/devices/cpu/se3208/se3208.cpp2
-rw-r--r--src/devices/cpu/sh/sh2.cpp2
-rw-r--r--src/devices/cpu/sh/sh2comn.cpp2
-rw-r--r--src/devices/cpu/sh/sh3comn.cpp1
-rw-r--r--src/devices/cpu/sh/sh4.cpp1
-rw-r--r--src/devices/cpu/sh/sh4comn.cpp1
-rw-r--r--src/devices/cpu/sh/sh4dmac.cpp1
-rw-r--r--src/devices/cpu/sh/sh4tmu.cpp1
-rw-r--r--src/devices/cpu/sharc/sharc.cpp2
-rw-r--r--src/devices/cpu/sharc/sharcdrc.cpp1
-rw-r--r--src/devices/cpu/sm8500/sm8500.cpp1
-rw-r--r--src/devices/cpu/sparc/sparc.cpp2
-rw-r--r--src/devices/cpu/sparc/ss1fcode.ipp2
-rw-r--r--src/devices/cpu/spc700/spc700.cpp2
-rw-r--r--src/devices/cpu/ssem/ssem.cpp1
-rw-r--r--src/devices/cpu/ssp1601/ssp1601.cpp2
-rw-r--r--src/devices/cpu/superfx/superfx.cpp1
-rw-r--r--src/devices/cpu/t11/t11.cpp1
-rw-r--r--src/devices/cpu/tlcs870/tlcs870.cpp1
-rw-r--r--src/devices/cpu/tlcs870/tlcs870_ops.cpp1
-rw-r--r--src/devices/cpu/tlcs870/tlcs870_ops_dst.cpp1
-rw-r--r--src/devices/cpu/tlcs870/tlcs870_ops_helper.cpp1
-rw-r--r--src/devices/cpu/tlcs870/tlcs870_ops_reg.cpp1
-rw-r--r--src/devices/cpu/tlcs870/tlcs870_ops_src.cpp1
-rw-r--r--src/devices/cpu/tlcs90/tlcs90.cpp1
-rw-r--r--src/devices/cpu/tms32010/tms32010.cpp1
-rw-r--r--src/devices/cpu/tms32025/tms32025.cpp1
-rw-r--r--src/devices/cpu/tms32031/tms32031.cpp1
-rw-r--r--src/devices/cpu/tms32051/tms32051.cpp1
-rw-r--r--src/devices/cpu/tms32082/tms32082.cpp1
-rw-r--r--src/devices/cpu/tms34010/tms34010.cpp1
-rw-r--r--src/devices/cpu/tms57002/tms57002.cpp1
-rw-r--r--src/devices/cpu/tms57002/tms57kdec.cpp1
-rw-r--r--src/devices/cpu/tms7000/tms7000.h2
-rw-r--r--src/devices/cpu/tms9900/ti990_10.h1
-rw-r--r--src/devices/cpu/tms9900/tms9900.h1
-rw-r--r--src/devices/cpu/tms9900/tms9980a.h1
-rw-r--r--src/devices/cpu/tms9900/tms9995.h1
-rw-r--r--src/devices/cpu/tx0/tx0.cpp1
-rw-r--r--src/devices/cpu/unsp/unsp.cpp2
-rw-r--r--src/devices/cpu/unsp/unsp_extended.cpp2
-rw-r--r--src/devices/cpu/unsp/unsp_exxx.cpp2
-rw-r--r--src/devices/cpu/unsp/unsp_fxxx.cpp2
-rw-r--r--src/devices/cpu/unsp/unsp_jumps.cpp2
-rw-r--r--src/devices/cpu/unsp/unsp_other.cpp2
-rw-r--r--src/devices/cpu/upd7725/upd7725.cpp1
-rw-r--r--src/devices/cpu/upd7810/upd7810.cpp2
-rw-r--r--src/devices/cpu/v30mz/v30mz.cpp1
-rw-r--r--src/devices/cpu/v60/v60.cpp1
-rw-r--r--src/devices/cpu/v810/v810.cpp1
-rw-r--r--src/devices/cpu/xavix2/xavix2.cpp1
-rw-r--r--src/devices/cpu/z180/z180.cpp1
-rw-r--r--src/devices/cpu/z8/z8.cpp1
-rw-r--r--src/devices/cpu/z80/z80.cpp1
-rw-r--r--src/devices/cpu/z80/z80dasm.cpp1
-rw-r--r--src/devices/cpu/z8000/z8000.cpp3
166 files changed, 8 insertions, 203 deletions
diff --git a/src/devices/cpu/8x300/8x300.cpp b/src/devices/cpu/8x300/8x300.cpp
index 1b0aecfc4c4..6a248517fec 100644
--- a/src/devices/cpu/8x300/8x300.cpp
+++ b/src/devices/cpu/8x300/8x300.cpp
@@ -12,7 +12,6 @@
#include "emu.h"
#include "8x300.h"
#include "8x300dasm.h"
-#include "debugger.h"
#define FETCHOP(a) (m_cache.read_word(a))
#define CYCLES(x) do { m_icount -= (x); } while (0)
diff --git a/src/devices/cpu/adsp2100/adsp2100.cpp b/src/devices/cpu/adsp2100/adsp2100.cpp
index bb6674037ad..86b0158caa7 100644
--- a/src/devices/cpu/adsp2100/adsp2100.cpp
+++ b/src/devices/cpu/adsp2100/adsp2100.cpp
@@ -106,7 +106,6 @@
***************************************************************************/
#include "emu.h"
-#include "debugger.h"
#include "adsp2100.h"
#include "2100dasm.h"
diff --git a/src/devices/cpu/alpha/alpha.cpp b/src/devices/cpu/alpha/alpha.cpp
index 0449a249844..54fd995b092 100644
--- a/src/devices/cpu/alpha/alpha.cpp
+++ b/src/devices/cpu/alpha/alpha.cpp
@@ -26,8 +26,6 @@
#include "alpha.h"
#include "common.h"
-#include "debugger.h"
-
#include "softfloat3/source/include/softfloat.h"
#define LOG_GENERAL (1U << 0)
diff --git a/src/devices/cpu/alto2/alto2cpu.h b/src/devices/cpu/alto2/alto2cpu.h
index 1e4ee84375e..c269737d2e6 100644
--- a/src/devices/cpu/alto2/alto2cpu.h
+++ b/src/devices/cpu/alto2/alto2cpu.h
@@ -12,8 +12,6 @@
#include "machine/diablo_hd.h"
-#include "debugger.h"
-
#define ALTO2_TAG "alto2"
/**
diff --git a/src/devices/cpu/am29000/am29000.cpp b/src/devices/cpu/am29000/am29000.cpp
index 3a7bdb98954..b66c5163e1e 100644
--- a/src/devices/cpu/am29000/am29000.cpp
+++ b/src/devices/cpu/am29000/am29000.cpp
@@ -15,7 +15,6 @@
***************************************************************************/
#include "emu.h"
-#include "debugger.h"
#include "am29000.h"
#include "am29dasm.h"
diff --git a/src/devices/cpu/apexc/apexc.cpp b/src/devices/cpu/apexc/apexc.cpp
index c759cb7b988..68c1547823c 100644
--- a/src/devices/cpu/apexc/apexc.cpp
+++ b/src/devices/cpu/apexc/apexc.cpp
@@ -328,7 +328,6 @@ field: X address D Function Y address D (part 2)
#include "emu.h"
#include "apexc.h"
#include "apexcdsm.h"
-#include "debugger.h"
DEFINE_DEVICE_TYPE(APEXC, apexc_cpu_device, "apexc_cpu", "APE(X)C")
diff --git a/src/devices/cpu/arc/arc.cpp b/src/devices/cpu/arc/arc.cpp
index 46ac82a84fb..5b1b61bf6e1 100644
--- a/src/devices/cpu/arc/arc.cpp
+++ b/src/devices/cpu/arc/arc.cpp
@@ -10,7 +10,6 @@
\*********************************/
#include "emu.h"
-#include "debugger.h"
#include "arc.h"
#include "arcdasm.h"
diff --git a/src/devices/cpu/arcompact/arcompact.cpp b/src/devices/cpu/arcompact/arcompact.cpp
index 7ca4cc02d3a..f1055895d87 100644
--- a/src/devices/cpu/arcompact/arcompact.cpp
+++ b/src/devices/cpu/arcompact/arcompact.cpp
@@ -19,7 +19,6 @@
\*********************************/
#include "emu.h"
-#include "debugger.h"
#include "arcompact.h"
#include "arcompactdasm.h"
diff --git a/src/devices/cpu/arcompact/arcompact_execute.cpp b/src/devices/cpu/arcompact/arcompact_execute.cpp
index 087969b385e..31fa7feba90 100644
--- a/src/devices/cpu/arcompact/arcompact_execute.cpp
+++ b/src/devices/cpu/arcompact/arcompact_execute.cpp
@@ -2,7 +2,6 @@
// copyright-holders:David Haywood
#include "emu.h"
-#include "debugger.h"
#include "arcompact.h"
#include "arcompactdasm.h"
diff --git a/src/devices/cpu/arm/arm.cpp b/src/devices/cpu/arm/arm.cpp
index 55a516f381d..f2d2b35c37f 100644
--- a/src/devices/cpu/arm/arm.cpp
+++ b/src/devices/cpu/arm/arm.cpp
@@ -18,7 +18,6 @@
#include "emu.h"
#include "arm.h"
-#include "debugger.h"
#include "armdasm.h"
#define ARM_DEBUG_CORE 0
diff --git a/src/devices/cpu/asap/asap.cpp b/src/devices/cpu/asap/asap.cpp
index 7b0f8a690f5..43e4008b85f 100644
--- a/src/devices/cpu/asap/asap.cpp
+++ b/src/devices/cpu/asap/asap.cpp
@@ -14,7 +14,6 @@
#include "emu.h"
#include "asap.h"
#include "asapdasm.h"
-#include "debugger.h"
//**************************************************************************
diff --git a/src/devices/cpu/avr8/avr8.cpp b/src/devices/cpu/avr8/avr8.cpp
index b87ed6d0631..4d7f978bc7c 100644
--- a/src/devices/cpu/avr8/avr8.cpp
+++ b/src/devices/cpu/avr8/avr8.cpp
@@ -60,7 +60,6 @@
#include "emu.h"
#include "avr8.h"
#include "avr8dasm.h"
-#include "debugger.h"
#define LOG_UNKNOWN (1 << 1)
#define LOG_BOOT (1 << 2)
diff --git a/src/devices/cpu/capricorn/capricorn.cpp b/src/devices/cpu/capricorn/capricorn.cpp
index 0f937891e47..ee398f5296a 100644
--- a/src/devices/cpu/capricorn/capricorn.cpp
+++ b/src/devices/cpu/capricorn/capricorn.cpp
@@ -8,7 +8,6 @@
#include "emu.h"
#include "capricorn.h"
#include "capricorn_dasm.h"
-#include "debugger.h"
// Register indexes
// GP registers are named "R" & the octal representation of the index (00-77)
diff --git a/src/devices/cpu/ccpu/ccpu.cpp b/src/devices/cpu/ccpu/ccpu.cpp
index d1f8756f827..d13c272b21a 100644
--- a/src/devices/cpu/ccpu/ccpu.cpp
+++ b/src/devices/cpu/ccpu/ccpu.cpp
@@ -13,7 +13,6 @@
#include "emu.h"
#include "ccpu.h"
#include "ccpudasm.h"
-#include "debugger.h"
DEFINE_DEVICE_TYPE(CCPU, ccpu_cpu_device, "ccpu", "Cinematronics CPU")
diff --git a/src/devices/cpu/clipper/clipper.cpp b/src/devices/cpu/clipper/clipper.cpp
index cf9903e6ec8..e59a20ffc45 100644
--- a/src/devices/cpu/clipper/clipper.cpp
+++ b/src/devices/cpu/clipper/clipper.cpp
@@ -14,7 +14,6 @@
*/
#include "emu.h"
-#include "debugger.h"
#include "clipper.h"
#include "clipperd.h"
diff --git a/src/devices/cpu/cop400/cop400.cpp b/src/devices/cpu/cop400/cop400.cpp
index 686feab238b..5c92d3cbc3c 100644
--- a/src/devices/cpu/cop400/cop400.cpp
+++ b/src/devices/cpu/cop400/cop400.cpp
@@ -57,7 +57,6 @@
*/
#include "emu.h"
-#include "debugger.h"
#include "cop400.h"
#include "cop410ds.h"
#include "cop420ds.h"
diff --git a/src/devices/cpu/cosmac/cosmac.cpp b/src/devices/cpu/cosmac/cosmac.cpp
index 12babfb3bbe..af5327c9e93 100644
--- a/src/devices/cpu/cosmac/cosmac.cpp
+++ b/src/devices/cpu/cosmac/cosmac.cpp
@@ -16,7 +16,6 @@ TODO:
**********************************************************************/
#include "emu.h"
-#include "debugger.h"
#include "cosmac.h"
// permit our enums to be saved
diff --git a/src/devices/cpu/cp1610/cp1610.cpp b/src/devices/cpu/cp1610/cp1610.cpp
index c3448ea4849..71d41844be8 100644
--- a/src/devices/cpu/cp1610/cp1610.cpp
+++ b/src/devices/cpu/cp1610/cp1610.cpp
@@ -15,7 +15,6 @@
#include "emu.h"
#include "cp1610.h"
-#include "debugger.h"
#include "1610dasm.h"
DEFINE_DEVICE_TYPE(CP1610, cp1610_cpu_device, "cp1610", "GI CP1610")
diff --git a/src/devices/cpu/cubeqcpu/cubeqcpu.cpp b/src/devices/cpu/cubeqcpu/cubeqcpu.cpp
index a33fd877505..da608c33d65 100644
--- a/src/devices/cpu/cubeqcpu/cubeqcpu.cpp
+++ b/src/devices/cpu/cubeqcpu/cubeqcpu.cpp
@@ -14,7 +14,6 @@
***************************************************************************/
#include "emu.h"
-#include "debugger.h"
#include "cubeqcpu.h"
#include "cubedasm.h"
diff --git a/src/devices/cpu/diablo/diablo1300.cpp b/src/devices/cpu/diablo/diablo1300.cpp
index 81fe6e4142b..baaf6f8bc47 100644
--- a/src/devices/cpu/diablo/diablo1300.cpp
+++ b/src/devices/cpu/diablo/diablo1300.cpp
@@ -7,7 +7,6 @@
*/
#include "emu.h"
-#include "debugger.h"
#include "diablo1300.h"
#include "diablo1300dasm.h"
diff --git a/src/devices/cpu/drcbec.cpp b/src/devices/cpu/drcbec.cpp
index d347a569897..e6cb5e533e5 100644
--- a/src/devices/cpu/drcbec.cpp
+++ b/src/devices/cpu/drcbec.cpp
@@ -9,7 +9,7 @@
***************************************************************************/
#include "emu.h"
-#include "debugger.h"
+#include "debug/debugcpu.h"
#include "drcbec.h"
#include <cmath>
diff --git a/src/devices/cpu/drcbex64.cpp b/src/devices/cpu/drcbex64.cpp
index 22c523dc550..ad005425fa2 100644
--- a/src/devices/cpu/drcbex64.cpp
+++ b/src/devices/cpu/drcbex64.cpp
@@ -169,7 +169,7 @@
#include "emu.h"
#include "drcbex64.h"
-#include "debugger.h"
+#include "debug/debugcpu.h"
#include "emuopts.h"
#include <cstddef>
diff --git a/src/devices/cpu/drcbex86.cpp b/src/devices/cpu/drcbex86.cpp
index be7352a4601..3f5e4346dea 100644
--- a/src/devices/cpu/drcbex86.cpp
+++ b/src/devices/cpu/drcbex86.cpp
@@ -85,7 +85,7 @@
#include "emu.h"
#include "drcbex86.h"
-#include "debugger.h"
+#include "debug/debugcpu.h"
#include "emuopts.h"
#include "drcuml.h"
diff --git a/src/devices/cpu/dsp16/dsp16.cpp b/src/devices/cpu/dsp16/dsp16.cpp
index 20d63898968..4078389e2bc 100644
--- a/src/devices/cpu/dsp16/dsp16.cpp
+++ b/src/devices/cpu/dsp16/dsp16.cpp
@@ -80,8 +80,6 @@
#include "dsp16core.ipp"
#include "dsp16rc.h"
-#include "debugger.h"
-
#include <functional>
#include <limits>
diff --git a/src/devices/cpu/dsp32/dsp32.cpp b/src/devices/cpu/dsp32/dsp32.cpp
index 3519f941c69..9ef3aef63c9 100644
--- a/src/devices/cpu/dsp32/dsp32.cpp
+++ b/src/devices/cpu/dsp32/dsp32.cpp
@@ -31,7 +31,6 @@
#include "emu.h"
#include "dsp32.h"
#include "dsp32dis.h"
-#include "debugger.h"
//**************************************************************************
diff --git a/src/devices/cpu/dsp56000/dsp56000.cpp b/src/devices/cpu/dsp56000/dsp56000.cpp
index f9ee7c9d4a3..eed944bdc0a 100644
--- a/src/devices/cpu/dsp56000/dsp56000.cpp
+++ b/src/devices/cpu/dsp56000/dsp56000.cpp
@@ -12,7 +12,6 @@
*/
#include "emu.h"
-#include "debugger.h"
#include "dsp56000.h"
#include "dsp56000d.h"
diff --git a/src/devices/cpu/dsp56156/dsp56156.cpp b/src/devices/cpu/dsp56156/dsp56156.cpp
index 38ec2039bf5..1b93948adf5 100644
--- a/src/devices/cpu/dsp56156/dsp56156.cpp
+++ b/src/devices/cpu/dsp56156/dsp56156.cpp
@@ -37,7 +37,7 @@
#include "opcode.h"
-#include "debugger.h"
+#include "debug/debugcpu.h"
#include "dsp56def.h"
diff --git a/src/devices/cpu/dspp/dspp.cpp b/src/devices/cpu/dspp/dspp.cpp
index cadb788dee0..70bc923a67e 100644
--- a/src/devices/cpu/dspp/dspp.cpp
+++ b/src/devices/cpu/dspp/dspp.cpp
@@ -14,8 +14,6 @@
#include "dsppfe.h"
#include "dsppdasm.h"
-#include "debugger.h"
-
//**************************************************************************
// CONSTANTS
diff --git a/src/devices/cpu/dspp/dsppdrc.cpp b/src/devices/cpu/dspp/dsppdrc.cpp
index 5ed615d1056..7af3a7a1c4c 100644
--- a/src/devices/cpu/dspp/dsppdrc.cpp
+++ b/src/devices/cpu/dspp/dsppdrc.cpp
@@ -8,7 +8,6 @@
******************************************************************************/
#include "emu.h"
-#include "debugger.h"
#include "dspp.h"
#include "dsppfe.h"
#include "cpu/drcfe.h"
diff --git a/src/devices/cpu/e132xs/e132xs.cpp b/src/devices/cpu/e132xs/e132xs.cpp
index c328c0a35d7..49e09694136 100644
--- a/src/devices/cpu/e132xs/e132xs.cpp
+++ b/src/devices/cpu/e132xs/e132xs.cpp
@@ -146,8 +146,6 @@
#include "e132xs.h"
#include "e132xsfe.h"
-#include "debugger.h"
-
#include "32xsdefs.h"
//#define VERBOSE 1
diff --git a/src/devices/cpu/es5510/es5510.cpp b/src/devices/cpu/es5510/es5510.cpp
index 61a25f915db..17b855c1b17 100644
--- a/src/devices/cpu/es5510/es5510.cpp
+++ b/src/devices/cpu/es5510/es5510.cpp
@@ -17,7 +17,6 @@
#include "es5510d.h"
#include "cpu/m68000/m68000.h"
-#include "debugger.h"
#include "corestr.h"
diff --git a/src/devices/cpu/esrip/esrip.cpp b/src/devices/cpu/esrip/esrip.cpp
index 931b5866308..40457212abb 100644
--- a/src/devices/cpu/esrip/esrip.cpp
+++ b/src/devices/cpu/esrip/esrip.cpp
@@ -13,7 +13,6 @@
#include "esrip.h"
#include "esripdsm.h"
-#include "debugger.h"
#include "screen.h"
diff --git a/src/devices/cpu/f8/f8.cpp b/src/devices/cpu/f8/f8.cpp
index b385fc4ffe9..b7168380dad 100644
--- a/src/devices/cpu/f8/f8.cpp
+++ b/src/devices/cpu/f8/f8.cpp
@@ -46,7 +46,6 @@
#include "emu.h"
#include "f8.h"
#include "f8dasm.h"
-#include "debugger.h"
/* status flags */
diff --git a/src/devices/cpu/g65816/g65816o0.cpp b/src/devices/cpu/g65816/g65816o0.cpp
index 5829325bd37..82f2cd5a479 100644
--- a/src/devices/cpu/g65816/g65816o0.cpp
+++ b/src/devices/cpu/g65816/g65816o0.cpp
@@ -1,7 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Karl Stenerud
#include "emu.h"
-#include "debugger.h"
#include "g65816.h"
#include "g65816cm.h"
#define EXECUTION_MODE EXECUTION_MODE_M0X0
diff --git a/src/devices/cpu/g65816/g65816o1.cpp b/src/devices/cpu/g65816/g65816o1.cpp
index 4b277c9abf2..f919432de40 100644
--- a/src/devices/cpu/g65816/g65816o1.cpp
+++ b/src/devices/cpu/g65816/g65816o1.cpp
@@ -1,7 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Karl Stenerud
#include "emu.h"
-#include "debugger.h"
#include "g65816.h"
#include "g65816cm.h"
#define EXECUTION_MODE EXECUTION_MODE_M0X1
diff --git a/src/devices/cpu/g65816/g65816o2.cpp b/src/devices/cpu/g65816/g65816o2.cpp
index 63a8157e961..1ad417a90f9 100644
--- a/src/devices/cpu/g65816/g65816o2.cpp
+++ b/src/devices/cpu/g65816/g65816o2.cpp
@@ -1,7 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Karl Stenerud
#include "emu.h"
-#include "debugger.h"
#include "g65816.h"
#include "g65816cm.h"
#define EXECUTION_MODE EXECUTION_MODE_M1X0
diff --git a/src/devices/cpu/g65816/g65816o3.cpp b/src/devices/cpu/g65816/g65816o3.cpp
index 24cdebf05b6..7b015646eb4 100644
--- a/src/devices/cpu/g65816/g65816o3.cpp
+++ b/src/devices/cpu/g65816/g65816o3.cpp
@@ -1,7 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Karl Stenerud
#include "emu.h"
-#include "debugger.h"
#include "g65816.h"
#include "g65816cm.h"
#define EXECUTION_MODE EXECUTION_MODE_M1X1
diff --git a/src/devices/cpu/g65816/g65816o4.cpp b/src/devices/cpu/g65816/g65816o4.cpp
index 60262c859fb..9f244be53ca 100644
--- a/src/devices/cpu/g65816/g65816o4.cpp
+++ b/src/devices/cpu/g65816/g65816o4.cpp
@@ -1,7 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Karl Stenerud
#include "emu.h"
-#include "debugger.h"
#include "g65816.h"
#include "g65816cm.h"
#define EXECUTION_MODE EXECUTION_MODE_E
diff --git a/src/devices/cpu/h6280/h6280.cpp b/src/devices/cpu/h6280/h6280.cpp
index 96ecb18534d..27c042ab299 100644
--- a/src/devices/cpu/h6280/h6280.cpp
+++ b/src/devices/cpu/h6280/h6280.cpp
@@ -113,7 +113,6 @@
#include "emu.h"
#include "h6280.h"
#include "6280dasm.h"
-#include "debugger.h"
/* 6280 flags */
enum
diff --git a/src/devices/cpu/h8/h8.cpp b/src/devices/cpu/h8/h8.cpp
index 985f9f6715d..4eb6d2103a6 100644
--- a/src/devices/cpu/h8/h8.cpp
+++ b/src/devices/cpu/h8/h8.cpp
@@ -10,7 +10,6 @@
***************************************************************************/
#include "emu.h"
-#include "debugger.h"
#include "h8.h"
#include "h8_dma.h"
#include "h8_dtc.h"
diff --git a/src/devices/cpu/hcd62121/hcd62121.cpp b/src/devices/cpu/hcd62121/hcd62121.cpp
index 4a99178dde5..e05fe883d65 100644
--- a/src/devices/cpu/hcd62121/hcd62121.cpp
+++ b/src/devices/cpu/hcd62121/hcd62121.cpp
@@ -23,8 +23,6 @@ TODO:
#include "hcd62121.h"
#include "hcd62121d.h"
-#include "debugger.h"
-
enum
{
diff --git a/src/devices/cpu/hd61700/hd61700.cpp b/src/devices/cpu/hd61700/hd61700.cpp
index b00356e404a..5ccdd4d79a7 100644
--- a/src/devices/cpu/hd61700/hd61700.cpp
+++ b/src/devices/cpu/hd61700/hd61700.cpp
@@ -26,8 +26,6 @@
#include "hd61700.h"
#include "hd61700d.h"
-#include "debugger.h"
-
// internal ROM
#define INT_ROM 0x0c00
diff --git a/src/devices/cpu/hphybrid/hphybrid.cpp b/src/devices/cpu/hphybrid/hphybrid.cpp
index e6c8f1f0906..a4eb434167a 100644
--- a/src/devices/cpu/hphybrid/hphybrid.cpp
+++ b/src/devices/cpu/hphybrid/hphybrid.cpp
@@ -34,7 +34,6 @@
#include "emu.h"
#include "hphybrid.h"
#include "hphybrid_dasm.h"
-#include "debugger.h"
#include "hphybrid_defs.h"
diff --git a/src/devices/cpu/i386/i386.cpp b/src/devices/cpu/i386/i386.cpp
index be86d21afd8..82d26e9b2c7 100644
--- a/src/devices/cpu/i386/i386.cpp
+++ b/src/devices/cpu/i386/i386.cpp
@@ -25,7 +25,6 @@
#include "cycles.h"
#include "i386ops.h"
-#include "debugger.h"
#include "debug/debugcpu.h"
#include "debug/express.h"
diff --git a/src/devices/cpu/i8008/i8008.cpp b/src/devices/cpu/i8008/i8008.cpp
index b17b02e1b26..c404508560b 100644
--- a/src/devices/cpu/i8008/i8008.cpp
+++ b/src/devices/cpu/i8008/i8008.cpp
@@ -10,7 +10,6 @@
#include "emu.h"
#include "i8008.h"
#include "8008dasm.h"
-#include "debugger.h"
//**************************************************************************
// MACROS
diff --git a/src/devices/cpu/i8085/i8085.cpp b/src/devices/cpu/i8085/i8085.cpp
index 65d0896c401..9dc530c0567 100644
--- a/src/devices/cpu/i8085/i8085.cpp
+++ b/src/devices/cpu/i8085/i8085.cpp
@@ -107,7 +107,6 @@
*****************************************************************************/
#include "emu.h"
-#include "debugger.h"
#include "i8085.h"
#include "8085dasm.h"
diff --git a/src/devices/cpu/i8089/i8089_channel.cpp b/src/devices/cpu/i8089/i8089_channel.cpp
index 2da1ac9d076..d13606a1ca5 100644
--- a/src/devices/cpu/i8089/i8089_channel.cpp
+++ b/src/devices/cpu/i8089/i8089_channel.cpp
@@ -13,8 +13,6 @@
#include "i8089.h"
-#include "debugger.h"
-
//**************************************************************************
// MACROS/CONSTANTS
diff --git a/src/devices/cpu/i86/i186.cpp b/src/devices/cpu/i86/i186.cpp
index 388b08d938e..8ebcaf3b1db 100644
--- a/src/devices/cpu/i86/i186.cpp
+++ b/src/devices/cpu/i86/i186.cpp
@@ -9,7 +9,6 @@
#include "emu.h"
#include "i186.h"
-#include "debugger.h"
#include "i86inline.h"
#define LOG_PORTS 0
diff --git a/src/devices/cpu/i86/i286.cpp b/src/devices/cpu/i86/i286.cpp
index 1cf74bfca01..2d2f2d1b650 100644
--- a/src/devices/cpu/i86/i286.cpp
+++ b/src/devices/cpu/i86/i286.cpp
@@ -2,7 +2,6 @@
// copyright-holders:Carl
#include "emu.h"
#include "i286.h"
-#include "debugger.h"
#include "i86inline.h"
/*
diff --git a/src/devices/cpu/i86/i86.cpp b/src/devices/cpu/i86/i86.cpp
index de5aceba216..fd85830e86b 100644
--- a/src/devices/cpu/i86/i86.cpp
+++ b/src/devices/cpu/i86/i86.cpp
@@ -13,7 +13,6 @@
#include "emu.h"
#include "i86.h"
-#include "debugger.h"
#include "i86inline.h"
#include "cpu/i386/i386dasm.h"
diff --git a/src/devices/cpu/i860/i860.cpp b/src/devices/cpu/i860/i860.cpp
index 08ae974f277..0cef6e6bec4 100644
--- a/src/devices/cpu/i860/i860.cpp
+++ b/src/devices/cpu/i860/i860.cpp
@@ -16,7 +16,6 @@ TODO: Separate out i860XR and i860XP (make different types, etc).
*/
#include "emu.h"
-#include "debugger.h"
#include "i860.h"
#include "i860dis.h"
diff --git a/src/devices/cpu/i960/i960.cpp b/src/devices/cpu/i960/i960.cpp
index c4dfc964a51..318a9326e30 100644
--- a/src/devices/cpu/i960/i960.cpp
+++ b/src/devices/cpu/i960/i960.cpp
@@ -3,7 +3,6 @@
#include "emu.h"
#include "i960.h"
#include "i960dis.h"
-#include "debugger.h"
#ifdef _MSC_VER
/* logb prototype is different for MS Visual C */
diff --git a/src/devices/cpu/ie15/ie15.cpp b/src/devices/cpu/ie15/ie15.cpp
index 828143e1715..d3db6f0ef1b 100644
--- a/src/devices/cpu/ie15/ie15.cpp
+++ b/src/devices/cpu/ie15/ie15.cpp
@@ -4,8 +4,6 @@
#include "ie15.h"
#include "ie15dasm.h"
-#include "debugger.h"
-
//**************************************************************************
// MACROS
diff --git a/src/devices/cpu/jaguar/jaguar.cpp b/src/devices/cpu/jaguar/jaguar.cpp
index fbfcc0c8759..ade6aea525c 100644
--- a/src/devices/cpu/jaguar/jaguar.cpp
+++ b/src/devices/cpu/jaguar/jaguar.cpp
@@ -17,7 +17,6 @@
***************************************************************************/
#include "emu.h"
-#include "debugger.h"
#include "jaguar.h"
#include "jagdasm.h"
diff --git a/src/devices/cpu/ks0164/ks0164.cpp b/src/devices/cpu/ks0164/ks0164.cpp
index b77cf5d5114..5b8f57fb776 100644
--- a/src/devices/cpu/ks0164/ks0164.cpp
+++ b/src/devices/cpu/ks0164/ks0164.cpp
@@ -6,7 +6,6 @@
#include "emu.h"
#include "ks0164.h"
#include "ks0164d.h"
-#include "debugger.h"
DEFINE_DEVICE_TYPE(KS0164CPU, ks0164_cpu_device, "ks0164cpu", "Samsung KS0164 audio processor")
diff --git a/src/devices/cpu/lc8670/lc8670.cpp b/src/devices/cpu/lc8670/lc8670.cpp
index d4eea0572a6..a4d038e3bf1 100644
--- a/src/devices/cpu/lc8670/lc8670.cpp
+++ b/src/devices/cpu/lc8670/lc8670.cpp
@@ -16,7 +16,6 @@
******************************************************************************/
#include "emu.h"
-#include "debugger.h"
#include "lc8670.h"
#include "lc8670dsm.h"
diff --git a/src/devices/cpu/lh5801/lh5801.cpp b/src/devices/cpu/lh5801/lh5801.cpp
index da156333eb0..3f9045ae57e 100644
--- a/src/devices/cpu/lh5801/lh5801.cpp
+++ b/src/devices/cpu/lh5801/lh5801.cpp
@@ -18,8 +18,6 @@
#include "lh5801.h"
#include "5801dasm.h"
-#include "debugger.h"
-
#define VERBOSE 0
#include "logmacro.h"
diff --git a/src/devices/cpu/lr35902/lr35902.cpp b/src/devices/cpu/lr35902/lr35902.cpp
index 452c96f3b8b..86eba6464d2 100644
--- a/src/devices/cpu/lr35902/lr35902.cpp
+++ b/src/devices/cpu/lr35902/lr35902.cpp
@@ -42,7 +42,6 @@
#include "emu.h"
#include "lr35902.h"
#include "lr35902d.h"
-#include "debugger.h"
/* Flag bit definitions */
enum lr35902_flag
diff --git a/src/devices/cpu/m37710/m37710.cpp b/src/devices/cpu/m37710/m37710.cpp
index 87dca393901..e8e121c5f21 100644
--- a/src/devices/cpu/m37710/m37710.cpp
+++ b/src/devices/cpu/m37710/m37710.cpp
@@ -63,7 +63,6 @@
#include "emu.h"
#include "m37710.h"
-#include "debugger.h"
#include "m37710cm.h"
#include "m37710il.h"
diff --git a/src/devices/cpu/m37710/m37710o0.cpp b/src/devices/cpu/m37710/m37710o0.cpp
index 6fdd9b2a01f..8c1f2fd6f93 100644
--- a/src/devices/cpu/m37710/m37710o0.cpp
+++ b/src/devices/cpu/m37710/m37710o0.cpp
@@ -1,7 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:R. Belmont, Karl Stenerud, hap
#include "emu.h"
-#include "debugger.h"
#include "m37710cm.h"
#include "m37710il.h"
#define EXECUTION_MODE EXECUTION_MODE_M0X0
diff --git a/src/devices/cpu/m37710/m37710o1.cpp b/src/devices/cpu/m37710/m37710o1.cpp
index d8de494a6ce..6ee06814642 100644
--- a/src/devices/cpu/m37710/m37710o1.cpp
+++ b/src/devices/cpu/m37710/m37710o1.cpp
@@ -1,7 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:R. Belmont, Karl Stenerud, hap
#include "emu.h"
-#include "debugger.h"
#include "m37710cm.h"
#include "m37710il.h"
#define EXECUTION_MODE EXECUTION_MODE_M0X1
diff --git a/src/devices/cpu/m37710/m37710o2.cpp b/src/devices/cpu/m37710/m37710o2.cpp
index d92556b3207..5430159b8f0 100644
--- a/src/devices/cpu/m37710/m37710o2.cpp
+++ b/src/devices/cpu/m37710/m37710o2.cpp
@@ -1,7 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:R. Belmont, Karl Stenerud, hap
#include "emu.h"
-#include "debugger.h"
#include "m37710cm.h"
#include "m37710il.h"
#define EXECUTION_MODE EXECUTION_MODE_M1X0
diff --git a/src/devices/cpu/m37710/m37710o3.cpp b/src/devices/cpu/m37710/m37710o3.cpp
index 16e2084ec4a..7229de3992a 100644
--- a/src/devices/cpu/m37710/m37710o3.cpp
+++ b/src/devices/cpu/m37710/m37710o3.cpp
@@ -1,7 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:R. Belmont, Karl Stenerud, hap
#include "emu.h"
-#include "debugger.h"
#include "m37710cm.h"
#include "m37710il.h"
#define EXECUTION_MODE EXECUTION_MODE_M1X1
diff --git a/src/devices/cpu/m6502/m6502.cpp b/src/devices/cpu/m6502/m6502.cpp
index cad49add447..5db4186ebd9 100644
--- a/src/devices/cpu/m6502/m6502.cpp
+++ b/src/devices/cpu/m6502/m6502.cpp
@@ -9,7 +9,6 @@
***************************************************************************/
#include "emu.h"
-#include "debugger.h"
#include "m6502.h"
#include "m6502d.h"
diff --git a/src/devices/cpu/m6800/m6800.cpp b/src/devices/cpu/m6800/m6800.cpp
index 17e9cfbd5d4..4df393c0a4c 100644
--- a/src/devices/cpu/m6800/m6800.cpp
+++ b/src/devices/cpu/m6800/m6800.cpp
@@ -70,7 +70,6 @@ TODO:
*/
#include "emu.h"
-#include "debugger.h"
#include "m6800.h"
#include "6800dasm.h"
diff --git a/src/devices/cpu/m68000/m68kcpu.cpp b/src/devices/cpu/m68000/m68kcpu.cpp
index 5ccc2f43424..de6a2dd391f 100644
--- a/src/devices/cpu/m68000/m68kcpu.cpp
+++ b/src/devices/cpu/m68000/m68kcpu.cpp
@@ -25,7 +25,6 @@ static const char copyright_notice[] =
/* ======================================================================== */
#include "emu.h"
-#include "debugger.h"
#include "m68000.h"
#include "m68kdasm.h"
diff --git a/src/devices/cpu/m6805/m6805.cpp b/src/devices/cpu/m6805/m6805.cpp
index bf6ee87c02b..26cc630f3bb 100644
--- a/src/devices/cpu/m6805/m6805.cpp
+++ b/src/devices/cpu/m6805/m6805.cpp
@@ -37,8 +37,6 @@
#include "m6805defs.h"
#include "6805dasm.h"
-#include "debugger.h"
-
#include <algorithm>
#define OP(name) (&m6805_base_device::name<big>)
diff --git a/src/devices/cpu/m6809/hd6309.cpp b/src/devices/cpu/m6809/hd6309.cpp
index 9b8b1bb4ed5..03eb11336e2 100644
--- a/src/devices/cpu/m6809/hd6309.cpp
+++ b/src/devices/cpu/m6809/hd6309.cpp
@@ -115,7 +115,6 @@ March 2013 NPW:
*****************************************************************************/
#include "emu.h"
-#include "debugger.h"
#include "hd6309.h"
#include "m6809inl.h"
#include "6x09dasm.h"
diff --git a/src/devices/cpu/m6809/konami.cpp b/src/devices/cpu/m6809/konami.cpp
index d9cf3e2c62b..95bd6765526 100644
--- a/src/devices/cpu/m6809/konami.cpp
+++ b/src/devices/cpu/m6809/konami.cpp
@@ -55,7 +55,6 @@ March 2013 NPW:
*****************************************************************************/
#include "emu.h"
-#include "debugger.h"
#include "konami.h"
#include "m6809inl.h"
#include "6x09dasm.h"
diff --git a/src/devices/cpu/m6809/m6809.cpp b/src/devices/cpu/m6809/m6809.cpp
index 39ba49cda10..52ddfa433c6 100644
--- a/src/devices/cpu/m6809/m6809.cpp
+++ b/src/devices/cpu/m6809/m6809.cpp
@@ -104,7 +104,6 @@ March 2013 NPW:
*****************************************************************************/
#include "emu.h"
-#include "debugger.h"
#include "m6809.h"
#include "m6809inl.h"
#include "6x09dasm.h"
diff --git a/src/devices/cpu/m88000/m88000.cpp b/src/devices/cpu/m88000/m88000.cpp
index b45a74b830e..57cdfa6fbb2 100644
--- a/src/devices/cpu/m88000/m88000.cpp
+++ b/src/devices/cpu/m88000/m88000.cpp
@@ -16,7 +16,7 @@
*/
#include "emu.h"
-#include "debugger.h"
+#include "debug/debugcpu.h"
#include "m88000.h"
#include "m88000d.h"
diff --git a/src/devices/cpu/mb86233/mb86233.cpp b/src/devices/cpu/mb86233/mb86233.cpp
index 6e624b1c295..479b6fa0399 100644
--- a/src/devices/cpu/mb86233/mb86233.cpp
+++ b/src/devices/cpu/mb86233/mb86233.cpp
@@ -2,7 +2,6 @@
// copyright-holders:Olivier Galibert
#include "emu.h"
-#include "debugger.h"
#include "mb86233.h"
#include "mb86233d.h"
diff --git a/src/devices/cpu/mb86235/mb86235.cpp b/src/devices/cpu/mb86235/mb86235.cpp
index 45eb318704c..23e52b6d1be 100644
--- a/src/devices/cpu/mb86235/mb86235.cpp
+++ b/src/devices/cpu/mb86235/mb86235.cpp
@@ -25,8 +25,6 @@
#include "mb86235fe.h"
#include "mb86235d.h"
-#include "debugger.h"
-
#define ENABLE_DRC 0
diff --git a/src/devices/cpu/mb86235/mb86235drc.cpp b/src/devices/cpu/mb86235/mb86235drc.cpp
index aff4658c4a6..77953a640d8 100644
--- a/src/devices/cpu/mb86235/mb86235drc.cpp
+++ b/src/devices/cpu/mb86235/mb86235drc.cpp
@@ -13,7 +13,6 @@
#include "cpu/drcfe.h"
#include "cpu/drcuml.h"
#include "cpu/drcumlsh.h"
-#include "debugger.h"
#include "mb86235defs.h"
diff --git a/src/devices/cpu/mb86235/mb86235ops.cpp b/src/devices/cpu/mb86235/mb86235ops.cpp
index e79b9240cce..ba8cfb5e776 100644
--- a/src/devices/cpu/mb86235/mb86235ops.cpp
+++ b/src/devices/cpu/mb86235/mb86235ops.cpp
@@ -10,7 +10,6 @@
#include "emu.h"
#include "mb86235.h"
-#include "debugger.h"
/*********************
*
diff --git a/src/devices/cpu/mb88xx/mb88xx.cpp b/src/devices/cpu/mb88xx/mb88xx.cpp
index f606f8a80ec..c0d22203418 100644
--- a/src/devices/cpu/mb88xx/mb88xx.cpp
+++ b/src/devices/cpu/mb88xx/mb88xx.cpp
@@ -18,7 +18,6 @@
#include "emu.h"
#include "mb88xx.h"
#include "mb88dasm.h"
-#include "debugger.h"
DEFINE_DEVICE_TYPE(MB88201, mb88201_cpu_device, "mb88201", "Fujitsu MB88201")
diff --git a/src/devices/cpu/mc68hc11/mc68hc11.cpp b/src/devices/cpu/mc68hc11/mc68hc11.cpp
index 7c6503fb13d..0dd9b0d01a9 100644
--- a/src/devices/cpu/mc68hc11/mc68hc11.cpp
+++ b/src/devices/cpu/mc68hc11/mc68hc11.cpp
@@ -14,7 +14,6 @@ TODO:
*/
#include "emu.h"
-#include "debugger.h"
#include "mc68hc11.h"
#include "hc11dasm.h"
diff --git a/src/devices/cpu/mcs40/mcs40.cpp b/src/devices/cpu/mcs40/mcs40.cpp
index 969f08c4197..0b9b80c719f 100644
--- a/src/devices/cpu/mcs40/mcs40.cpp
+++ b/src/devices/cpu/mcs40/mcs40.cpp
@@ -10,7 +10,6 @@
#include "emu.h"
#include "mcs40.h"
#include "mcs40dasm.h"
-#include "debugger.h"
/*
diff --git a/src/devices/cpu/mcs48/mcs48.cpp b/src/devices/cpu/mcs48/mcs48.cpp
index 3745622661d..3bc9be2758f 100644
--- a/src/devices/cpu/mcs48/mcs48.cpp
+++ b/src/devices/cpu/mcs48/mcs48.cpp
@@ -87,8 +87,6 @@
#include "mcs48.h"
#include "mcs48dsm.h"
-#include "debugger.h"
-
/***************************************************************************
CONSTANTS
diff --git a/src/devices/cpu/mcs51/axc51-core.cpp b/src/devices/cpu/mcs51/axc51-core.cpp
index 104f3bb07bd..486722b09ab 100644
--- a/src/devices/cpu/mcs51/axc51-core.cpp
+++ b/src/devices/cpu/mcs51/axc51-core.cpp
@@ -22,7 +22,6 @@
*****************************************************************************/
#include "emu.h"
-#include "debugger.h"
#include "axc51-core.h"
#include "axc51-core_dasm.h"
diff --git a/src/devices/cpu/mcs51/mcs51.cpp b/src/devices/cpu/mcs51/mcs51.cpp
index 1da1752ba79..051a336f1e4 100644
--- a/src/devices/cpu/mcs51/mcs51.cpp
+++ b/src/devices/cpu/mcs51/mcs51.cpp
@@ -134,8 +134,6 @@
#include "mcs51.h"
#include "mcs51dasm.h"
-#include "debugger.h"
-
#define VERBOSE 0
#define LOG(x) do { if (VERBOSE) logerror x; } while (0)
diff --git a/src/devices/cpu/mcs96/mcs96.cpp b/src/devices/cpu/mcs96/mcs96.cpp
index a7a3f112c5d..5759469fcc0 100644
--- a/src/devices/cpu/mcs96/mcs96.cpp
+++ b/src/devices/cpu/mcs96/mcs96.cpp
@@ -9,7 +9,6 @@
***************************************************************************/
#include "emu.h"
-#include "debugger.h"
#include "mcs96.h"
mcs96_device::mcs96_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, int data_width, address_map_constructor regs_map) :
diff --git a/src/devices/cpu/minx/minx.cpp b/src/devices/cpu/minx/minx.cpp
index dcf11c24f25..018842ecfbd 100644
--- a/src/devices/cpu/minx/minx.cpp
+++ b/src/devices/cpu/minx/minx.cpp
@@ -48,7 +48,6 @@ TODO:
#include "emu.h"
#include "minx.h"
#include "minxd.h"
-#include "debugger.h"
#define FLAG_I 0x80
#define FLAG_D 0x40
diff --git a/src/devices/cpu/mips/mips1.cpp b/src/devices/cpu/mips/mips1.cpp
index 9b041123d4d..6f45a954d50 100644
--- a/src/devices/cpu/mips/mips1.cpp
+++ b/src/devices/cpu/mips/mips1.cpp
@@ -14,7 +14,6 @@
#include "emu.h"
#include "mips1.h"
#include "mips1dsm.h"
-#include "debugger.h"
#include "softfloat3/source/include/softfloat.h"
#define LOG_GENERAL (1U << 0)
diff --git a/src/devices/cpu/mips/mips3.cpp b/src/devices/cpu/mips/mips3.cpp
index 924ce3aa634..cb3c32a1a53 100644
--- a/src/devices/cpu/mips/mips3.cpp
+++ b/src/devices/cpu/mips/mips3.cpp
@@ -9,7 +9,6 @@
***************************************************************************/
#include "emu.h"
-#include "debugger.h"
#include "mips3.h"
#include "mips3com.h"
#include "mips3dsm.h"
diff --git a/src/devices/cpu/mips/mips3drc.cpp b/src/devices/cpu/mips/mips3drc.cpp
index 24813885088..c054f7b6640 100644
--- a/src/devices/cpu/mips/mips3drc.cpp
+++ b/src/devices/cpu/mips/mips3drc.cpp
@@ -24,7 +24,6 @@
***************************************************************************/
#include "emu.h"
-#include "debugger.h"
#include "mips3com.h"
#include "mips3fe.h"
#include "mips3dsm.h"
diff --git a/src/devices/cpu/mips/ps2vu.cpp b/src/devices/cpu/mips/ps2vu.cpp
index c27cd481731..8f0b125314d 100644
--- a/src/devices/cpu/mips/ps2vu.cpp
+++ b/src/devices/cpu/mips/ps2vu.cpp
@@ -14,7 +14,6 @@
#include "video/ps2gif.h"
#include "vudasm.h"
-#include "debugger.h"
DEFINE_DEVICE_TYPE(SONYPS2_VU0, sonyvu0_device, "sonyvu0", "Sony PlayStation 2 VU0")
DEFINE_DEVICE_TYPE(SONYPS2_VU1, sonyvu1_device, "sonyvu1", "Sony PlayStation 2 VU1")
diff --git a/src/devices/cpu/mips/r4000.cpp b/src/devices/cpu/mips/r4000.cpp
index fd98bf5b834..5f34864c0d1 100644
--- a/src/devices/cpu/mips/r4000.cpp
+++ b/src/devices/cpu/mips/r4000.cpp
@@ -27,7 +27,7 @@
*/
#include "emu.h"
-#include "debugger.h"
+#include "debug/debugcpu.h"
#include "r4000.h"
#include "mips3dsm.h"
#include "unicode.h"
diff --git a/src/devices/cpu/mn10200/mn10200.cpp b/src/devices/cpu/mn10200/mn10200.cpp
index 0f989d9844b..17c45aa0cc1 100644
--- a/src/devices/cpu/mn10200/mn10200.cpp
+++ b/src/devices/cpu/mn10200/mn10200.cpp
@@ -9,7 +9,6 @@
*/
#include "emu.h"
-#include "debugger.h"
#include "mn10200.h"
#include "mn102dis.h"
diff --git a/src/devices/cpu/nanoprocessor/nanoprocessor.cpp b/src/devices/cpu/nanoprocessor/nanoprocessor.cpp
index e218f53e505..197efcc0b4a 100644
--- a/src/devices/cpu/nanoprocessor/nanoprocessor.cpp
+++ b/src/devices/cpu/nanoprocessor/nanoprocessor.cpp
@@ -4,7 +4,6 @@
#include "emu.h"
#include "nanoprocessor.h"
#include "nanoprocessor_dasm.h"
-#include "debugger.h"
// Index of state variables
enum {
diff --git a/src/devices/cpu/nec/nec.cpp b/src/devices/cpu/nec/nec.cpp
index 052e6a6f348..3a961a0a4be 100644
--- a/src/devices/cpu/nec/nec.cpp
+++ b/src/devices/cpu/nec/nec.cpp
@@ -108,8 +108,6 @@
#include "nec.h"
#include "necdasm.h"
-#include "debugger.h"
-
typedef uint8_t BOOLEAN;
typedef uint8_t BYTE;
typedef uint16_t WORD;
diff --git a/src/devices/cpu/nec/v25.cpp b/src/devices/cpu/nec/v25.cpp
index f851717aaf2..20a87c5c50f 100644
--- a/src/devices/cpu/nec/v25.cpp
+++ b/src/devices/cpu/nec/v25.cpp
@@ -38,8 +38,6 @@
#include "v25.h"
#include "necdasm.h"
-#include "debugger.h"
-
typedef uint8_t BOOLEAN;
typedef uint8_t BYTE;
typedef uint16_t WORD;
diff --git a/src/devices/cpu/ns32000/ns32000.cpp b/src/devices/cpu/ns32000/ns32000.cpp
index 9b42edf1756..7049907709d 100644
--- a/src/devices/cpu/ns32000/ns32000.cpp
+++ b/src/devices/cpu/ns32000/ns32000.cpp
@@ -5,7 +5,7 @@
#include "ns32000.h"
#include "ns32000dasm.h"
-#include "debugger.h"
+#include "debug/debugcpu.h"
DEFINE_DEVICE_TYPE(NS32008, ns32008_device, "ns32008", "National Semiconductor NS32008")
DEFINE_DEVICE_TYPE(NS32016, ns32016_device, "ns32016", "National Semiconductor NS32016")
diff --git a/src/devices/cpu/nuon/nuon.cpp b/src/devices/cpu/nuon/nuon.cpp
index c9b12b4cacb..20ee36fd571 100644
--- a/src/devices/cpu/nuon/nuon.cpp
+++ b/src/devices/cpu/nuon/nuon.cpp
@@ -11,7 +11,6 @@
#include "emu.h"
#include "nuon.h"
#include "nuondasm.h"
-#include "debugger.h"
#define VERBOSE_LEVEL (0)
diff --git a/src/devices/cpu/patinhofeio/patinho_feio.cpp b/src/devices/cpu/patinhofeio/patinho_feio.cpp
index 4227c4ebea7..1e2b9f966fd 100644
--- a/src/devices/cpu/patinhofeio/patinho_feio.cpp
+++ b/src/devices/cpu/patinhofeio/patinho_feio.cpp
@@ -7,7 +7,6 @@
#include "emu.h"
#include "patinhofeio_cpu.h"
#include "patinho_feio_dasm.h"
-#include "debugger.h"
#include "includes/patinhofeio.h" // FIXME: this is a dependency from devices on MAME
#define PC m_pc //The program counter is called "contador de instrucoes" (IC) in portuguese
diff --git a/src/devices/cpu/pdp1/pdp1.cpp b/src/devices/cpu/pdp1/pdp1.cpp
index e2ced831593..77c97ebcddc 100644
--- a/src/devices/cpu/pdp1/pdp1.cpp
+++ b/src/devices/cpu/pdp1/pdp1.cpp
@@ -340,7 +340,6 @@
#include "emu.h"
-#include "debugger.h"
#include "pdp1.h"
#include "pdp1dasm.h"
diff --git a/src/devices/cpu/pdp8/pdp8.cpp b/src/devices/cpu/pdp8/pdp8.cpp
index c34281af2cb..31086b3fb48 100644
--- a/src/devices/cpu/pdp8/pdp8.cpp
+++ b/src/devices/cpu/pdp8/pdp8.cpp
@@ -7,7 +7,6 @@
*/
#include "emu.h"
-#include "debugger.h"
#include "pdp8.h"
#include "pdp8dasm.h"
diff --git a/src/devices/cpu/pic16c5x/pic16c5x.cpp b/src/devices/cpu/pic16c5x/pic16c5x.cpp
index c0aeeab5d8f..e6284b1412c 100644
--- a/src/devices/cpu/pic16c5x/pic16c5x.cpp
+++ b/src/devices/cpu/pic16c5x/pic16c5x.cpp
@@ -74,7 +74,6 @@
#include "emu.h"
#include "pic16c5x.h"
#include "16c5xdsm.h"
-#include "debugger.h"
DEFINE_DEVICE_TYPE(PIC16C54, pic16c54_device, "pic16c54", "Microchip PIC16C54")
diff --git a/src/devices/cpu/pic16c62x/pic16c62x.cpp b/src/devices/cpu/pic16c62x/pic16c62x.cpp
index 166b26b731e..ddb6d3c9bb8 100644
--- a/src/devices/cpu/pic16c62x/pic16c62x.cpp
+++ b/src/devices/cpu/pic16c62x/pic16c62x.cpp
@@ -55,7 +55,6 @@
#include "emu.h"
#include "pic16c62x.h"
#include "16c62xdsm.h"
-#include "debugger.h"
DEFINE_DEVICE_TYPE(PIC16C620, pic16c620_device, "pic16c620", "Microchip PIC16C620")
diff --git a/src/devices/cpu/powerpc/ppcdrc.cpp b/src/devices/cpu/powerpc/ppcdrc.cpp
index 520c85423df..ce94cfbec7c 100644
--- a/src/devices/cpu/powerpc/ppcdrc.cpp
+++ b/src/devices/cpu/powerpc/ppcdrc.cpp
@@ -22,7 +22,6 @@
#include "cpu/drcfe.h"
#include "cpu/drcuml.h"
#include "cpu/drcumlsh.h"
-#include "debugger.h"
diff --git a/src/devices/cpu/pps4/pps4.cpp b/src/devices/cpu/pps4/pps4.cpp
index 6603d96db02..5b2a376536a 100644
--- a/src/devices/cpu/pps4/pps4.cpp
+++ b/src/devices/cpu/pps4/pps4.cpp
@@ -78,7 +78,6 @@
#include "emu.h"
#include "pps4.h"
#include "pps4dasm.h"
-#include "debugger.h"
#define VERBOSE 0 //!< set to 1 to log certain instruction conditions
diff --git a/src/devices/cpu/psx/psx.cpp b/src/devices/cpu/psx/psx.cpp
index 174eb4298d8..88c1e61aad9 100644
--- a/src/devices/cpu/psx/psx.cpp
+++ b/src/devices/cpu/psx/psx.cpp
@@ -70,7 +70,6 @@
#include "mdec.h"
#include "rcnt.h"
#include "sound/spu.h"
-#include "debugger.h"
#include "psxdefs.h"
diff --git a/src/devices/cpu/romp/romp.cpp b/src/devices/cpu/romp/romp.cpp
index 94e3da8591c..bd652f7adc2 100644
--- a/src/devices/cpu/romp/romp.cpp
+++ b/src/devices/cpu/romp/romp.cpp
@@ -17,7 +17,6 @@
#include "emu.h"
#include "romp.h"
#include "rompdasm.h"
-#include "debugger.h"
#define LOG_GENERAL (1U << 0)
#define LOG_INTERRUPT (1U << 1)
diff --git a/src/devices/cpu/rsp/rsp.cpp b/src/devices/cpu/rsp/rsp.cpp
index ec924250d6d..6e280b7003c 100644
--- a/src/devices/cpu/rsp/rsp.cpp
+++ b/src/devices/cpu/rsp/rsp.cpp
@@ -9,8 +9,6 @@
#include "emu.h"
#include "rsp.h"
-#include "debugger.h"
-
#include "rspdefs.h"
#include "rspdiv.h"
diff --git a/src/devices/cpu/s2650/s2650.cpp b/src/devices/cpu/s2650/s2650.cpp
index ccdc5694cd2..4b668f569a7 100644
--- a/src/devices/cpu/s2650/s2650.cpp
+++ b/src/devices/cpu/s2650/s2650.cpp
@@ -13,7 +13,6 @@
*************************************************************************/
#include "emu.h"
-#include "debugger.h"
#include "s2650.h"
#include "s2650cpu.h"
diff --git a/src/devices/cpu/saturn/saturn.cpp b/src/devices/cpu/saturn/saturn.cpp
index c7baae6770f..fcbafdb5a7f 100644
--- a/src/devices/cpu/saturn/saturn.cpp
+++ b/src/devices/cpu/saturn/saturn.cpp
@@ -12,8 +12,6 @@
#include "emu.h"
#include "saturn.h"
-#include "debugger.h"
-
//#define VERBOSE 1
#include "logmacro.h"
diff --git a/src/devices/cpu/sc61860/sc61860.cpp b/src/devices/cpu/sc61860/sc61860.cpp
index 461e52c786e..cac673f70e7 100644
--- a/src/devices/cpu/sc61860/sc61860.cpp
+++ b/src/devices/cpu/sc61860/sc61860.cpp
@@ -20,7 +20,6 @@
#include "emu.h"
#include "sc61860.h"
#include "scdasm.h"
-#include "debugger.h"
#define I 0
diff --git a/src/devices/cpu/scmp/scmp.cpp b/src/devices/cpu/scmp/scmp.cpp
index a9021737300..5eb4bba0be9 100644
--- a/src/devices/cpu/scmp/scmp.cpp
+++ b/src/devices/cpu/scmp/scmp.cpp
@@ -12,8 +12,6 @@
#include "scmp.h"
#include "scmpdasm.h"
-#include "debugger.h"
-
//#define VERBOSE 1
#include "logmacro.h"
diff --git a/src/devices/cpu/score/score.cpp b/src/devices/cpu/score/score.cpp
index f541c27a0fe..71fad96d0a1 100644
--- a/src/devices/cpu/score/score.cpp
+++ b/src/devices/cpu/score/score.cpp
@@ -14,7 +14,6 @@
******************************************************************************/
#include "emu.h"
-#include "debugger.h"
#include "score.h"
#include "scoredsm.h"
diff --git a/src/devices/cpu/scudsp/scudsp.cpp b/src/devices/cpu/scudsp/scudsp.cpp
index 7db8e88cb80..56b2a3cbc5b 100644
--- a/src/devices/cpu/scudsp/scudsp.cpp
+++ b/src/devices/cpu/scudsp/scudsp.cpp
@@ -94,8 +94,6 @@
#include "scudsp.h"
#include "scudspdasm.h"
-#include "debugger.h"
-
DEFINE_DEVICE_TYPE(SCUDSP, scudsp_cpu_device, "scudsp", "Sega SCUDSP")
diff --git a/src/devices/cpu/se3208/se3208.cpp b/src/devices/cpu/se3208/se3208.cpp
index 71235c9423d..f67ed4e0948 100644
--- a/src/devices/cpu/se3208/se3208.cpp
+++ b/src/devices/cpu/se3208/se3208.cpp
@@ -4,8 +4,6 @@
#include "se3208.h"
#include "se3208dis.h"
-#include "debugger.h"
-
/*
SE3208 CPU Emulator by ElSemi
diff --git a/src/devices/cpu/sh/sh2.cpp b/src/devices/cpu/sh/sh2.cpp
index d46a2f5fdc0..302b1082284 100644
--- a/src/devices/cpu/sh/sh2.cpp
+++ b/src/devices/cpu/sh/sh2.cpp
@@ -96,7 +96,6 @@
#include "sh2.h"
#include "sh2comn.h"
#include "sh_dasm.h"
-#include "debugger.h"
//#define VERBOSE 1
#include "logmacro.h"
@@ -861,7 +860,6 @@ void sh2_device::sh2_exception(const char *message, int irqline)
#include "sh2.h"
#include "sh2comn.h"
#include "cpu/drcumlsh.h"
-#include "debugger.h"
const opcode_desc* sh2_device::get_desclist(offs_t pc)
diff --git a/src/devices/cpu/sh/sh2comn.cpp b/src/devices/cpu/sh/sh2comn.cpp
index 6a9286649c2..89f37d54635 100644
--- a/src/devices/cpu/sh/sh2comn.cpp
+++ b/src/devices/cpu/sh/sh2comn.cpp
@@ -12,8 +12,6 @@
#include "sh2.h"
#include "sh2comn.h"
-#include "debugger.h"
-
//#define VERBOSE 1
#include "logmacro.h"
diff --git a/src/devices/cpu/sh/sh3comn.cpp b/src/devices/cpu/sh/sh3comn.cpp
index b8bb6f0b8a4..ebf674fe7de 100644
--- a/src/devices/cpu/sh/sh3comn.cpp
+++ b/src/devices/cpu/sh/sh3comn.cpp
@@ -3,7 +3,6 @@
/* Handlers for SH3 internals */
#include "emu.h"
-#include "debugger.h"
#include "sh4.h"
#include "sh4comn.h"
#include "sh3comn.h"
diff --git a/src/devices/cpu/sh/sh4.cpp b/src/devices/cpu/sh/sh4.cpp
index dbe1473a71d..c3dde9ed3e1 100644
--- a/src/devices/cpu/sh/sh4.cpp
+++ b/src/devices/cpu/sh/sh4.cpp
@@ -32,7 +32,6 @@
#include "sh4tmu.h"
#include "sh_dasm.h"
#include "cpu/drcumlsh.h"
-#include "debugger.h"
DEFINE_DEVICE_TYPE(SH3LE, sh3_device, "sh3le", "Hitachi SH-3 (little)")
diff --git a/src/devices/cpu/sh/sh4comn.cpp b/src/devices/cpu/sh/sh4comn.cpp
index a2ba6dbc7e9..ca7f42dc766 100644
--- a/src/devices/cpu/sh/sh4comn.cpp
+++ b/src/devices/cpu/sh/sh4comn.cpp
@@ -9,7 +9,6 @@
*****************************************************************************/
#include "emu.h"
-#include "debugger.h"
#include "sh4.h"
#include "sh4regs.h"
#include "sh4comn.h"
diff --git a/src/devices/cpu/sh/sh4dmac.cpp b/src/devices/cpu/sh/sh4dmac.cpp
index ba727d324c5..ae18202ab73 100644
--- a/src/devices/cpu/sh/sh4dmac.cpp
+++ b/src/devices/cpu/sh/sh4dmac.cpp
@@ -3,7 +3,6 @@
/* SHA3/4 DMA Controller */
#include "emu.h"
-#include "debugger.h"
#include "sh4.h"
#include "sh4comn.h"
#include "sh3comn.h"
diff --git a/src/devices/cpu/sh/sh4tmu.cpp b/src/devices/cpu/sh/sh4tmu.cpp
index 3e497f04c23..8bcce44b37a 100644
--- a/src/devices/cpu/sh/sh4tmu.cpp
+++ b/src/devices/cpu/sh/sh4tmu.cpp
@@ -3,7 +3,6 @@
/* SH3/4 Timer Unit */
#include "emu.h"
-#include "debugger.h"
#include "sh4.h"
#include "sh4comn.h"
#include "sh3comn.h"
diff --git a/src/devices/cpu/sharc/sharc.cpp b/src/devices/cpu/sharc/sharc.cpp
index cec93888548..a2b262d83e1 100644
--- a/src/devices/cpu/sharc/sharc.cpp
+++ b/src/devices/cpu/sharc/sharc.cpp
@@ -10,8 +10,6 @@
#include "sharcfe.h"
#include "sharcdsm.h"
-#include "debugger.h"
-
#define DISABLE_FAST_REGISTERS 1
diff --git a/src/devices/cpu/sharc/sharcdrc.cpp b/src/devices/cpu/sharc/sharcdrc.cpp
index 2ad45389896..94f017df4b5 100644
--- a/src/devices/cpu/sharc/sharcdrc.cpp
+++ b/src/devices/cpu/sharc/sharcdrc.cpp
@@ -8,7 +8,6 @@
******************************************************************************/
#include "emu.h"
-#include "debugger.h"
#include "sharc.h"
#include "sharcfe.h"
#include "cpu/drcfe.h"
diff --git a/src/devices/cpu/sm8500/sm8500.cpp b/src/devices/cpu/sm8500/sm8500.cpp
index d5ad5050063..d85b845d3dc 100644
--- a/src/devices/cpu/sm8500/sm8500.cpp
+++ b/src/devices/cpu/sm8500/sm8500.cpp
@@ -22,7 +22,6 @@ they are internally.
#include "emu.h"
#include "sm8500.h"
#include "sm8500d.h"
-#include "debugger.h"
DEFINE_DEVICE_TYPE(SM8500, sm8500_cpu_device, "sm8500", "Sharp SM8500")
diff --git a/src/devices/cpu/sparc/sparc.cpp b/src/devices/cpu/sparc/sparc.cpp
index 7e61b496a71..137f953433f 100644
--- a/src/devices/cpu/sparc/sparc.cpp
+++ b/src/devices/cpu/sparc/sparc.cpp
@@ -24,8 +24,6 @@
#include "sparc.h"
#include "sparcdefs.h"
-#include "debugger.h"
-
#include "softfloat3/source/include/softfloat.h"
#define LOG_BIU_CTRL (1U << 1)
diff --git a/src/devices/cpu/sparc/ss1fcode.ipp b/src/devices/cpu/sparc/ss1fcode.ipp
index 331d8924d07..35b2cd7cd72 100644
--- a/src/devices/cpu/sparc/ss1fcode.ipp
+++ b/src/devices/cpu/sparc/ss1fcode.ipp
@@ -23,7 +23,7 @@ void sparc_base_device::log_fcodes()
if (false)//opcode == 0x6304)
{
m_log_fcodes = true;
- //machine().debugger().debug_break();
+ //machine().debug_break();
}
else if (!m_log_fcodes)
{
diff --git a/src/devices/cpu/spc700/spc700.cpp b/src/devices/cpu/spc700/spc700.cpp
index ec6473d19da..b477ee008a1 100644
--- a/src/devices/cpu/spc700/spc700.cpp
+++ b/src/devices/cpu/spc700/spc700.cpp
@@ -58,8 +58,6 @@ Address Function Register R/W When Reset Remarks
#include "emu.h"
#include "spc700.h"
-#include "debugger.h"
-
#include <climits>
diff --git a/src/devices/cpu/ssem/ssem.cpp b/src/devices/cpu/ssem/ssem.cpp
index 6f074de3551..77bc62edb14 100644
--- a/src/devices/cpu/ssem/ssem.cpp
+++ b/src/devices/cpu/ssem/ssem.cpp
@@ -7,7 +7,6 @@
*/
#include "emu.h"
-#include "debugger.h"
#include "ssem.h"
#include "ssemdasm.h"
diff --git a/src/devices/cpu/ssp1601/ssp1601.cpp b/src/devices/cpu/ssp1601/ssp1601.cpp
index 79119b6a97a..245cfca4541 100644
--- a/src/devices/cpu/ssp1601/ssp1601.cpp
+++ b/src/devices/cpu/ssp1601/ssp1601.cpp
@@ -20,8 +20,6 @@
#include "ssp1601.h"
#include "ssp1601d.h"
-#include "debugger.h"
-
/* detect ops with unimplemented/invalid fields.
* Useful for homebrew or if a new VR revision pops up. */
diff --git a/src/devices/cpu/superfx/superfx.cpp b/src/devices/cpu/superfx/superfx.cpp
index b467bf82903..e14ac788c5e 100644
--- a/src/devices/cpu/superfx/superfx.cpp
+++ b/src/devices/cpu/superfx/superfx.cpp
@@ -1,7 +1,6 @@
// license:GPL-2.0+
// copyright-holders:byuu
#include "emu.h"
-#include "debugger.h"
#include "superfx.h"
diff --git a/src/devices/cpu/t11/t11.cpp b/src/devices/cpu/t11/t11.cpp
index c420d222af4..422ea6e0510 100644
--- a/src/devices/cpu/t11/t11.cpp
+++ b/src/devices/cpu/t11/t11.cpp
@@ -14,7 +14,6 @@
#include "emu.h"
#include "t11.h"
#include "t11dasm.h"
-#include "debugger.h"
/*************************************
diff --git a/src/devices/cpu/tlcs870/tlcs870.cpp b/src/devices/cpu/tlcs870/tlcs870.cpp
index d35b3183a57..13f92343786 100644
--- a/src/devices/cpu/tlcs870/tlcs870.cpp
+++ b/src/devices/cpu/tlcs870/tlcs870.cpp
@@ -15,7 +15,6 @@
#include "emu.h"
#include "tlcs870.h"
#include "tlcs870d.h"
-#include "debugger.h"
//#define VERBOSE 1
#include "logmacro.h"
diff --git a/src/devices/cpu/tlcs870/tlcs870_ops.cpp b/src/devices/cpu/tlcs870/tlcs870_ops.cpp
index f9e415e7b8c..ec133e12eaa 100644
--- a/src/devices/cpu/tlcs870/tlcs870_ops.cpp
+++ b/src/devices/cpu/tlcs870/tlcs870_ops.cpp
@@ -11,7 +11,6 @@
#include "emu.h"
#include "tlcs870.h"
#include "tlcs870d.h"
-#include "debugger.h"
// Main dispatch handlers for these
diff --git a/src/devices/cpu/tlcs870/tlcs870_ops_dst.cpp b/src/devices/cpu/tlcs870/tlcs870_ops_dst.cpp
index 058368d5a5d..eb31214c7de 100644
--- a/src/devices/cpu/tlcs870/tlcs870_ops_dst.cpp
+++ b/src/devices/cpu/tlcs870/tlcs870_ops_dst.cpp
@@ -25,7 +25,6 @@
#include "emu.h"
#include "tlcs870.h"
#include "tlcs870d.h"
-#include "debugger.h"
// Main dispatch handlers for these
diff --git a/src/devices/cpu/tlcs870/tlcs870_ops_helper.cpp b/src/devices/cpu/tlcs870/tlcs870_ops_helper.cpp
index d0e6f9de3ef..e2707bc311f 100644
--- a/src/devices/cpu/tlcs870/tlcs870_ops_helper.cpp
+++ b/src/devices/cpu/tlcs870/tlcs870_ops_helper.cpp
@@ -9,7 +9,6 @@
#include "emu.h"
#include "tlcs870.h"
#include "tlcs870d.h"
-#include "debugger.h"
// General Helpers
diff --git a/src/devices/cpu/tlcs870/tlcs870_ops_reg.cpp b/src/devices/cpu/tlcs870/tlcs870_ops_reg.cpp
index 74cbd7d071a..651783a7839 100644
--- a/src/devices/cpu/tlcs870/tlcs870_ops_reg.cpp
+++ b/src/devices/cpu/tlcs870/tlcs870_ops_reg.cpp
@@ -37,7 +37,6 @@
#include "emu.h"
#include "tlcs870.h"
#include "tlcs870d.h"
-#include "debugger.h"
// Main dispatch handlers for these
diff --git a/src/devices/cpu/tlcs870/tlcs870_ops_src.cpp b/src/devices/cpu/tlcs870/tlcs870_ops_src.cpp
index 3f4103f7b4a..da6ab52bc8d 100644
--- a/src/devices/cpu/tlcs870/tlcs870_ops_src.cpp
+++ b/src/devices/cpu/tlcs870/tlcs870_ops_src.cpp
@@ -25,7 +25,6 @@
#include "emu.h"
#include "tlcs870.h"
#include "tlcs870d.h"
-#include "debugger.h"
// Main dispatch handlers for these
diff --git a/src/devices/cpu/tlcs90/tlcs90.cpp b/src/devices/cpu/tlcs90/tlcs90.cpp
index f81f94ea5e5..a363781636c 100644
--- a/src/devices/cpu/tlcs90/tlcs90.cpp
+++ b/src/devices/cpu/tlcs90/tlcs90.cpp
@@ -13,7 +13,6 @@
*************************************************************************************************************/
#include "emu.h"
-#include "debugger.h"
#include "tlcs90.h"
#include "tlcs90d.h"
diff --git a/src/devices/cpu/tms32010/tms32010.cpp b/src/devices/cpu/tms32010/tms32010.cpp
index 44c1c1af4f5..7a9fb58b54c 100644
--- a/src/devices/cpu/tms32010/tms32010.cpp
+++ b/src/devices/cpu/tms32010/tms32010.cpp
@@ -60,7 +60,6 @@
#include "emu.h"
#include "tms32010.h"
#include "32010dsm.h"
-#include "debugger.h"
diff --git a/src/devices/cpu/tms32025/tms32025.cpp b/src/devices/cpu/tms32025/tms32025.cpp
index b629cdc97a5..304280555a1 100644
--- a/src/devices/cpu/tms32025/tms32025.cpp
+++ b/src/devices/cpu/tms32025/tms32025.cpp
@@ -121,7 +121,6 @@ Table 3-2. TMS32025/26 Memory Blocks
#include "emu.h"
#include "tms32025.h"
#include "32025dsm.h"
-#include "debugger.h"
#define CLK 4 /* 1 cycle equals 4 clock ticks */ /* PE/DI */
diff --git a/src/devices/cpu/tms32031/tms32031.cpp b/src/devices/cpu/tms32031/tms32031.cpp
index b46a2078498..f4516f27788 100644
--- a/src/devices/cpu/tms32031/tms32031.cpp
+++ b/src/devices/cpu/tms32031/tms32031.cpp
@@ -73,7 +73,6 @@
#include "emu.h"
#include "tms32031.h"
#include "dis32031.h"
-#include "debugger.h"
//**************************************************************************
diff --git a/src/devices/cpu/tms32051/tms32051.cpp b/src/devices/cpu/tms32051/tms32051.cpp
index e43b738b0cf..d03493df60f 100644
--- a/src/devices/cpu/tms32051/tms32051.cpp
+++ b/src/devices/cpu/tms32051/tms32051.cpp
@@ -9,7 +9,6 @@
#include "emu.h"
#include "tms32051.h"
#include "dis32051.h"
-#include "debugger.h"
enum
{
diff --git a/src/devices/cpu/tms32082/tms32082.cpp b/src/devices/cpu/tms32082/tms32082.cpp
index 330627829da..7b1486470c0 100644
--- a/src/devices/cpu/tms32082/tms32082.cpp
+++ b/src/devices/cpu/tms32082/tms32082.cpp
@@ -11,7 +11,6 @@
#include "tms32082.h"
#include "dis_pp.h"
#include "dis_mp.h"
-#include "debugger.h"
DEFINE_DEVICE_TYPE(TMS32082_MP, tms32082_mp_device, "tms32082_mp", "Texas Instruments TMS32082 MP")
DEFINE_DEVICE_TYPE(TMS32082_PP, tms32082_pp_device, "tms32082_pp", "Texas Instruments TMS32082 PP")
diff --git a/src/devices/cpu/tms34010/tms34010.cpp b/src/devices/cpu/tms34010/tms34010.cpp
index 7f88768552d..42faac82b5d 100644
--- a/src/devices/cpu/tms34010/tms34010.cpp
+++ b/src/devices/cpu/tms34010/tms34010.cpp
@@ -16,7 +16,6 @@
#include "tms34010.h"
#include "34010dsm.h"
-#include "debugger.h"
#include "screen.h"
#define LOG_GENERAL (1U << 0)
diff --git a/src/devices/cpu/tms57002/tms57002.cpp b/src/devices/cpu/tms57002/tms57002.cpp
index 51c18781ef5..e137a6b2efd 100644
--- a/src/devices/cpu/tms57002/tms57002.cpp
+++ b/src/devices/cpu/tms57002/tms57002.cpp
@@ -10,7 +10,6 @@
#include "emu.h"
#include "tms57002.h"
-#include "debugger.h"
#include "57002dsm.h"
diff --git a/src/devices/cpu/tms57002/tms57kdec.cpp b/src/devices/cpu/tms57002/tms57kdec.cpp
index 75af9b2af95..52592b5bfcc 100644
--- a/src/devices/cpu/tms57002/tms57kdec.cpp
+++ b/src/devices/cpu/tms57002/tms57kdec.cpp
@@ -9,7 +9,6 @@
***************************************************************************/
#include "emu.h"
-#include "debugger.h"
#include "tms57002.h"
#include <algorithm>
diff --git a/src/devices/cpu/tms7000/tms7000.h b/src/devices/cpu/tms7000/tms7000.h
index d1e871e839b..8d623f5c725 100644
--- a/src/devices/cpu/tms7000/tms7000.h
+++ b/src/devices/cpu/tms7000/tms7000.h
@@ -11,8 +11,6 @@
#pragma once
-#include "debugger.h"
-
enum { TMS7000_PC=1, TMS7000_SP, TMS7000_ST, TMS7000_A, TMS7000_B };
enum
diff --git a/src/devices/cpu/tms9900/ti990_10.h b/src/devices/cpu/tms9900/ti990_10.h
index 4baf8442422..93d3ecec4a0 100644
--- a/src/devices/cpu/tms9900/ti990_10.h
+++ b/src/devices/cpu/tms9900/ti990_10.h
@@ -11,7 +11,6 @@
#pragma once
-#include "debugger.h"
#include "tms99com.h"
class ti990_10_device : public cpu_device
diff --git a/src/devices/cpu/tms9900/tms9900.h b/src/devices/cpu/tms9900/tms9900.h
index de808fa0896..1be5e10f679 100644
--- a/src/devices/cpu/tms9900/tms9900.h
+++ b/src/devices/cpu/tms9900/tms9900.h
@@ -13,7 +13,6 @@
#pragma once
-#include "debugger.h"
#include "tms99com.h"
enum
diff --git a/src/devices/cpu/tms9900/tms9980a.h b/src/devices/cpu/tms9900/tms9980a.h
index 49c8dccfb70..9210007a5ec 100644
--- a/src/devices/cpu/tms9900/tms9980a.h
+++ b/src/devices/cpu/tms9900/tms9980a.h
@@ -10,7 +10,6 @@
#pragma once
-#include "debugger.h"
#include "tms9900.h"
enum
diff --git a/src/devices/cpu/tms9900/tms9995.h b/src/devices/cpu/tms9900/tms9995.h
index dc540ac95b5..8022ca74459 100644
--- a/src/devices/cpu/tms9900/tms9995.h
+++ b/src/devices/cpu/tms9900/tms9995.h
@@ -12,7 +12,6 @@
#pragma once
-#include "debugger.h"
#include "tms99com.h"
// device type definition
diff --git a/src/devices/cpu/tx0/tx0.cpp b/src/devices/cpu/tx0/tx0.cpp
index 0b669c48dca..2a7b0c3775b 100644
--- a/src/devices/cpu/tx0/tx0.cpp
+++ b/src/devices/cpu/tx0/tx0.cpp
@@ -13,7 +13,6 @@
#include "emu.h"
#include "tx0.h"
#include "tx0dasm.h"
-#include "debugger.h"
#define LOG_RIM (1 << 1U)
//#define VERBOSE (LOG_RIM)
diff --git a/src/devices/cpu/unsp/unsp.cpp b/src/devices/cpu/unsp/unsp.cpp
index f7de4e79846..f0c0b929454 100644
--- a/src/devices/cpu/unsp/unsp.cpp
+++ b/src/devices/cpu/unsp/unsp.cpp
@@ -20,8 +20,6 @@
#include "unsp.h"
#include "unspfe.h"
-#include "debugger.h"
-
#include "unspdasm.h"
#include <climits>
diff --git a/src/devices/cpu/unsp/unsp_extended.cpp b/src/devices/cpu/unsp/unsp_extended.cpp
index 3924f879230..bbfbefd1844 100644
--- a/src/devices/cpu/unsp/unsp_extended.cpp
+++ b/src/devices/cpu/unsp/unsp_extended.cpp
@@ -5,8 +5,6 @@
#include "unsp.h"
#include "unspfe.h"
-#include "debugger.h"
-
#include "unspdasm.h"
// TODO: the call conventions and general use of 'do_basic_alu_ops' from unsp_other.cpp could be cleaned up
diff --git a/src/devices/cpu/unsp/unsp_exxx.cpp b/src/devices/cpu/unsp/unsp_exxx.cpp
index a516562abd8..ac8a09d59ee 100644
--- a/src/devices/cpu/unsp/unsp_exxx.cpp
+++ b/src/devices/cpu/unsp/unsp_exxx.cpp
@@ -5,8 +5,6 @@
#include "unsp.h"
#include "unspfe.h"
-#include "debugger.h"
-
#include "unspdasm.h"
#define LOG_UNSP_MULS (1U << 1)
diff --git a/src/devices/cpu/unsp/unsp_fxxx.cpp b/src/devices/cpu/unsp/unsp_fxxx.cpp
index 13b7bd27995..8d232197c37 100644
--- a/src/devices/cpu/unsp/unsp_fxxx.cpp
+++ b/src/devices/cpu/unsp/unsp_fxxx.cpp
@@ -5,8 +5,6 @@
#include "unsp.h"
#include "unspfe.h"
-#include "debugger.h"
-
#include "unspdasm.h"
#include <climits>
diff --git a/src/devices/cpu/unsp/unsp_jumps.cpp b/src/devices/cpu/unsp/unsp_jumps.cpp
index 1ee92b3304a..6bb53b44cff 100644
--- a/src/devices/cpu/unsp/unsp_jumps.cpp
+++ b/src/devices/cpu/unsp/unsp_jumps.cpp
@@ -5,8 +5,6 @@
#include "unsp.h"
#include "unspfe.h"
-#include "debugger.h"
-
#include "unspdasm.h"
void unsp_device::execute_jumps(const uint16_t op)
diff --git a/src/devices/cpu/unsp/unsp_other.cpp b/src/devices/cpu/unsp/unsp_other.cpp
index 2717f7bd831..efbf27d1278 100644
--- a/src/devices/cpu/unsp/unsp_other.cpp
+++ b/src/devices/cpu/unsp/unsp_other.cpp
@@ -5,8 +5,6 @@
#include "unsp.h"
#include "unspfe.h"
-#include "debugger.h"
-
#include "unspdasm.h"
void unsp_device::execute_remaining(const uint16_t op)
diff --git a/src/devices/cpu/upd7725/upd7725.cpp b/src/devices/cpu/upd7725/upd7725.cpp
index d2d52a31959..cb63995abb3 100644
--- a/src/devices/cpu/upd7725/upd7725.cpp
+++ b/src/devices/cpu/upd7725/upd7725.cpp
@@ -12,7 +12,6 @@
****************************************************************************/
#include "emu.h"
-#include "debugger.h"
#include "upd7725.h"
#include "dasm7725.h"
diff --git a/src/devices/cpu/upd7810/upd7810.cpp b/src/devices/cpu/upd7810/upd7810.cpp
index 3ddbbb64612..2e7f9fff7ef 100644
--- a/src/devices/cpu/upd7810/upd7810.cpp
+++ b/src/devices/cpu/upd7810/upd7810.cpp
@@ -375,8 +375,6 @@ STOP 01001000 10111011 12 stop
#include "emu.h"
#include "upd7810.h"
-#include "debugger.h"
-
#include "upd7810_macros.h"
#include "upd7810_dasm.h"
diff --git a/src/devices/cpu/v30mz/v30mz.cpp b/src/devices/cpu/v30mz/v30mz.cpp
index 8e106bd563c..93c7ad1440e 100644
--- a/src/devices/cpu/v30mz/v30mz.cpp
+++ b/src/devices/cpu/v30mz/v30mz.cpp
@@ -22,7 +22,6 @@
#include "emu.h"
#include "v30mz.h"
#include "cpu/nec/necdasm.h"
-#include "debugger.h"
enum SREGS { DS1=0, PS, SS, DS0 };
diff --git a/src/devices/cpu/v60/v60.cpp b/src/devices/cpu/v60/v60.cpp
index 59d409358cc..fdce71f6808 100644
--- a/src/devices/cpu/v60/v60.cpp
+++ b/src/devices/cpu/v60/v60.cpp
@@ -76,7 +76,6 @@ Package: 132-pin PGA, 200-pin QFP
#include "emu.h"
#include "v60.h"
#include "v60d.h"
-#include "debugger.h"
DEFINE_DEVICE_TYPE(V60, v60_device, "v60", "NEC V60")
DEFINE_DEVICE_TYPE(V70, v70_device, "v70", "NEC V70")
diff --git a/src/devices/cpu/v810/v810.cpp b/src/devices/cpu/v810/v810.cpp
index 42a73ca9149..ddf14a2b7fe 100644
--- a/src/devices/cpu/v810/v810.cpp
+++ b/src/devices/cpu/v810/v810.cpp
@@ -30,7 +30,6 @@
#include "emu.h"
#include "v810.h"
#include "v810dasm.h"
-#include "debugger.h"
#define clkIF 3
#define clkMEM 3
diff --git a/src/devices/cpu/xavix2/xavix2.cpp b/src/devices/cpu/xavix2/xavix2.cpp
index 5527a1c6d78..2f1753b1523 100644
--- a/src/devices/cpu/xavix2/xavix2.cpp
+++ b/src/devices/cpu/xavix2/xavix2.cpp
@@ -4,7 +4,6 @@
#include "emu.h"
#include "xavix2.h"
#include "xavix2d.h"
-#include "debugger.h"
DEFINE_DEVICE_TYPE(XAVIX2, xavix2_device, "xavix2", "Xavix 2 CPU")
diff --git a/src/devices/cpu/z180/z180.cpp b/src/devices/cpu/z180/z180.cpp
index 18ded716eb7..dc7fe875b7e 100644
--- a/src/devices/cpu/z180/z180.cpp
+++ b/src/devices/cpu/z180/z180.cpp
@@ -57,7 +57,6 @@ Hitachi HD647180 series:
#include "emu.h"
#include "z180.h"
#include "z180dasm.h"
-#include "debugger.h"
//#define VERBOSE 1
#include "logmacro.h"
diff --git a/src/devices/cpu/z8/z8.cpp b/src/devices/cpu/z8/z8.cpp
index c4a64029792..ec63bb86d89 100644
--- a/src/devices/cpu/z8/z8.cpp
+++ b/src/devices/cpu/z8/z8.cpp
@@ -25,7 +25,6 @@
#include "emu.h"
#include "z8.h"
#include "z8dasm.h"
-#include "debugger.h"
#define LOG_TIMER (1 << 1U)
#define LOG_RECEIVE (1 << 2U)
diff --git a/src/devices/cpu/z80/z80.cpp b/src/devices/cpu/z80/z80.cpp
index bdce00888ae..df1bd7befbc 100644
--- a/src/devices/cpu/z80/z80.cpp
+++ b/src/devices/cpu/z80/z80.cpp
@@ -109,7 +109,6 @@
*****************************************************************************/
#include "emu.h"
-#include "debugger.h"
#include "z80.h"
#include "z80dasm.h"
diff --git a/src/devices/cpu/z80/z80dasm.cpp b/src/devices/cpu/z80/z80dasm.cpp
index 7ad69a20e5a..47c1049e98c 100644
--- a/src/devices/cpu/z80/z80dasm.cpp
+++ b/src/devices/cpu/z80/z80dasm.cpp
@@ -8,7 +8,6 @@
*****************************************************************************/
#include "emu.h"
-#include "debugger.h"
#include "z80dasm.h"
diff --git a/src/devices/cpu/z8000/z8000.cpp b/src/devices/cpu/z8000/z8000.cpp
index 5df67004181..8d462c7eddc 100644
--- a/src/devices/cpu/z8000/z8000.cpp
+++ b/src/devices/cpu/z8000/z8000.cpp
@@ -16,9 +16,6 @@
#include "z8000.h"
#include "z8000cpu.h"
-#include "debugger.h"
-#include "debug/debugcon.h"
-
//#define VERBOSE 1
#include "logmacro.h"