summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers
diff options
context:
space:
mode:
author Patrick Mackinlay <pmackinlay@hotmail.com>2018-05-15 14:53:07 +0700
committer Vas Crabb <cuavas@users.noreply.github.com>2018-05-15 17:53:07 +1000
commit44d80b6fb038216e410ab633ec80d7e8b2dd7bd2 (patch)
tree7345c41c047145e8072d46fe39537ba1e22549e0 /src/mame/drivers
parent37c6acfdad3fddcc28b0589bd61b523d26e40df7 (diff)
proposal: move z80daisy* to devices/machine (#3572)
* proposal: move z80daisy* to devices/machine Seems to me this is a machine, not a CPU? Main reason was to stop the Z80 CPU from being dragged into systems that don't have one just because they use a Z80 family peripheral. * missed this one (nw) * missed a spot (nw)
Diffstat (limited to 'src/mame/drivers')
-rw-r--r--src/mame/drivers/altos2.cpp2
-rw-r--r--src/mame/drivers/altos5.cpp2
-rw-r--r--src/mame/drivers/ampro.cpp2
-rw-r--r--src/mame/drivers/astrocde.cpp2
-rw-r--r--src/mame/drivers/attache.cpp2
-rw-r--r--src/mame/drivers/avt.cpp2
-rw-r--r--src/mame/drivers/babbage.cpp2
-rw-r--r--src/mame/drivers/bbcbc.cpp2
-rw-r--r--src/mame/drivers/bcs3.cpp2
-rw-r--r--src/mame/drivers/bigbord2.cpp2
-rw-r--r--src/mame/drivers/binbug.cpp2
-rw-r--r--src/mame/drivers/br8641.cpp2
-rw-r--r--src/mame/drivers/cchasm.cpp2
-rw-r--r--src/mame/drivers/ccs300.cpp2
-rw-r--r--src/mame/drivers/cedar_magnet.cpp2
-rw-r--r--src/mame/drivers/czk80.cpp2
-rw-r--r--src/mame/drivers/dlair.cpp2
-rw-r--r--src/mame/drivers/dmax8000.cpp2
-rw-r--r--src/mame/drivers/dsb46.cpp2
-rw-r--r--src/mame/drivers/einstein.cpp4
-rw-r--r--src/mame/drivers/gp_1.cpp2
-rw-r--r--src/mame/drivers/gp_2.cpp2
-rw-r--r--src/mame/drivers/hazelgr.cpp2
-rw-r--r--src/mame/drivers/jankenmn.cpp2
-rw-r--r--src/mame/drivers/m5.cpp2
-rw-r--r--src/mame/drivers/mc8020.cpp2
-rw-r--r--src/mame/drivers/mc8030.cpp2
-rw-r--r--src/mame/drivers/meritm.cpp2
-rw-r--r--src/mame/drivers/mtx.cpp2
-rw-r--r--src/mame/drivers/nanos.cpp2
-rw-r--r--src/mame/drivers/onyx.cpp2
-rw-r--r--src/mame/drivers/osbexec.cpp2
-rw-r--r--src/mame/drivers/p8k.cpp2
-rw-r--r--src/mame/drivers/pcm.cpp2
-rw-r--r--src/mame/drivers/pipeline.cpp2
-rw-r--r--src/mame/drivers/polyplay.cpp2
-rw-r--r--src/mame/drivers/pulsar.cpp2
-rw-r--r--src/mame/drivers/rc702.cpp2
-rw-r--r--src/mame/drivers/superslave.cpp2
-rw-r--r--src/mame/drivers/ts802.cpp2
-rw-r--r--src/mame/drivers/ts803.cpp2
-rw-r--r--src/mame/drivers/ts816.cpp2
-rw-r--r--src/mame/drivers/univac.cpp2
-rw-r--r--src/mame/drivers/z9001.cpp2
44 files changed, 45 insertions, 45 deletions
diff --git a/src/mame/drivers/altos2.cpp b/src/mame/drivers/altos2.cpp
index 79cd29713ab..bd3063f343f 100644
--- a/src/mame/drivers/altos2.cpp
+++ b/src/mame/drivers/altos2.cpp
@@ -16,7 +16,7 @@ Keyboard: P8035L CPU, undumped 2716 labelled "358_2758", XTAL marked "4608-300-1
#include "emu.h"
#include "cpu/z80/z80.h"
-#include "cpu/z80/z80daisy.h"
+#include "machine/z80daisy.h"
#include "machine/z80ctc.h"
#include "machine/z80dart.h"
#include "machine/clock.h"
diff --git a/src/mame/drivers/altos5.cpp b/src/mame/drivers/altos5.cpp
index f0f81f33994..a0a2391e14e 100644
--- a/src/mame/drivers/altos5.cpp
+++ b/src/mame/drivers/altos5.cpp
@@ -12,7 +12,7 @@
#include "emu.h"
#include "bus/rs232/rs232.h"
#include "cpu/z80/z80.h"
-#include "cpu/z80/z80daisy.h"
+#include "machine/z80daisy.h"
#include "machine/z80ctc.h"
#include "machine/z80pio.h"
#include "machine/z80sio.h"
diff --git a/src/mame/drivers/ampro.cpp b/src/mame/drivers/ampro.cpp
index e596f6bb9ca..8aa098b91b2 100644
--- a/src/mame/drivers/ampro.cpp
+++ b/src/mame/drivers/ampro.cpp
@@ -24,7 +24,7 @@ ToDo:
#include "emu.h"
#include "bus/rs232/rs232.h"
#include "cpu/z80/z80.h"
-#include "cpu/z80/z80daisy.h"
+#include "machine/z80daisy.h"
#include "machine/z80ctc.h"
#include "machine/z80dart.h"
#include "machine/wd_fdc.h"
diff --git a/src/mame/drivers/astrocde.cpp b/src/mame/drivers/astrocde.cpp
index c2e3025aa1f..d4d882d6d91 100644
--- a/src/mame/drivers/astrocde.cpp
+++ b/src/mame/drivers/astrocde.cpp
@@ -117,7 +117,7 @@
#include "includes/astrocde.h"
#include "cpu/z80/z80.h"
-#include "cpu/z80/z80daisy.h"
+#include "machine/z80daisy.h"
#include "machine/z80ctc.h"
#include "machine/nvram.h"
#include "machine/74259.h"
diff --git a/src/mame/drivers/attache.cpp b/src/mame/drivers/attache.cpp
index 51085bfad74..2f2f145b5ae 100644
--- a/src/mame/drivers/attache.cpp
+++ b/src/mame/drivers/attache.cpp
@@ -67,7 +67,7 @@
#include "emu.h"
#include "cpu/z80/z80.h"
-#include "cpu/z80/z80daisy.h"
+#include "machine/z80daisy.h"
#include "bus/rs232/rs232.h"
#include "machine/am9517a.h"
#include "machine/clock.h"
diff --git a/src/mame/drivers/avt.cpp b/src/mame/drivers/avt.cpp
index f07083299bb..2705902e91d 100644
--- a/src/mame/drivers/avt.cpp
+++ b/src/mame/drivers/avt.cpp
@@ -418,7 +418,7 @@
#include "emu.h"
#include "cpu/z80/z80.h"
-#include "cpu/z80/z80daisy.h"
+#include "machine/z80daisy.h"
#include "machine/nvram.h"
#include "sound/ay8910.h"
#include "video/mc6845.h"
diff --git a/src/mame/drivers/babbage.cpp b/src/mame/drivers/babbage.cpp
index 4879a58178a..212be497e07 100644
--- a/src/mame/drivers/babbage.cpp
+++ b/src/mame/drivers/babbage.cpp
@@ -27,7 +27,7 @@
#include "machine/timer.h"
#include "machine/z80ctc.h"
#include "machine/z80pio.h"
-#include "cpu/z80/z80daisy.h"
+#include "machine/z80daisy.h"
#include "babbage.lh"
#define MAIN_CLOCK 25e5
diff --git a/src/mame/drivers/bbcbc.cpp b/src/mame/drivers/bbcbc.cpp
index 0b739a4fcf3..f1f09355898 100644
--- a/src/mame/drivers/bbcbc.cpp
+++ b/src/mame/drivers/bbcbc.cpp
@@ -31,7 +31,7 @@
#include "cpu/z80/z80.h"
#include "video/tms9928a.h"
#include "machine/z80pio.h"
-#include "cpu/z80/z80daisy.h"
+#include "machine/z80daisy.h"
#include "bus/generic/slot.h"
#include "bus/generic/carts.h"
#include "softlist.h"
diff --git a/src/mame/drivers/bcs3.cpp b/src/mame/drivers/bcs3.cpp
index 22214e186eb..49048b0c316 100644
--- a/src/mame/drivers/bcs3.cpp
+++ b/src/mame/drivers/bcs3.cpp
@@ -50,7 +50,7 @@
#include "emu.h"
#include "cpu/z80/z80.h"
-#include "cpu/z80/z80daisy.h"
+#include "machine/z80daisy.h"
#include "machine/z80ctc.h"
#include "imagedev/cassette.h"
#include "screen.h"
diff --git a/src/mame/drivers/bigbord2.cpp b/src/mame/drivers/bigbord2.cpp
index 1c73812a6e2..19c31ef7186 100644
--- a/src/mame/drivers/bigbord2.cpp
+++ b/src/mame/drivers/bigbord2.cpp
@@ -72,7 +72,7 @@ X - change banks
#include "emu.h"
#include "cpu/z80/z80.h"
-#include "cpu/z80/z80daisy.h"
+#include "machine/z80daisy.h"
#include "machine/74259.h"
#include "machine/clock.h"
#include "machine/keyboard.h"
diff --git a/src/mame/drivers/binbug.cpp b/src/mame/drivers/binbug.cpp
index 602dd0fc9e5..0901fbe52b6 100644
--- a/src/mame/drivers/binbug.cpp
+++ b/src/mame/drivers/binbug.cpp
@@ -53,7 +53,7 @@
#include "emu.h"
#include "bus/rs232/keyboard.h"
#include "cpu/s2650/s2650.h"
-#include "cpu/z80/z80daisy.h"
+#include "machine/z80daisy.h"
#include "cpu/z80/z80.h"
#include "imagedev/cassette.h"
#include "imagedev/snapquik.h"
diff --git a/src/mame/drivers/br8641.cpp b/src/mame/drivers/br8641.cpp
index f69fceadb1d..784bf0ab3f1 100644
--- a/src/mame/drivers/br8641.cpp
+++ b/src/mame/drivers/br8641.cpp
@@ -24,7 +24,7 @@ ToDo:
#include "emu.h"
#include "cpu/z80/z80.h"
-#include "cpu/z80/z80daisy.h"
+#include "machine/z80daisy.h"
#include "machine/z80ctc.h"
#include "machine/z80pio.h"
#include "sound/beep.h"
diff --git a/src/mame/drivers/cchasm.cpp b/src/mame/drivers/cchasm.cpp
index 36acac5643e..b87c198dcb9 100644
--- a/src/mame/drivers/cchasm.cpp
+++ b/src/mame/drivers/cchasm.cpp
@@ -18,7 +18,7 @@
#include "includes/cchasm.h"
#include "cpu/z80/z80.h"
-#include "cpu/z80/z80daisy.h"
+#include "machine/z80daisy.h"
#include "cpu/m68000/m68000.h"
#include "machine/6840ptm.h"
#include "machine/z80ctc.h"
diff --git a/src/mame/drivers/ccs300.cpp b/src/mame/drivers/ccs300.cpp
index 8343f16b21d..753e9e26f0d 100644
--- a/src/mame/drivers/ccs300.cpp
+++ b/src/mame/drivers/ccs300.cpp
@@ -20,7 +20,7 @@ Since IM2 is used, it is assumed there are Z80 peripherals on board.
#include "emu.h"
#include "cpu/z80/z80.h"
-#include "cpu/z80/z80daisy.h"
+#include "machine/z80daisy.h"
#include "machine/z80ctc.h"
#include "machine/z80pio.h"
#include "machine/z80sio.h"
diff --git a/src/mame/drivers/cedar_magnet.cpp b/src/mame/drivers/cedar_magnet.cpp
index e84cb28c374..a70217fc28f 100644
--- a/src/mame/drivers/cedar_magnet.cpp
+++ b/src/mame/drivers/cedar_magnet.cpp
@@ -104,7 +104,7 @@ I suspect the additional memory was an afterthought.
#include "emu.h"
#include "cpu/z80/z80.h"
-#include "cpu/z80/z80daisy.h"
+#include "machine/z80daisy.h"
#include "machine/z80pio.h"
#include "machine/bankdev.h"
#include "machine/z80ctc.h"
diff --git a/src/mame/drivers/czk80.cpp b/src/mame/drivers/czk80.cpp
index c84f66972fc..0227b4aa6a7 100644
--- a/src/mame/drivers/czk80.cpp
+++ b/src/mame/drivers/czk80.cpp
@@ -43,7 +43,7 @@ I/O ports: These ranges are what is guessed
#include "emu.h"
#include "cpu/z80/z80.h"
#include "machine/upd765.h"
-#include "cpu/z80/z80daisy.h"
+#include "machine/z80daisy.h"
#include "machine/z80pio.h"
#include "machine/z80dart.h"
#include "machine/z80ctc.h"
diff --git a/src/mame/drivers/dlair.cpp b/src/mame/drivers/dlair.cpp
index e2b22408788..6be80bd004a 100644
--- a/src/mame/drivers/dlair.cpp
+++ b/src/mame/drivers/dlair.cpp
@@ -37,7 +37,7 @@
#include "emu.h"
#include "cpu/z80/z80.h"
-#include "cpu/z80/z80daisy.h"
+#include "machine/z80daisy.h"
#include "machine/ldv1000.h"
#include "machine/ldstub.h"
#include "machine/watchdog.h"
diff --git a/src/mame/drivers/dmax8000.cpp b/src/mame/drivers/dmax8000.cpp
index cbe4cca37d2..cbd6aac265a 100644
--- a/src/mame/drivers/dmax8000.cpp
+++ b/src/mame/drivers/dmax8000.cpp
@@ -26,7 +26,7 @@ What there is of the schematic shows no sign of a daisy chain or associated inte
#include "emu.h"
#include "cpu/z80/z80.h"
#include "machine/wd_fdc.h"
-#include "cpu/z80/z80daisy.h"
+#include "machine/z80daisy.h"
#include "machine/z80pio.h"
#include "machine/z80dart.h"
#include "machine/z80ctc.h"
diff --git a/src/mame/drivers/dsb46.cpp b/src/mame/drivers/dsb46.cpp
index b9460da2744..cb2fdfab783 100644
--- a/src/mame/drivers/dsb46.cpp
+++ b/src/mame/drivers/dsb46.cpp
@@ -30,7 +30,7 @@ Both roms contain Z80 code.
#include "emu.h"
#include "cpu/z80/z80.h"
-#include "cpu/z80/z80daisy.h"
+#include "machine/z80daisy.h"
#include "machine/z80ctc.h"
#include "machine/z80sio.h"
#include "machine/clock.h"
diff --git a/src/mame/drivers/einstein.cpp b/src/mame/drivers/einstein.cpp
index c464caef448..648cb61afa1 100644
--- a/src/mame/drivers/einstein.cpp
+++ b/src/mame/drivers/einstein.cpp
@@ -12,8 +12,8 @@
#include "emu.h"
#include "cpu/z80/z80.h"
-#include "cpu/z80/z80daisy.h"
-#include "cpu/z80/z80daisy_generic.h"
+#include "machine/z80daisy.h"
+#include "machine/z80daisy_generic.h"
#include "bus/centronics/ctronics.h"
#include "bus/einstein/pipe/pipe.h"
#include "bus/einstein/userport/userport.h"
diff --git a/src/mame/drivers/gp_1.cpp b/src/mame/drivers/gp_1.cpp
index 72ff9c4745c..7b9c91b54ba 100644
--- a/src/mame/drivers/gp_1.cpp
+++ b/src/mame/drivers/gp_1.cpp
@@ -23,7 +23,7 @@ ToDo:
#include "machine/genpin.h"
#include "cpu/z80/z80.h"
-#include "cpu/z80/z80daisy.h"
+#include "machine/z80daisy.h"
#include "machine/i8255.h"
#include "machine/timer.h"
#include "machine/z80ctc.h"
diff --git a/src/mame/drivers/gp_2.cpp b/src/mame/drivers/gp_2.cpp
index dda31d99109..d3ba29e39b8 100644
--- a/src/mame/drivers/gp_2.cpp
+++ b/src/mame/drivers/gp_2.cpp
@@ -36,7 +36,7 @@ ToDo:
#include "emu.h"
#include "machine/genpin.h"
#include "cpu/z80/z80.h"
-#include "cpu/z80/z80daisy.h"
+#include "machine/z80daisy.h"
#include "machine/i8255.h"
#include "machine/timer.h"
#include "machine/z80ctc.h"
diff --git a/src/mame/drivers/hazelgr.cpp b/src/mame/drivers/hazelgr.cpp
index 9496437a143..39d345451e6 100644
--- a/src/mame/drivers/hazelgr.cpp
+++ b/src/mame/drivers/hazelgr.cpp
@@ -8,7 +8,7 @@
#include "emu.h"
#include "cpu/z80/z80.h"
-#include "cpu/z80/z80daisy.h"
+#include "machine/z80daisy.h"
#include "machine/clock.h"
#include "machine/z80ctc.h"
#include "machine/z80pio.h"
diff --git a/src/mame/drivers/jankenmn.cpp b/src/mame/drivers/jankenmn.cpp
index 91e32d1c14b..51fcaafb088 100644
--- a/src/mame/drivers/jankenmn.cpp
+++ b/src/mame/drivers/jankenmn.cpp
@@ -147,7 +147,7 @@
#include "emu.h"
#include "cpu/z80/z80.h"
-#include "cpu/z80/z80daisy.h"
+#include "machine/z80daisy.h"
#include "machine/z80ctc.h"
#include "machine/i8255.h"
#include "sound/dac.h"
diff --git a/src/mame/drivers/m5.cpp b/src/mame/drivers/m5.cpp
index b462037f4b4..9417492d954 100644
--- a/src/mame/drivers/m5.cpp
+++ b/src/mame/drivers/m5.cpp
@@ -278,7 +278,7 @@ Few other notes:
#include "includes/m5.h"
#include "cpu/z80/z80.h"
-#include "cpu/z80/z80daisy.h"
+#include "machine/z80daisy.h"
#include "machine/z80ctc.h"
#include "sound/sn76496.h"
#include "video/tms9928a.h"
diff --git a/src/mame/drivers/mc8020.cpp b/src/mame/drivers/mc8020.cpp
index 8d93bff6333..4f611844ee0 100644
--- a/src/mame/drivers/mc8020.cpp
+++ b/src/mame/drivers/mc8020.cpp
@@ -17,7 +17,7 @@ ToDo:
#include "emu.h"
#include "cpu/z80/z80.h"
-#include "cpu/z80/z80daisy.h"
+#include "machine/z80daisy.h"
#include "machine/clock.h"
#include "machine/z80ctc.h"
#include "machine/z80pio.h"
diff --git a/src/mame/drivers/mc8030.cpp b/src/mame/drivers/mc8030.cpp
index eff74040e1d..2b65c6ead82 100644
--- a/src/mame/drivers/mc8030.cpp
+++ b/src/mame/drivers/mc8030.cpp
@@ -19,7 +19,7 @@ The asp ctc needs at least 2 triggers. The purpose of the zve pio is unknown.
#include "emu.h"
#include "cpu/z80/z80.h"
-#include "cpu/z80/z80daisy.h"
+#include "machine/z80daisy.h"
#include "screen.h"
#include "machine/clock.h"
#include "bus/rs232/rs232.h"
diff --git a/src/mame/drivers/meritm.cpp b/src/mame/drivers/meritm.cpp
index 20e1b135e05..001d469f427 100644
--- a/src/mame/drivers/meritm.cpp
+++ b/src/mame/drivers/meritm.cpp
@@ -175,7 +175,7 @@ Not all regional versions are available for each Megatouch series
#include "emu.h"
#include "cpu/z80/z80.h"
-#include "cpu/z80/z80daisy.h"
+#include "machine/z80daisy.h"
#include "machine/ds1204.h"
#include "machine/i8255.h"
#include "machine/ins8250.h"
diff --git a/src/mame/drivers/mtx.cpp b/src/mame/drivers/mtx.cpp
index 5bab0f31bec..74b5c782b24 100644
--- a/src/mame/drivers/mtx.cpp
+++ b/src/mame/drivers/mtx.cpp
@@ -25,7 +25,7 @@
#include "bus/centronics/ctronics.h"
#include "cpu/z80/z80.h"
-#include "cpu/z80/z80daisy.h"
+#include "machine/z80daisy.h"
#include "imagedev/cassette.h"
#include "imagedev/snapquik.h"
#include "machine/ram.h"
diff --git a/src/mame/drivers/nanos.cpp b/src/mame/drivers/nanos.cpp
index ef7dfd2b1c9..02ba9f8dfb6 100644
--- a/src/mame/drivers/nanos.cpp
+++ b/src/mame/drivers/nanos.cpp
@@ -11,7 +11,7 @@
#include "emu.h"
#include "cpu/z80/z80.h"
-#include "cpu/z80/z80daisy.h"
+#include "machine/z80daisy.h"
#include "machine/ram.h"
#include "machine/timer.h"
#include "machine/upd765.h"
diff --git a/src/mame/drivers/onyx.cpp b/src/mame/drivers/onyx.cpp
index 82ffac4177e..7cb100c5b6e 100644
--- a/src/mame/drivers/onyx.cpp
+++ b/src/mame/drivers/onyx.cpp
@@ -38,7 +38,7 @@ To Do:
#include "cpu/z8000/z8000.h"
#include "machine/clock.h"
#include "bus/rs232/rs232.h"
-//#include "cpu/z80/z80daisy.h"
+//#include "machine/z80daisy.h"
#include "machine/z80ctc.h"
#include "machine/z80pio.h"
#include "machine/z80sio.h"
diff --git a/src/mame/drivers/osbexec.cpp b/src/mame/drivers/osbexec.cpp
index f5caec07feb..d31a8f2dec4 100644
--- a/src/mame/drivers/osbexec.cpp
+++ b/src/mame/drivers/osbexec.cpp
@@ -10,7 +10,7 @@
#include "bus/rs232/rs232.h"
#include "cpu/z80/z80.h"
-#include "cpu/z80/z80daisy.h"
+#include "machine/z80daisy.h"
#include "machine/6821pia.h"
#include "machine/input_merger.h"
#include "machine/pit8253.h"
diff --git a/src/mame/drivers/p8k.cpp b/src/mame/drivers/p8k.cpp
index bde0bdb5639..79d0deef044 100644
--- a/src/mame/drivers/p8k.cpp
+++ b/src/mame/drivers/p8k.cpp
@@ -47,7 +47,7 @@
#include "emu.h"
#include "cpu/z80/z80.h"
-#include "cpu/z80/z80daisy.h"
+#include "machine/z80daisy.h"
#include "cpu/z8000/z8000.h"
#include "machine/upd765.h"
#include "machine/z80ctc.h"
diff --git a/src/mame/drivers/pcm.cpp b/src/mame/drivers/pcm.cpp
index 29a9347d4be..f012b56bfd4 100644
--- a/src/mame/drivers/pcm.cpp
+++ b/src/mame/drivers/pcm.cpp
@@ -54,7 +54,7 @@
#include "emu.h"
#include "cpu/z80/z80.h"
-#include "cpu/z80/z80daisy.h"
+#include "machine/z80daisy.h"
#include "imagedev/cassette.h"
#include "machine/k7659kb.h"
#include "machine/z80ctc.h"
diff --git a/src/mame/drivers/pipeline.cpp b/src/mame/drivers/pipeline.cpp
index be7c78008f2..27acef0d319 100644
--- a/src/mame/drivers/pipeline.cpp
+++ b/src/mame/drivers/pipeline.cpp
@@ -69,7 +69,7 @@ Stephh's notes (based on the games Z80 code and some tests) :
#include "cpu/m6805/m68705.h"
#include "cpu/z80/z80.h"
-#include "cpu/z80/z80daisy.h"
+#include "machine/z80daisy.h"
#include "machine/i8255.h"
#include "machine/z80ctc.h"
diff --git a/src/mame/drivers/polyplay.cpp b/src/mame/drivers/polyplay.cpp
index 9f494c62735..45d9e92b971 100644
--- a/src/mame/drivers/polyplay.cpp
+++ b/src/mame/drivers/polyplay.cpp
@@ -130,7 +130,7 @@ playing the automaton. Bits 0-2 of PORTB control the organ.
#include "includes/polyplay.h"
#include "cpu/z80/z80.h"
-#include "cpu/z80/z80daisy.h"
+#include "machine/z80daisy.h"
#include "screen.h"
#include "speaker.h"
diff --git a/src/mame/drivers/pulsar.cpp b/src/mame/drivers/pulsar.cpp
index a89d40df53b..68d2c46e03c 100644
--- a/src/mame/drivers/pulsar.cpp
+++ b/src/mame/drivers/pulsar.cpp
@@ -38,7 +38,7 @@ X - Test off-board memory banks
#include "emu.h"
#include "bus/rs232/rs232.h"
#include "cpu/z80/z80.h"
-#include "cpu/z80/z80daisy.h"
+#include "machine/z80daisy.h"
#include "machine/z80dart.h"
#include "machine/msm5832.h"
#include "machine/i8255.h"
diff --git a/src/mame/drivers/rc702.cpp b/src/mame/drivers/rc702.cpp
index 3bfcf0ba9a6..b10f0ce2a71 100644
--- a/src/mame/drivers/rc702.cpp
+++ b/src/mame/drivers/rc702.cpp
@@ -22,7 +22,7 @@ Issues:
#include "bus/rs232/rs232.h"
#include "cpu/z80/z80.h"
-#include "cpu/z80/z80daisy.h"
+#include "machine/z80daisy.h"
#include "machine/7474.h"
#include "machine/am9517a.h"
#include "machine/clock.h"
diff --git a/src/mame/drivers/superslave.cpp b/src/mame/drivers/superslave.cpp
index 028247d6f40..f01dfe921e3 100644
--- a/src/mame/drivers/superslave.cpp
+++ b/src/mame/drivers/superslave.cpp
@@ -24,7 +24,7 @@ Oxx,yy = Out port
#include "bus/rs232/rs232.h"
//#include "bus/s100/s100.h"
#include "cpu/z80/z80.h"
-#include "cpu/z80/z80daisy.h"
+#include "machine/z80daisy.h"
#include "machine/am9519.h"
#include "machine/com8116.h"
#include "machine/ram.h"
diff --git a/src/mame/drivers/ts802.cpp b/src/mame/drivers/ts802.cpp
index 5af715a55f1..eab513a9b10 100644
--- a/src/mame/drivers/ts802.cpp
+++ b/src/mame/drivers/ts802.cpp
@@ -23,7 +23,7 @@
#include "emu.h"
#include "cpu/z80/z80.h"
-#include "cpu/z80/z80daisy.h"
+#include "machine/z80daisy.h"
#include "machine/terminal.h"
#include "machine/z80dma.h"
#include "machine/z80ctc.h"
diff --git a/src/mame/drivers/ts803.cpp b/src/mame/drivers/ts803.cpp
index 571ef3dfecf..fe5ca66fa87 100644
--- a/src/mame/drivers/ts803.cpp
+++ b/src/mame/drivers/ts803.cpp
@@ -48,7 +48,7 @@ PAGE SEL bit in PORT0 set to 1:
#include "machine/clock.h"
#include "bus/rs232/rs232.h"
#include "cpu/z80/z80.h"
-#include "cpu/z80/z80daisy.h"
+#include "machine/z80daisy.h"
#include "machine/keyboard.h"
#include "machine/timer.h"
#include "machine/z80dart.h"
diff --git a/src/mame/drivers/ts816.cpp b/src/mame/drivers/ts816.cpp
index 432074ebd90..1aa9bf9dcf5 100644
--- a/src/mame/drivers/ts816.cpp
+++ b/src/mame/drivers/ts816.cpp
@@ -20,7 +20,7 @@ TODO:
#include "emu.h"
#include "cpu/z80/z80.h"
#include "machine/terminal.h"
-#include "cpu/z80/z80daisy.h"
+#include "machine/z80daisy.h"
#include "machine/z80ctc.h"
#include "machine/z80pio.h"
#include "machine/z80sio.h"
diff --git a/src/mame/drivers/univac.cpp b/src/mame/drivers/univac.cpp
index b6af5a4d1ab..4923d3f3828 100644
--- a/src/mame/drivers/univac.cpp
+++ b/src/mame/drivers/univac.cpp
@@ -37,7 +37,7 @@ Notes:
#include "emu.h"
#include "cpu/z80/z80.h"
-#include "cpu/z80/z80daisy.h"
+#include "machine/z80daisy.h"
#include "machine/clock.h"
#include "machine/nvram.h"
#include "machine/z80ctc.h"
diff --git a/src/mame/drivers/z9001.cpp b/src/mame/drivers/z9001.cpp
index 66014e4c59d..6e6cdb8d312 100644
--- a/src/mame/drivers/z9001.cpp
+++ b/src/mame/drivers/z9001.cpp
@@ -29,7 +29,7 @@ ToDo:
#include "emu.h"
#include "cpu/z80/z80.h"
-#include "cpu/z80/z80daisy.h"
+#include "machine/z80daisy.h"
#include "imagedev/cassette.h"
#include "machine/timer.h"
#include "machine/z80ctc.h"