summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author AJR <ajrhacker@users.noreply.github.com>2018-11-25 23:16:43 -0500
committer AJR <ajrhacker@users.noreply.github.com>2018-11-25 23:17:29 -0500
commit0339d8346598bea217250a269eb61fa886b5b3a3 (patch)
tree3f96c29bb1d06a4a5e1d183afdea323a756bf923
parent47d83c1af256d54589d8c3554fe71f42c5174409 (diff)
Include floppy.h explicitly in drivers and bus cards, rather than indirectly through popular FDC headers (nw)
-rw-r--r--src/devices/bus/a2bus/corvfdc01.h1
-rw-r--r--src/devices/bus/a2bus/corvfdc02.h1
-rw-r--r--src/devices/bus/abcbus/fd2.h1
-rw-r--r--src/devices/bus/abcbus/lux10828.h1
-rw-r--r--src/devices/bus/abcbus/lux21046.h1
-rw-r--r--src/devices/bus/acorn/atom/discpack.h1
-rw-r--r--src/devices/bus/acorn/cms/fdc.h1
-rw-r--r--src/devices/bus/acorn/system/fdc.h1
-rw-r--r--src/devices/bus/adamnet/fdc.h1
-rw-r--r--src/devices/bus/bbc/1mhzbus/opus3.h1
-rw-r--r--src/devices/bus/bbc/fdc/acorn.h1
-rw-r--r--src/devices/bus/bbc/fdc/ams.h1
-rw-r--r--src/devices/bus/bbc/fdc/cumana.h1
-rw-r--r--src/devices/bus/bbc/fdc/cv1797.h1
-rw-r--r--src/devices/bus/bbc/fdc/microware.h1
-rw-r--r--src/devices/bus/bbc/fdc/opus.h1
-rw-r--r--src/devices/bus/bbc/fdc/watford.h1
-rw-r--r--src/devices/bus/cbmiec/c1581.h1
-rw-r--r--src/devices/bus/cbmiec/fd2000.h1
-rw-r--r--src/devices/bus/cgenie/expansion/floppy.h1
-rw-r--r--src/devices/bus/comx35/fdc.h1
-rw-r--r--src/devices/bus/cpc/ddi1.h1
-rw-r--r--src/devices/bus/econet/e01.h1
-rw-r--r--src/devices/bus/electron/cart/ap34.h1
-rw-r--r--src/devices/bus/electron/cart/cumana.h1
-rw-r--r--src/devices/bus/electron/cart/peg400.h1
-rw-r--r--src/devices/bus/electron/cart/stlefs.h1
-rw-r--r--src/devices/bus/electron/plus3.h1
-rw-r--r--src/devices/bus/ep64/exdos.h1
-rw-r--r--src/devices/bus/epson_sio/pf10.cpp1
-rw-r--r--src/devices/bus/epson_sio/tf20.cpp1
-rw-r--r--src/devices/bus/ieee488/c2031.h1
-rw-r--r--src/devices/bus/ieee488/c8280.h1
-rw-r--r--src/devices/bus/iq151/disc2.h1
-rw-r--r--src/devices/bus/isa/omti8621.h1
-rw-r--r--src/devices/bus/isa/p1_fdc.h1
-rw-r--r--src/devices/bus/isbx/compis_fdc.h1
-rw-r--r--src/devices/bus/isbx/isbc_218a.h1
-rw-r--r--src/devices/bus/kc/d004.h1
-rw-r--r--src/devices/bus/nasbus/floppy.h1
-rw-r--r--src/devices/bus/newbrain/fdc.h1
-rw-r--r--src/devices/bus/plus4/c1551.h1
-rw-r--r--src/devices/bus/ql/sandy_superdisk.h1
-rw-r--r--src/devices/bus/ql/sandy_superqboard.h1
-rw-r--r--src/devices/bus/ql/trumpcard.h1
-rw-r--r--src/devices/bus/s100/dj2db.h1
-rw-r--r--src/devices/bus/spc1000/fdd.h1
-rw-r--r--src/devices/bus/tvc/hbf.h1
-rw-r--r--src/devices/bus/vme/vme_fcscsi.h1
-rw-r--r--src/devices/machine/fdc37c93x.h1
-rw-r--r--src/devices/machine/fdc_pll.cpp1
-rw-r--r--src/devices/machine/fdc_pll.h2
-rw-r--r--src/devices/machine/i8271.cpp1
-rw-r--r--src/devices/machine/i8271.h3
-rw-r--r--src/devices/machine/pc_fdc.cpp1
-rw-r--r--src/devices/machine/upd765.cpp1
-rw-r--r--src/devices/machine/upd765.h3
-rw-r--r--src/devices/machine/wd_fdc.cpp2
-rw-r--r--src/devices/machine/wd_fdc.h3
-rw-r--r--src/mame/drivers/alphatpx.cpp1
-rw-r--r--src/mame/drivers/alphatro.cpp1
-rw-r--r--src/mame/drivers/altos486.cpp1
-rw-r--r--src/mame/drivers/altos5.cpp1
-rw-r--r--src/mame/drivers/altos8600.cpp1
-rw-r--r--src/mame/drivers/ampro.cpp1
-rw-r--r--src/mame/drivers/amust.cpp1
-rw-r--r--src/mame/drivers/apc.cpp1
-rw-r--r--src/mame/drivers/apf.cpp1
-rw-r--r--src/mame/drivers/applix.cpp1
-rw-r--r--src/mame/drivers/apricotp.cpp1
-rw-r--r--src/mame/drivers/asst128.cpp1
-rw-r--r--src/mame/drivers/attache.cpp1
-rw-r--r--src/mame/drivers/beta.cpp1
-rw-r--r--src/mame/drivers/bigbord2.cpp1
-rw-r--r--src/mame/drivers/camplynx.cpp1
-rw-r--r--src/mame/drivers/ccs2810.cpp1
-rw-r--r--src/mame/drivers/cmi.cpp1
-rw-r--r--src/mame/drivers/czk80.cpp1
-rw-r--r--src/mame/drivers/d6809.cpp1
-rw-r--r--src/mame/drivers/dim68k.cpp1
-rw-r--r--src/mame/drivers/dmax8000.cpp1
-rw-r--r--src/mame/drivers/dmv.cpp1
-rw-r--r--src/mame/drivers/dps1.cpp1
-rw-r--r--src/mame/drivers/duet16.cpp1
-rw-r--r--src/mame/drivers/einstein.cpp1
-rw-r--r--src/mame/drivers/enmirage.cpp1
-rw-r--r--src/mame/drivers/esq5505.cpp1
-rw-r--r--src/mame/drivers/eurocom2.cpp1
-rw-r--r--src/mame/drivers/excali64.cpp1
-rw-r--r--src/mame/drivers/fanucspmg.cpp1
-rw-r--r--src/mame/drivers/gimix.cpp1
-rw-r--r--src/mame/drivers/goupil.cpp1
-rw-r--r--src/mame/drivers/guab.cpp1
-rw-r--r--src/mame/drivers/hp64k.cpp1
-rw-r--r--src/mame/drivers/hp_ipc.cpp1
-rw-r--r--src/mame/drivers/ht68k.cpp1
-rw-r--r--src/mame/drivers/icebox.cpp1
-rw-r--r--src/mame/drivers/itt3030.cpp1
-rw-r--r--src/mame/drivers/jupiter.cpp1
-rw-r--r--src/mame/drivers/kdt6.cpp1
-rw-r--r--src/mame/drivers/m20.cpp1
-rw-r--r--src/mame/drivers/mbc200.cpp1
-rw-r--r--src/mame/drivers/microdec.cpp1
-rw-r--r--src/mame/drivers/miniframe.cpp1
-rw-r--r--src/mame/drivers/mips.cpp2
-rw-r--r--src/mame/drivers/ms0515.cpp1
-rw-r--r--src/mame/drivers/mycom.cpp1
-rw-r--r--src/mame/drivers/mz3500.cpp1
-rw-r--r--src/mame/drivers/mz6500.cpp1
-rw-r--r--src/mame/drivers/nanos.cpp1
-rw-r--r--src/mame/drivers/nc.cpp1
-rw-r--r--src/mame/drivers/ngen.cpp1
-rw-r--r--src/mame/drivers/notetaker.cpp1
-rw-r--r--src/mame/drivers/olyboss.cpp1
-rw-r--r--src/mame/drivers/olytext.cpp1
-rw-r--r--src/mame/drivers/osbexec.cpp1
-rw-r--r--src/mame/drivers/p8k.cpp1
-rw-r--r--src/mame/drivers/pasopia7.cpp1
-rw-r--r--src/mame/drivers/pcd.cpp1
-rw-r--r--src/mame/drivers/peoplepc.cpp1
-rw-r--r--src/mame/drivers/pg685.cpp1
-rw-r--r--src/mame/drivers/prof180x.cpp1
-rw-r--r--src/mame/drivers/proteus.cpp1
-rw-r--r--src/mame/drivers/pulsar.cpp1
-rw-r--r--src/mame/drivers/pwrview.cpp1
-rw-r--r--src/mame/drivers/pyl601.cpp1
-rw-r--r--src/mame/drivers/qx10.cpp1
-rw-r--r--src/mame/drivers/rc702.cpp1
-rw-r--r--src/mame/drivers/rc759.cpp1
-rw-r--r--src/mame/drivers/sbrain.cpp1
-rw-r--r--src/mame/drivers/slicer.cpp1
-rw-r--r--src/mame/drivers/smc777.cpp2
-rw-r--r--src/mame/drivers/squale.cpp1
-rw-r--r--src/mame/drivers/sun3x.cpp1
-rw-r--r--src/mame/drivers/sun4.cpp1
-rw-r--r--src/mame/drivers/tavernie.cpp1
-rw-r--r--src/mame/drivers/tim011.cpp1
-rw-r--r--src/mame/drivers/ts802.cpp1
-rw-r--r--src/mame/drivers/ts803.cpp1
-rw-r--r--src/mame/drivers/unixpc.cpp1
-rw-r--r--src/mame/drivers/v6809.cpp1
-rw-r--r--src/mame/drivers/wangpc.cpp1
-rw-r--r--src/mame/drivers/wicat.cpp1
-rw-r--r--src/mame/includes/abc1600.h1
-rw-r--r--src/mame/includes/amstrad.h1
-rw-r--r--src/mame/includes/archimds.h1
-rw-r--r--src/mame/includes/atarist.h1
-rw-r--r--src/mame/includes/aussiebyte.h1
-rw-r--r--src/mame/includes/bbc.h1
-rw-r--r--src/mame/includes/bebox.h1
-rw-r--r--src/mame/includes/bullet.h3
-rw-r--r--src/mame/includes/bw12.h1
-rw-r--r--src/mame/includes/bw2.h1
-rw-r--r--src/mame/includes/dgn_beta.h1
-rw-r--r--src/mame/includes/fm7.h1
-rw-r--r--src/mame/includes/interpro.h1
-rw-r--r--src/mame/includes/kaypro.h1
-rw-r--r--src/mame/includes/m5.h1
-rw-r--r--src/mame/includes/mbee.h1
-rw-r--r--src/mame/includes/mikromik.h1
-rw-r--r--src/mame/includes/next.h1
-rw-r--r--src/mame/includes/orion.h2
-rw-r--r--src/mame/includes/osborne1.h2
-rw-r--r--src/mame/includes/pc1512.h1
-rw-r--r--src/mame/includes/pc8801.h1
-rw-r--r--src/mame/includes/pc88va.h1
-rw-r--r--src/mame/includes/pc9801.h1
-rw-r--r--src/mame/includes/pcw.h1
-rw-r--r--src/mame/includes/pcw16.h1
-rw-r--r--src/mame/includes/poly.h1
-rw-r--r--src/mame/includes/prof80.h1
-rw-r--r--src/mame/includes/sage2.h1
-rw-r--r--src/mame/includes/samcoupe.h1
-rw-r--r--src/mame/includes/sg1000.h1
-rw-r--r--src/mame/includes/spectrum.h1
-rw-r--r--src/mame/includes/super6.h1
-rw-r--r--src/mame/includes/super80.h1
-rw-r--r--src/mame/includes/tandy2k.h1
-rw-r--r--src/mame/includes/tdv2324.h1
-rw-r--r--src/mame/includes/tiki100.h1
-rw-r--r--src/mame/includes/trs80m2.h1
-rw-r--r--src/mame/includes/v1050.h1
-rw-r--r--src/mame/includes/vixen.h1
-rw-r--r--src/mame/includes/x68k.h1
-rw-r--r--src/mame/includes/xerox820.h1
-rw-r--r--src/mame/includes/xor100.h1
-rw-r--r--src/mame/includes/zorba.h2
-rw-r--r--src/mame/machine/beta.h1
-rw-r--r--src/mame/machine/isbc_208.h1
189 files changed, 198 insertions, 6 deletions
diff --git a/src/devices/bus/a2bus/corvfdc01.h b/src/devices/bus/a2bus/corvfdc01.h
index 4472890f381..b08574ad19f 100644
--- a/src/devices/bus/a2bus/corvfdc01.h
+++ b/src/devices/bus/a2bus/corvfdc01.h
@@ -16,6 +16,7 @@
#include "a2bus.h"
#include "machine/wd_fdc.h"
#include "formats/imd_dsk.h"
+#include "imagedev/floppy.h"
//**************************************************************************
// TYPE DEFINITIONS
diff --git a/src/devices/bus/a2bus/corvfdc02.h b/src/devices/bus/a2bus/corvfdc02.h
index 4bed88667d3..1a54fe9caba 100644
--- a/src/devices/bus/a2bus/corvfdc02.h
+++ b/src/devices/bus/a2bus/corvfdc02.h
@@ -14,6 +14,7 @@
#pragma once
#include "a2bus.h"
+#include "imagedev/floppy.h"
#include "machine/upd765.h"
#include "formats/imd_dsk.h"
diff --git a/src/devices/bus/abcbus/fd2.h b/src/devices/bus/abcbus/fd2.h
index 9077e071949..ff635575472 100644
--- a/src/devices/bus/abcbus/fd2.h
+++ b/src/devices/bus/abcbus/fd2.h
@@ -15,6 +15,7 @@
#include "cpu/z80/z80.h"
#include "machine/z80daisy.h"
#include "formats/abcfd2_dsk.h"
+#include "imagedev/floppy.h"
#include "machine/wd_fdc.h"
#include "machine/z80pio.h"
diff --git a/src/devices/bus/abcbus/lux10828.h b/src/devices/bus/abcbus/lux10828.h
index 7e26d29357a..97ecb787880 100644
--- a/src/devices/bus/abcbus/lux10828.h
+++ b/src/devices/bus/abcbus/lux10828.h
@@ -15,6 +15,7 @@
#include "cpu/z80/z80.h"
#include "machine/z80daisy.h"
#include "formats/abc800_dsk.h"
+#include "imagedev/floppy.h"
#include "machine/wd_fdc.h"
#include "machine/z80pio.h"
diff --git a/src/devices/bus/abcbus/lux21046.h b/src/devices/bus/abcbus/lux21046.h
index 6cf75a184fe..703c419e776 100644
--- a/src/devices/bus/abcbus/lux21046.h
+++ b/src/devices/bus/abcbus/lux21046.h
@@ -15,6 +15,7 @@
#include "cpu/z80/z80.h"
#include "machine/z80daisy.h"
#include "formats/abc800_dsk.h"
+#include "imagedev/floppy.h"
#include "machine/wd_fdc.h"
#include "machine/z80dma.h"
diff --git a/src/devices/bus/acorn/atom/discpack.h b/src/devices/bus/acorn/atom/discpack.h
index 75918d1e8f0..3f06870f87c 100644
--- a/src/devices/bus/acorn/atom/discpack.h
+++ b/src/devices/bus/acorn/atom/discpack.h
@@ -13,6 +13,7 @@
#pragma once
#include "bus/acorn/bus.h"
+#include "imagedev/floppy.h"
#include "machine/i8271.h"
#include "formats/acorn_dsk.h"
diff --git a/src/devices/bus/acorn/cms/fdc.h b/src/devices/bus/acorn/cms/fdc.h
index 865896a2eeb..4795eaab18a 100644
--- a/src/devices/bus/acorn/cms/fdc.h
+++ b/src/devices/bus/acorn/cms/fdc.h
@@ -13,6 +13,7 @@
#pragma once
#include "bus/acorn/bus.h"
+#include "imagedev/floppy.h"
#include "machine/wd_fdc.h"
#include "formats/acorn_dsk.h"
diff --git a/src/devices/bus/acorn/system/fdc.h b/src/devices/bus/acorn/system/fdc.h
index 44c3881ffc0..d2c0286ad27 100644
--- a/src/devices/bus/acorn/system/fdc.h
+++ b/src/devices/bus/acorn/system/fdc.h
@@ -15,6 +15,7 @@
#pragma once
#include "bus/acorn/bus.h"
+#include "imagedev/floppy.h"
#include "machine/i8271.h"
#include "formats/acorn_dsk.h"
diff --git a/src/devices/bus/adamnet/fdc.h b/src/devices/bus/adamnet/fdc.h
index 6bfb8d10822..2ed2eb24ccb 100644
--- a/src/devices/bus/adamnet/fdc.h
+++ b/src/devices/bus/adamnet/fdc.h
@@ -14,6 +14,7 @@
#include "adamnet.h"
#include "cpu/m6800/m6801.h"
#include "formats/adam_dsk.h"
+#include "imagedev/floppy.h"
#include "machine/wd_fdc.h"
diff --git a/src/devices/bus/bbc/1mhzbus/opus3.h b/src/devices/bus/bbc/1mhzbus/opus3.h
index 97b3e6835ec..ef7a2174f5c 100644
--- a/src/devices/bus/bbc/1mhzbus/opus3.h
+++ b/src/devices/bus/bbc/1mhzbus/opus3.h
@@ -11,6 +11,7 @@
#define MAME_BUS_BBC_1MHZBUS_OPUS3_H
#include "1mhzbus.h"
+#include "imagedev/floppy.h"
#include "machine/ram.h"
#include "machine/wd_fdc.h"
#include "formats/acorn_dsk.h"
diff --git a/src/devices/bus/bbc/fdc/acorn.h b/src/devices/bus/bbc/fdc/acorn.h
index 397ea1289e7..951b7e33e1d 100644
--- a/src/devices/bus/bbc/fdc/acorn.h
+++ b/src/devices/bus/bbc/fdc/acorn.h
@@ -13,6 +13,7 @@
#pragma once
#include "fdc.h"
+#include "imagedev/floppy.h"
#include "machine/i8271.h"
#include "machine/wd_fdc.h"
#include "formats/acorn_dsk.h"
diff --git a/src/devices/bus/bbc/fdc/ams.h b/src/devices/bus/bbc/fdc/ams.h
index aff35b2e099..a97a6b762c5 100644
--- a/src/devices/bus/bbc/fdc/ams.h
+++ b/src/devices/bus/bbc/fdc/ams.h
@@ -13,6 +13,7 @@
#pragma once
#include "fdc.h"
+#include "imagedev/floppy.h"
#include "machine/i8271.h"
#include "formats/acorn_dsk.h"
diff --git a/src/devices/bus/bbc/fdc/cumana.h b/src/devices/bus/bbc/fdc/cumana.h
index 55481bca1cc..5b2439000ec 100644
--- a/src/devices/bus/bbc/fdc/cumana.h
+++ b/src/devices/bus/bbc/fdc/cumana.h
@@ -12,6 +12,7 @@
#pragma once
#include "fdc.h"
+#include "imagedev/floppy.h"
#include "machine/wd_fdc.h"
#include "formats/acorn_dsk.h"
#include "formats/fsd_dsk.h"
diff --git a/src/devices/bus/bbc/fdc/cv1797.h b/src/devices/bus/bbc/fdc/cv1797.h
index 3f30011567d..a887a1b18a4 100644
--- a/src/devices/bus/bbc/fdc/cv1797.h
+++ b/src/devices/bus/bbc/fdc/cv1797.h
@@ -13,6 +13,7 @@
#pragma once
#include "fdc.h"
+#include "imagedev/floppy.h"
#include "machine/wd_fdc.h"
#include "formats/acorn_dsk.h"
#include "formats/fsd_dsk.h"
diff --git a/src/devices/bus/bbc/fdc/microware.h b/src/devices/bus/bbc/fdc/microware.h
index c255cfd67c3..117159b407d 100644
--- a/src/devices/bus/bbc/fdc/microware.h
+++ b/src/devices/bus/bbc/fdc/microware.h
@@ -15,6 +15,7 @@
#pragma once
#include "fdc.h"
+#include "imagedev/floppy.h"
#include "machine/wd_fdc.h"
#include "formats/acorn_dsk.h"
#include "formats/fsd_dsk.h"
diff --git a/src/devices/bus/bbc/fdc/opus.h b/src/devices/bus/bbc/fdc/opus.h
index d49938a115f..721f3ebab5c 100644
--- a/src/devices/bus/bbc/fdc/opus.h
+++ b/src/devices/bus/bbc/fdc/opus.h
@@ -10,6 +10,7 @@
#define MAME_BUS_BBC_FDC_OPUS_H
#include "fdc.h"
+#include "imagedev/floppy.h"
#include "machine/upd765.h"
#include "machine/wd_fdc.h"
#include "formats/acorn_dsk.h"
diff --git a/src/devices/bus/bbc/fdc/watford.h b/src/devices/bus/bbc/fdc/watford.h
index 06fae6e5c6d..02bbf59f523 100644
--- a/src/devices/bus/bbc/fdc/watford.h
+++ b/src/devices/bus/bbc/fdc/watford.h
@@ -12,6 +12,7 @@
#pragma once
#include "fdc.h"
+#include "imagedev/floppy.h"
#include "machine/wd_fdc.h"
#include "formats/acorn_dsk.h"
#include "formats/fsd_dsk.h"
diff --git a/src/devices/bus/cbmiec/c1581.h b/src/devices/bus/cbmiec/c1581.h
index 000eade4756..811375dbdaa 100644
--- a/src/devices/bus/cbmiec/c1581.h
+++ b/src/devices/bus/cbmiec/c1581.h
@@ -14,6 +14,7 @@
#include "cbmiec.h"
#include "cpu/m6502/m6502.h"
#include "formats/d81_dsk.h"
+#include "imagedev/floppy.h"
#include "machine/mos6526.h"
#include "machine/wd_fdc.h"
diff --git a/src/devices/bus/cbmiec/fd2000.h b/src/devices/bus/cbmiec/fd2000.h
index 2b79a93dd70..f116f5f8cfb 100644
--- a/src/devices/bus/cbmiec/fd2000.h
+++ b/src/devices/bus/cbmiec/fd2000.h
@@ -14,6 +14,7 @@
#include "cbmiec.h"
#include "cpu/m6502/m65c02.h"
#include "formats/d81_dsk.h"
+#include "imagedev/floppy.h"
#include "machine/6522via.h"
#include "machine/upd765.h"
diff --git a/src/devices/bus/cgenie/expansion/floppy.h b/src/devices/bus/cgenie/expansion/floppy.h
index 48892c3e994..033709a24fd 100644
--- a/src/devices/bus/cgenie/expansion/floppy.h
+++ b/src/devices/bus/cgenie/expansion/floppy.h
@@ -12,6 +12,7 @@
#pragma once
#include "expansion.h"
+#include "imagedev/floppy.h"
#include "machine/timer.h"
#include "machine/wd_fdc.h"
#include "bus/generic/slot.h"
diff --git a/src/devices/bus/comx35/fdc.h b/src/devices/bus/comx35/fdc.h
index ee88732e964..ad682e97718 100644
--- a/src/devices/bus/comx35/fdc.h
+++ b/src/devices/bus/comx35/fdc.h
@@ -13,6 +13,7 @@
#include "exp.h"
#include "formats/comx35_dsk.h"
+#include "imagedev/floppy.h"
#include "machine/wd_fdc.h"
diff --git a/src/devices/bus/cpc/ddi1.h b/src/devices/bus/cpc/ddi1.h
index 060b14cb1e2..6e07813c7a2 100644
--- a/src/devices/bus/cpc/ddi1.h
+++ b/src/devices/bus/cpc/ddi1.h
@@ -14,6 +14,7 @@
#pragma once
#include "cpcexp.h"
+#include "imagedev/floppy.h"
#include "machine/upd765.h"
class cpc_ddi1_device : public device_t, public device_cpc_expansion_card_interface
diff --git a/src/devices/bus/econet/e01.h b/src/devices/bus/econet/e01.h
index ef74396cd15..e78f88b2f90 100644
--- a/src/devices/bus/econet/e01.h
+++ b/src/devices/bus/econet/e01.h
@@ -15,6 +15,7 @@
#include "bus/centronics/ctronics.h"
#include "bus/scsi/scsi.h"
#include "cpu/m6502/m65c02.h"
+#include "imagedev/floppy.h"
#include "machine/6522via.h"
#include "machine/buffer.h"
#include "machine/output_latch.h"
diff --git a/src/devices/bus/electron/cart/ap34.h b/src/devices/bus/electron/cart/ap34.h
index e75ff07fed5..b3fb911b8f6 100644
--- a/src/devices/bus/electron/cart/ap34.h
+++ b/src/devices/bus/electron/cart/ap34.h
@@ -12,6 +12,7 @@
#define MAME_BUS_ELECTRON_CART_AP34_H
#include "slot.h"
+#include "imagedev/floppy.h"
#include "machine/wd_fdc.h"
#include "formats/acorn_dsk.h"
diff --git a/src/devices/bus/electron/cart/cumana.h b/src/devices/bus/electron/cart/cumana.h
index aaecf97bcfb..9092f82bd65 100644
--- a/src/devices/bus/electron/cart/cumana.h
+++ b/src/devices/bus/electron/cart/cumana.h
@@ -12,6 +12,7 @@
#define MAME_BUS_ELECTRON_CART_CUMANA_H
#include "slot.h"
+#include "imagedev/floppy.h"
#include "machine/wd_fdc.h"
#include "machine/mc146818.h"
#include "formats/acorn_dsk.h"
diff --git a/src/devices/bus/electron/cart/peg400.h b/src/devices/bus/electron/cart/peg400.h
index 11b1eff31ae..8b7a7af9b44 100644
--- a/src/devices/bus/electron/cart/peg400.h
+++ b/src/devices/bus/electron/cart/peg400.h
@@ -10,6 +10,7 @@
#define MAME_BUS_ELECTRON_CART_PEG400_H
#include "slot.h"
+#include "imagedev/floppy.h"
#include "machine/wd_fdc.h"
#include "formats/acorn_dsk.h"
diff --git a/src/devices/bus/electron/cart/stlefs.h b/src/devices/bus/electron/cart/stlefs.h
index 9c0672bd4c5..2123261907a 100644
--- a/src/devices/bus/electron/cart/stlefs.h
+++ b/src/devices/bus/electron/cart/stlefs.h
@@ -13,6 +13,7 @@
#include "slot.h"
#include "machine/wd_fdc.h"
+#include "imagedev/floppy.h"
#include "formats/acorn_dsk.h"
//**************************************************************************
diff --git a/src/devices/bus/electron/plus3.h b/src/devices/bus/electron/plus3.h
index 7ebad268c10..c6a53805783 100644
--- a/src/devices/bus/electron/plus3.h
+++ b/src/devices/bus/electron/plus3.h
@@ -10,6 +10,7 @@
#define MAME_BUS_ELECTRON_PLUS3_H
#include "exp.h"
+#include "imagedev/floppy.h"
#include "machine/wd_fdc.h"
#include "formats/acorn_dsk.h"
diff --git a/src/devices/bus/ep64/exdos.h b/src/devices/bus/ep64/exdos.h
index 04e3ecf383b..b437c56eb50 100644
--- a/src/devices/bus/ep64/exdos.h
+++ b/src/devices/bus/ep64/exdos.h
@@ -13,6 +13,7 @@
#include "exp.h"
#include "formats/ep64_dsk.h"
+#include "imagedev/floppy.h"
#include "machine/wd_fdc.h"
diff --git a/src/devices/bus/epson_sio/pf10.cpp b/src/devices/bus/epson_sio/pf10.cpp
index a873b246090..11e60f39282 100644
--- a/src/devices/bus/epson_sio/pf10.cpp
+++ b/src/devices/bus/epson_sio/pf10.cpp
@@ -12,6 +12,7 @@
#include "emu.h"
#include "pf10.h"
+#include "imagedev/floppy.h"
//**************************************************************************
diff --git a/src/devices/bus/epson_sio/tf20.cpp b/src/devices/bus/epson_sio/tf20.cpp
index bc9bb669b1e..fa625195b6d 100644
--- a/src/devices/bus/epson_sio/tf20.cpp
+++ b/src/devices/bus/epson_sio/tf20.cpp
@@ -14,6 +14,7 @@
#include "emu.h"
#include "tf20.h"
+#include "imagedev/floppy.h"
#define XTAL_CR1 XTAL(8'000'000)
#define XTAL_CR2 XTAL(4'915'200)
diff --git a/src/devices/bus/ieee488/c2031.h b/src/devices/bus/ieee488/c2031.h
index 99d97a0201a..7c6b9d738cc 100644
--- a/src/devices/bus/ieee488/c2031.h
+++ b/src/devices/bus/ieee488/c2031.h
@@ -13,6 +13,7 @@
#include "ieee488.h"
#include "cpu/m6502/m6502.h"
+#include "imagedev/floppy.h"
#include "machine/64h156.h"
#include "machine/6522via.h"
diff --git a/src/devices/bus/ieee488/c8280.h b/src/devices/bus/ieee488/c8280.h
index c04f3e9b5d9..d5e0fc8ef1f 100644
--- a/src/devices/bus/ieee488/c8280.h
+++ b/src/devices/bus/ieee488/c8280.h
@@ -14,6 +14,7 @@
#include "ieee488.h"
#include "cpu/m6502/m6502.h"
#include "formats/c8280_dsk.h"
+#include "imagedev/floppy.h"
#include "machine/mos6530n.h"
#include "machine/wd_fdc.h"
diff --git a/src/devices/bus/iq151/disc2.h b/src/devices/bus/iq151/disc2.h
index ac778b253dc..b0421418363 100644
--- a/src/devices/bus/iq151/disc2.h
+++ b/src/devices/bus/iq151/disc2.h
@@ -6,6 +6,7 @@
#pragma once
#include "iq151.h"
+#include "imagedev/floppy.h"
#include "machine/upd765.h"
//**************************************************************************
diff --git a/src/devices/bus/isa/omti8621.h b/src/devices/bus/isa/omti8621.h
index 6e1953e00f3..070ae2dbe70 100644
--- a/src/devices/bus/isa/omti8621.h
+++ b/src/devices/bus/isa/omti8621.h
@@ -17,6 +17,7 @@
#include "isa.h"
#include "machine/pc_fdc.h"
+#include "imagedev/floppy.h"
/***************************************************************************
FUNCTION PROTOTYPES
diff --git a/src/devices/bus/isa/p1_fdc.h b/src/devices/bus/isa/p1_fdc.h
index e1649fbb9f3..58a4532b96d 100644
--- a/src/devices/bus/isa/p1_fdc.h
+++ b/src/devices/bus/isa/p1_fdc.h
@@ -13,6 +13,7 @@
#include "isa.h"
+#include "imagedev/floppy.h"
#include "machine/wd_fdc.h"
//**************************************************************************
diff --git a/src/devices/bus/isbx/compis_fdc.h b/src/devices/bus/isbx/compis_fdc.h
index ff6c0e87974..7f33cdd1160 100644
--- a/src/devices/bus/isbx/compis_fdc.h
+++ b/src/devices/bus/isbx/compis_fdc.h
@@ -13,6 +13,7 @@
#include "isbx.h"
#include "formats/cpis_dsk.h"
+#include "imagedev/floppy.h"
#include "machine/upd765.h"
diff --git a/src/devices/bus/isbx/isbc_218a.h b/src/devices/bus/isbx/isbc_218a.h
index 929203c8dfb..5d0a617e989 100644
--- a/src/devices/bus/isbx/isbc_218a.h
+++ b/src/devices/bus/isbx/isbc_218a.h
@@ -13,6 +13,7 @@
#include "isbx.h"
#include "formats/pc_dsk.h"
+#include "imagedev/floppy.h"
#include "machine/upd765.h"
diff --git a/src/devices/bus/kc/d004.h b/src/devices/bus/kc/d004.h
index e82f44646d0..2d4c49d2ebc 100644
--- a/src/devices/bus/kc/d004.h
+++ b/src/devices/bus/kc/d004.h
@@ -10,6 +10,7 @@
#include "cpu/z80/z80.h"
#include "machine/upd765.h"
#include "machine/ataintf.h"
+#include "imagedev/floppy.h"
#include "imagedev/harddriv.h"
diff --git a/src/devices/bus/nasbus/floppy.h b/src/devices/bus/nasbus/floppy.h
index f858b1f841b..a5bb188a270 100644
--- a/src/devices/bus/nasbus/floppy.h
+++ b/src/devices/bus/nasbus/floppy.h
@@ -12,6 +12,7 @@
#pragma once
#include "nasbus.h"
+#include "imagedev/floppy.h"
#include "machine/wd_fdc.h"
diff --git a/src/devices/bus/newbrain/fdc.h b/src/devices/bus/newbrain/fdc.h
index 79140df472d..e5a40ae0748 100644
--- a/src/devices/bus/newbrain/fdc.h
+++ b/src/devices/bus/newbrain/fdc.h
@@ -13,6 +13,7 @@
#include "exp.h"
#include "cpu/z80/z80.h"
+#include "imagedev/floppy.h"
#include "machine/upd765.h"
diff --git a/src/devices/bus/plus4/c1551.h b/src/devices/bus/plus4/c1551.h
index 2cfc00786fb..b108fc94ef1 100644
--- a/src/devices/bus/plus4/c1551.h
+++ b/src/devices/bus/plus4/c1551.h
@@ -13,6 +13,7 @@
#include "exp.h"
#include "cpu/m6502/m6510t.h"
+#include "imagedev/floppy.h"
#include "machine/64h156.h"
#include "machine/6525tpi.h"
#include "machine/pla.h"
diff --git a/src/devices/bus/ql/sandy_superdisk.h b/src/devices/bus/ql/sandy_superdisk.h
index 24d93ddf367..1bc7192aad5 100644
--- a/src/devices/bus/ql/sandy_superdisk.h
+++ b/src/devices/bus/ql/sandy_superdisk.h
@@ -14,6 +14,7 @@
#include "exp.h"
#include "bus/centronics/ctronics.h"
#include "formats/ql_dsk.h"
+#include "imagedev/floppy.h"
#include "machine/wd_fdc.h"
diff --git a/src/devices/bus/ql/sandy_superqboard.h b/src/devices/bus/ql/sandy_superqboard.h
index c86241a4edb..94d2066020b 100644
--- a/src/devices/bus/ql/sandy_superqboard.h
+++ b/src/devices/bus/ql/sandy_superqboard.h
@@ -14,6 +14,7 @@
#include "exp.h"
#include "bus/centronics/ctronics.h"
#include "formats/ql_dsk.h"
+#include "imagedev/floppy.h"
#include "machine/wd_fdc.h"
diff --git a/src/devices/bus/ql/trumpcard.h b/src/devices/bus/ql/trumpcard.h
index ce9503d5503..4dc18ceccd4 100644
--- a/src/devices/bus/ql/trumpcard.h
+++ b/src/devices/bus/ql/trumpcard.h
@@ -12,6 +12,7 @@
#pragma once
#include "exp.h"
+#include "imagedev/floppy.h"
#include "machine/wd_fdc.h"
#include "formats/ql_dsk.h"
diff --git a/src/devices/bus/s100/dj2db.h b/src/devices/bus/s100/dj2db.h
index 89ff0734066..e82b4431095 100644
--- a/src/devices/bus/s100/dj2db.h
+++ b/src/devices/bus/s100/dj2db.h
@@ -12,6 +12,7 @@
#pragma once
#include "s100.h"
+#include "imagedev/floppy.h"
#include "machine/com8116.h"
#include "machine/wd_fdc.h"
diff --git a/src/devices/bus/spc1000/fdd.h b/src/devices/bus/spc1000/fdd.h
index 27d6415e7b9..93994369efe 100644
--- a/src/devices/bus/spc1000/fdd.h
+++ b/src/devices/bus/spc1000/fdd.h
@@ -7,6 +7,7 @@
#include "exp.h"
#include "cpu/z80/z80.h"
+#include "imagedev/floppy.h"
#include "machine/i8255.h"
#include "machine/upd765.h"
diff --git a/src/devices/bus/tvc/hbf.h b/src/devices/bus/tvc/hbf.h
index 74c022c77e4..cc154d71294 100644
--- a/src/devices/bus/tvc/hbf.h
+++ b/src/devices/bus/tvc/hbf.h
@@ -6,6 +6,7 @@
#pragma once
#include "tvc.h"
+#include "imagedev/floppy.h"
#include "machine/wd_fdc.h"
#include "formats/tvc_dsk.h"
diff --git a/src/devices/bus/vme/vme_fcscsi.h b/src/devices/bus/vme/vme_fcscsi.h
index 08235e8ca3d..35e95520585 100644
--- a/src/devices/bus/vme/vme_fcscsi.h
+++ b/src/devices/bus/vme/vme_fcscsi.h
@@ -5,6 +5,7 @@
#pragma once
+#include "imagedev/floppy.h"
#include "machine/68230pit.h"
#include "machine/wd_fdc.h"
#include "machine/hd63450.h" // compatible with MC68450
diff --git a/src/devices/machine/fdc37c93x.h b/src/devices/machine/fdc37c93x.h
index 06ad6363408..9a44e84a9e2 100644
--- a/src/devices/machine/fdc37c93x.h
+++ b/src/devices/machine/fdc37c93x.h
@@ -16,6 +16,7 @@ SMSC FDC37C93x Plug and Play Compatible Ultra I/O Controller
#include "machine/8042kbdc.h"
// floppy disk controller
#include "machine/upd765.h"
+#include "imagedev/floppy.h"
#include "formats/pc_dsk.h"
#include "formats/naslite_dsk.h"
// parallel port
diff --git a/src/devices/machine/fdc_pll.cpp b/src/devices/machine/fdc_pll.cpp
index d384842fe3d..2e8694d2f01 100644
--- a/src/devices/machine/fdc_pll.cpp
+++ b/src/devices/machine/fdc_pll.cpp
@@ -2,6 +2,7 @@
// copyright-holders:Olivier Galibert
#include "emu.h"
#include "fdc_pll.h"
+#include "imagedev/floppy.h"
std::string fdc_pll_t::tts(attotime t)
{
diff --git a/src/devices/machine/fdc_pll.h b/src/devices/machine/fdc_pll.h
index f99be2000a9..fb2bb35fe60 100644
--- a/src/devices/machine/fdc_pll.h
+++ b/src/devices/machine/fdc_pll.h
@@ -9,7 +9,7 @@
* Generic pll class for floppy controllers with analog plls
*/
-#include "imagedev/floppy.h"
+class floppy_image_device;
class fdc_pll_t {
public:
diff --git a/src/devices/machine/i8271.cpp b/src/devices/machine/i8271.cpp
index 54db0c7f2cd..3a309c4ea16 100644
--- a/src/devices/machine/i8271.cpp
+++ b/src/devices/machine/i8271.cpp
@@ -3,6 +3,7 @@
#include "emu.h"
#include "i8271.h"
+#include "imagedev/floppy.h"
DEFINE_DEVICE_TYPE(I8271, i8271_device, "i8271", "Intel 8271 FDC")
diff --git a/src/devices/machine/i8271.h b/src/devices/machine/i8271.h
index 00342f38e4d..701085f58d4 100644
--- a/src/devices/machine/i8271.h
+++ b/src/devices/machine/i8271.h
@@ -5,9 +5,10 @@
#pragma once
-#include "imagedev/floppy.h"
#include "fdc_pll.h"
+class floppy_image_device;
+
/***************************************************************************
MACROS
diff --git a/src/devices/machine/pc_fdc.cpp b/src/devices/machine/pc_fdc.cpp
index d49450e1318..35b83a82aac 100644
--- a/src/devices/machine/pc_fdc.cpp
+++ b/src/devices/machine/pc_fdc.cpp
@@ -15,6 +15,7 @@
#include "emu.h"
#include "machine/pc_fdc.h"
+#include "imagedev/floppy.h"
//#define LOG_GENERAL (1U << 0) //defined in logmacro.h already
diff --git a/src/devices/machine/upd765.cpp b/src/devices/machine/upd765.cpp
index 6fd3d246e6d..3925a866145 100644
--- a/src/devices/machine/upd765.cpp
+++ b/src/devices/machine/upd765.cpp
@@ -3,6 +3,7 @@
#include "emu.h"
#include "upd765.h"
+#include "imagedev/floppy.h"
#include "debugger.h"
#define LOG_WARN (1U << 1) // Show warnings
diff --git a/src/devices/machine/upd765.h b/src/devices/machine/upd765.h
index ffe2577fddf..270a563bf0c 100644
--- a/src/devices/machine/upd765.h
+++ b/src/devices/machine/upd765.h
@@ -5,9 +5,10 @@
#pragma once
-#include "imagedev/floppy.h"
#include "fdc_pll.h"
+class floppy_image_device;
+
/*
* ready = true if the ready line is physically connected to the floppy drive
* select = true if the fdc controls the floppy drive selection
diff --git a/src/devices/machine/wd_fdc.cpp b/src/devices/machine/wd_fdc.cpp
index 905054e13f8..fefc7c2c0a1 100644
--- a/src/devices/machine/wd_fdc.cpp
+++ b/src/devices/machine/wd_fdc.cpp
@@ -3,6 +3,8 @@
#include "emu.h"
#include "wd_fdc.h"
+#include "imagedev/floppy.h"
+
#include "debugger.h"
//#define LOG_GENERAL (1U << 0) //defined in logmacro.h already
diff --git a/src/devices/machine/wd_fdc.h b/src/devices/machine/wd_fdc.h
index 6ecc76d6b23..b7244870e2b 100644
--- a/src/devices/machine/wd_fdc.h
+++ b/src/devices/machine/wd_fdc.h
@@ -5,9 +5,10 @@
#pragma once
-#include "imagedev/floppy.h"
#include "fdc_pll.h"
+class floppy_image_device;
+
/*
* The Western Digital floppy controller family
*
diff --git a/src/mame/drivers/alphatpx.cpp b/src/mame/drivers/alphatpx.cpp
index 34bbcde86de..4f92070d6ad 100644
--- a/src/mame/drivers/alphatpx.cpp
+++ b/src/mame/drivers/alphatpx.cpp
@@ -68,6 +68,7 @@
#include "cpu/i8085/i8085.h"
#include "cpu/i86/i86.h"
#include "cpu/mcs48/mcs48.h"
+#include "imagedev/floppy.h"
#include "machine/bankdev.h"
#include "machine/i8251.h"
#include "machine/wd_fdc.h"
diff --git a/src/mame/drivers/alphatro.cpp b/src/mame/drivers/alphatro.cpp
index a461d28a3db..4c3bd332b27 100644
--- a/src/mame/drivers/alphatro.cpp
+++ b/src/mame/drivers/alphatro.cpp
@@ -26,6 +26,7 @@
#include "emu.h"
#include "cpu/z80/z80.h"
#include "imagedev/cassette.h"
+#include "imagedev/floppy.h"
#include "formats/pc_dsk.h"
#include "formats/dsk_dsk.h"
#include "formats/td0_dsk.h"
diff --git a/src/mame/drivers/altos486.cpp b/src/mame/drivers/altos486.cpp
index 5764c531423..59c93029038 100644
--- a/src/mame/drivers/altos486.cpp
+++ b/src/mame/drivers/altos486.cpp
@@ -6,6 +6,7 @@
#include "emu.h"
#include "cpu/i86/i186.h"
#include "cpu/z80/z80.h"
+#include "imagedev/floppy.h"
#include "machine/i8255.h"
#include "machine/pic8259.h"
#include "machine/z80dart.h"
diff --git a/src/mame/drivers/altos5.cpp b/src/mame/drivers/altos5.cpp
index 5897e7d8b13..6d2547a8f20 100644
--- a/src/mame/drivers/altos5.cpp
+++ b/src/mame/drivers/altos5.cpp
@@ -12,6 +12,7 @@
#include "emu.h"
#include "bus/rs232/rs232.h"
#include "cpu/z80/z80.h"
+#include "imagedev/floppy.h"
#include "machine/z80daisy.h"
#include "machine/z80ctc.h"
#include "machine/z80pio.h"
diff --git a/src/mame/drivers/altos8600.cpp b/src/mame/drivers/altos8600.cpp
index c72cb58c2de..796ee47bc8b 100644
--- a/src/mame/drivers/altos8600.cpp
+++ b/src/mame/drivers/altos8600.cpp
@@ -12,6 +12,7 @@
#include "machine/z80sio.h"
#include "machine/wd_fdc.h"
#include "machine/acs8600_ics.h"
+#include "imagedev/floppy.h"
#include "imagedev/harddriv.h"
#include "bus/rs232/rs232.h"
diff --git a/src/mame/drivers/ampro.cpp b/src/mame/drivers/ampro.cpp
index 8aeb0abde76..74a7b2e1f43 100644
--- a/src/mame/drivers/ampro.cpp
+++ b/src/mame/drivers/ampro.cpp
@@ -24,6 +24,7 @@ ToDo:
#include "emu.h"
#include "bus/rs232/rs232.h"
#include "cpu/z80/z80.h"
+#include "imagedev/floppy.h"
#include "machine/z80daisy.h"
#include "machine/z80ctc.h"
#include "machine/z80dart.h"
diff --git a/src/mame/drivers/amust.cpp b/src/mame/drivers/amust.cpp
index 54d5622011f..e6ff479a44f 100644
--- a/src/mame/drivers/amust.cpp
+++ b/src/mame/drivers/amust.cpp
@@ -77,6 +77,7 @@ ToDo:
#include "emu.h"
#include "cpu/z80/z80.h"
+#include "imagedev/floppy.h"
#include "machine/i8251.h"
#include "machine/i8255.h"
#include "machine/pit8253.h"
diff --git a/src/mame/drivers/apc.cpp b/src/mame/drivers/apc.cpp
index 0012d6f9998..297e5f83683 100644
--- a/src/mame/drivers/apc.cpp
+++ b/src/mame/drivers/apc.cpp
@@ -54,6 +54,7 @@
#include "emu.h"
#include "cpu/i86/i86.h"
+#include "imagedev/floppy.h"
#include "machine/am9517a.h"
#include "machine/nvram.h"
#include "machine/pic8259.h"
diff --git a/src/mame/drivers/apf.cpp b/src/mame/drivers/apf.cpp
index 5bbef0b268c..f93402f535e 100644
--- a/src/mame/drivers/apf.cpp
+++ b/src/mame/drivers/apf.cpp
@@ -73,6 +73,7 @@ ToDo:
#include "cpu/m6800/m6800.h"
#include "formats/apf_apt.h"
#include "imagedev/cassette.h"
+#include "imagedev/floppy.h"
#include "machine/6821pia.h"
#include "machine/ram.h"
#include "machine/wd_fdc.h"
diff --git a/src/mame/drivers/applix.cpp b/src/mame/drivers/applix.cpp
index 053433d31de..6a1ffb04994 100644
--- a/src/mame/drivers/applix.cpp
+++ b/src/mame/drivers/applix.cpp
@@ -41,6 +41,7 @@
#include "cpu/mcs51/mcs51.h"
#include "cpu/z80/z80.h"
#include "imagedev/cassette.h"
+#include "imagedev/floppy.h"
#include "machine/6522via.h"
#include "machine/timer.h"
#include "machine/wd_fdc.h"
diff --git a/src/mame/drivers/apricotp.cpp b/src/mame/drivers/apricotp.cpp
index f8edcb96795..1b8575942ed 100644
--- a/src/mame/drivers/apricotp.cpp
+++ b/src/mame/drivers/apricotp.cpp
@@ -27,6 +27,7 @@
#include "cpu/i86/i86.h"
#include "cpu/m6800/m6801.h"
#include "formats/apridisk.h"
+#include "imagedev/floppy.h"
#include "machine/am9517a.h"
#include "machine/apricotkb.h"
#include "machine/pic8259.h"
diff --git a/src/mame/drivers/asst128.cpp b/src/mame/drivers/asst128.cpp
index 4d0b8e4cc00..7901c900037 100644
--- a/src/mame/drivers/asst128.cpp
+++ b/src/mame/drivers/asst128.cpp
@@ -6,6 +6,7 @@
#include "cpu/i86/i86.h"
#include "bus/pc_joy/pc_joy.h"
#include "bus/pc_kbd/keyboards.h"
+#include "imagedev/floppy.h"
#include "machine/pc_fdc.h"
#include "formats/asst128_dsk.h"
diff --git a/src/mame/drivers/attache.cpp b/src/mame/drivers/attache.cpp
index ed387c828ce..bfd792e874c 100644
--- a/src/mame/drivers/attache.cpp
+++ b/src/mame/drivers/attache.cpp
@@ -69,6 +69,7 @@
#include "cpu/z80/z80.h"
#include "machine/z80daisy.h"
#include "bus/rs232/rs232.h"
+#include "imagedev/floppy.h"
#include "machine/am9517a.h"
#include "machine/msm5832.h"
#include "machine/nvram.h"
diff --git a/src/mame/drivers/beta.cpp b/src/mame/drivers/beta.cpp
index cfacbab130e..0eaa9a12240 100644
--- a/src/mame/drivers/beta.cpp
+++ b/src/mame/drivers/beta.cpp
@@ -32,6 +32,7 @@
#include "emu.h"
#include "cpu/m6502/m6502.h"
+#include "imagedev/floppy.h"
#include "machine/mos6530n.h"
#include "machine/ram.h"
#include "sound/spkrdev.h"
diff --git a/src/mame/drivers/bigbord2.cpp b/src/mame/drivers/bigbord2.cpp
index 46985f5f8d6..05d051ba298 100644
--- a/src/mame/drivers/bigbord2.cpp
+++ b/src/mame/drivers/bigbord2.cpp
@@ -72,6 +72,7 @@ X - change banks
#include "emu.h"
#include "cpu/z80/z80.h"
+#include "imagedev/floppy.h"
#include "machine/z80daisy.h"
#include "machine/74259.h"
#include "machine/clock.h"
diff --git a/src/mame/drivers/camplynx.cpp b/src/mame/drivers/camplynx.cpp
index a0c61c56c00..74497fa726d 100644
--- a/src/mame/drivers/camplynx.cpp
+++ b/src/mame/drivers/camplynx.cpp
@@ -161,6 +161,7 @@
#include "cpu/z80/z80.h"
#include "imagedev/cassette.h"
+#include "imagedev/floppy.h"
#include "machine/wd_fdc.h"
#include "sound/dac.h"
#include "sound/volt_reg.h"
diff --git a/src/mame/drivers/ccs2810.cpp b/src/mame/drivers/ccs2810.cpp
index 3067d72d8d0..3f7497f9f0e 100644
--- a/src/mame/drivers/ccs2810.cpp
+++ b/src/mame/drivers/ccs2810.cpp
@@ -66,6 +66,7 @@ ToDo:
#include "cpu/z80/z80.h"
#include "bus/rs232/rs232.h"
//#include "bus/s100/s100.h"
+#include "imagedev/floppy.h"
#include "machine/ins8250.h"
#include "machine/ram.h"
#include "machine/wd_fdc.h"
diff --git a/src/mame/drivers/cmi.cpp b/src/mame/drivers/cmi.cpp
index 6867b9ae80e..76de34572e5 100644
--- a/src/mame/drivers/cmi.cpp
+++ b/src/mame/drivers/cmi.cpp
@@ -106,6 +106,7 @@
#include "cpu/m6809/m6809.h"
#include "cpu/m68000/m68000.h"
+#include "imagedev/floppy.h"
#include "machine/6821pia.h"
#include "machine/6840ptm.h"
#include "machine/6850acia.h"
diff --git a/src/mame/drivers/czk80.cpp b/src/mame/drivers/czk80.cpp
index e9c165ce16a..2123acca269 100644
--- a/src/mame/drivers/czk80.cpp
+++ b/src/mame/drivers/czk80.cpp
@@ -40,6 +40,7 @@ I/O ports: These ranges are what is guessed
#include "emu.h"
#include "cpu/z80/z80.h"
+#include "imagedev/floppy.h"
#include "machine/upd765.h"
#include "machine/z80daisy.h"
#include "machine/z80pio.h"
diff --git a/src/mame/drivers/d6809.cpp b/src/mame/drivers/d6809.cpp
index 603a46bbfa9..96f5c9cc371 100644
--- a/src/mame/drivers/d6809.cpp
+++ b/src/mame/drivers/d6809.cpp
@@ -101,6 +101,7 @@ ToDo:
#include "emu.h"
#include "cpu/m6809/m6809.h"
+#include "imagedev/floppy.h"
#include "machine/mos6551.h"
#include "machine/upd765.h"
#include "machine/terminal.h"
diff --git a/src/mame/drivers/dim68k.cpp b/src/mame/drivers/dim68k.cpp
index 7f9a19528dc..745034b553f 100644
--- a/src/mame/drivers/dim68k.cpp
+++ b/src/mame/drivers/dim68k.cpp
@@ -35,6 +35,7 @@
#include "emu.h"
#include "cpu/m68000/m68000.h"
+#include "imagedev/floppy.h"
#include "machine/keyboard.h"
#include "machine/upd765.h"
#include "sound/spkrdev.h"
diff --git a/src/mame/drivers/dmax8000.cpp b/src/mame/drivers/dmax8000.cpp
index 1c2e909f77f..0f1358433ee 100644
--- a/src/mame/drivers/dmax8000.cpp
+++ b/src/mame/drivers/dmax8000.cpp
@@ -25,6 +25,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 "imagedev/floppy.h"
#include "machine/wd_fdc.h"
#include "machine/z80daisy.h"
#include "machine/z80pio.h"
diff --git a/src/mame/drivers/dmv.cpp b/src/mame/drivers/dmv.cpp
index 5b0d48dc7f3..004aef2d2ee 100644
--- a/src/mame/drivers/dmv.cpp
+++ b/src/mame/drivers/dmv.cpp
@@ -13,6 +13,7 @@
#include "cpu/mcs48/mcs48.h"
#include "cpu/z80/z80.h"
+#include "imagedev/floppy.h"
#include "machine/am9517a.h"
#include "machine/dmv_keyb.h"
#include "machine/pit8253.h"
diff --git a/src/mame/drivers/dps1.cpp b/src/mame/drivers/dps1.cpp
index ecc3c5c7931..e829be27e64 100644
--- a/src/mame/drivers/dps1.cpp
+++ b/src/mame/drivers/dps1.cpp
@@ -15,6 +15,7 @@ ToDo:
#include "emu.h"
#include "cpu/z80/z80.h"
+#include "imagedev/floppy.h"
#include "machine/am9519.h"
#include "machine/upd765.h"
#include "machine/mc2661.h"
diff --git a/src/mame/drivers/duet16.cpp b/src/mame/drivers/duet16.cpp
index d786db47473..a9f95fabbeb 100644
--- a/src/mame/drivers/duet16.cpp
+++ b/src/mame/drivers/duet16.cpp
@@ -4,6 +4,7 @@
#include "emu.h"
#include "cpu/i86/i86.h"
#include "cpu/mcs48/mcs48.h"
+#include "imagedev/floppy.h"
#include "machine/i8251.h"
#include "machine/input_merger.h"
#include "machine/pit8253.h"
diff --git a/src/mame/drivers/einstein.cpp b/src/mame/drivers/einstein.cpp
index 0a8cd815e1b..d66c1952253 100644
--- a/src/mame/drivers/einstein.cpp
+++ b/src/mame/drivers/einstein.cpp
@@ -18,6 +18,7 @@
#include "bus/einstein/pipe/pipe.h"
#include "bus/einstein/userport/userport.h"
#include "bus/rs232/rs232.h"
+#include "imagedev/floppy.h"
#include "machine/adc0844.h"
#include "machine/i8251.h"
#include "machine/ram.h"
diff --git a/src/mame/drivers/enmirage.cpp b/src/mame/drivers/enmirage.cpp
index a41abd4f9e1..312b400e68e 100644
--- a/src/mame/drivers/enmirage.cpp
+++ b/src/mame/drivers/enmirage.cpp
@@ -45,6 +45,7 @@
#include "emu.h"
#include "cpu/m6809/m6809.h"
+#include "imagedev/floppy.h"
#include "machine/6850acia.h"
#include "machine/6522via.h"
#include "machine/wd_fdc.h"
diff --git a/src/mame/drivers/esq5505.cpp b/src/mame/drivers/esq5505.cpp
index 49214d1a5c2..ba790ee8dd6 100644
--- a/src/mame/drivers/esq5505.cpp
+++ b/src/mame/drivers/esq5505.cpp
@@ -132,6 +132,7 @@
#include "cpu/es5510/es5510.h"
#include "cpu/m68000/m68000.h"
#include "formats/esq16_dsk.h"
+#include "imagedev/floppy.h"
#include "machine/esqlcd.h"
#include "machine/esqpanel.h"
#include "machine/esqvfd.h"
diff --git a/src/mame/drivers/eurocom2.cpp b/src/mame/drivers/eurocom2.cpp
index eb6086d8f33..5b4a165f122 100644
--- a/src/mame/drivers/eurocom2.cpp
+++ b/src/mame/drivers/eurocom2.cpp
@@ -33,6 +33,7 @@
#include "bus/rs232/rs232.h"
#include "cpu/m6809/m6809.h"
#include "formats/ppg_dsk.h"
+#include "imagedev/floppy.h"
#include "machine/6821pia.h"
#include "machine/6840ptm.h"
#include "machine/6850acia.h"
diff --git a/src/mame/drivers/excali64.cpp b/src/mame/drivers/excali64.cpp
index c0f1d99c4d6..52c2e2c553b 100644
--- a/src/mame/drivers/excali64.cpp
+++ b/src/mame/drivers/excali64.cpp
@@ -35,6 +35,7 @@ ToDo:
#include "bus/rs232/rs232.h"
#include "cpu/z80/z80.h"
#include "imagedev/cassette.h"
+#include "imagedev/floppy.h"
#include "machine/74123.h"
#include "machine/i8251.h"
#include "machine/i8255.h"
diff --git a/src/mame/drivers/fanucspmg.cpp b/src/mame/drivers/fanucspmg.cpp
index 980f6b47bc8..992b9f0fc09 100644
--- a/src/mame/drivers/fanucspmg.cpp
+++ b/src/mame/drivers/fanucspmg.cpp
@@ -531,6 +531,7 @@ the keypad symbols seem to use a different matrix pattern from the rest?
#include "cpu/i8085/i8085.h"
#include "cpu/i86/i86.h"
+#include "imagedev/floppy.h"
#include "machine/i8251.h"
#include "machine/i8257.h"
#include "machine/i8087.h"
diff --git a/src/mame/drivers/gimix.cpp b/src/mame/drivers/gimix.cpp
index d67c164b3fd..9bb836521ca 100644
--- a/src/mame/drivers/gimix.cpp
+++ b/src/mame/drivers/gimix.cpp
@@ -23,6 +23,7 @@
#include "emu.h"
#include "cpu/m6809/m6809.h"
+#include "imagedev/floppy.h"
#include "machine/mm58167.h"
#include "machine/6840ptm.h"
#include "machine/6821pia.h"
diff --git a/src/mame/drivers/goupil.cpp b/src/mame/drivers/goupil.cpp
index 8a6c47b2a73..43bfa1650a3 100644
--- a/src/mame/drivers/goupil.cpp
+++ b/src/mame/drivers/goupil.cpp
@@ -24,6 +24,7 @@
#include "emu.h"
#include "cpu/m6800/m6800.h"
+#include "imagedev/floppy.h"
#include "machine/ram.h"
#include "machine/6522via.h"
#include "machine/6850acia.h"
diff --git a/src/mame/drivers/guab.cpp b/src/mame/drivers/guab.cpp
index cd8280ac891..04473a0f4ee 100644
--- a/src/mame/drivers/guab.cpp
+++ b/src/mame/drivers/guab.cpp
@@ -48,6 +48,7 @@
#include "cpu/m68000/m68000.h"
#include "bus/rs232/rs232.h"
#include "formats/guab_dsk.h"
+#include "imagedev/floppy.h"
#include "machine/6840ptm.h"
#include "machine/6850acia.h"
#include "machine/clock.h"
diff --git a/src/mame/drivers/hp64k.cpp b/src/mame/drivers/hp64k.cpp
index 9ae8ad5ee7c..b24336b4301 100644
--- a/src/mame/drivers/hp64k.cpp
+++ b/src/mame/drivers/hp64k.cpp
@@ -149,6 +149,7 @@
#include "emu.h"
#include "bus/rs232/rs232.h"
#include "cpu/hphybrid/hphybrid.h"
+#include "imagedev/floppy.h"
#include "machine/74123.h"
#include "machine/com8116.h"
#include "machine/i8251.h"
diff --git a/src/mame/drivers/hp_ipc.cpp b/src/mame/drivers/hp_ipc.cpp
index a8c503788da..3a5cf6aa450 100644
--- a/src/mame/drivers/hp_ipc.cpp
+++ b/src/mame/drivers/hp_ipc.cpp
@@ -366,6 +366,7 @@ Software to look for
#include "bus/hp_hil/hil_devices.h"
#include "cpu/m68000/m68000.h"
#include "formats/hp_ipc_dsk.h"
+#include "imagedev/floppy.h"
#include "machine/bankdev.h"
#include "machine/mm58167.h"
#include "machine/ram.h"
diff --git a/src/mame/drivers/ht68k.cpp b/src/mame/drivers/ht68k.cpp
index 654fc908e50..6f5a8f64a8b 100644
--- a/src/mame/drivers/ht68k.cpp
+++ b/src/mame/drivers/ht68k.cpp
@@ -31,6 +31,7 @@ Lot of infos available at: http://www.classiccmp.org/cini/ht68k.htm
#include "emu.h"
#include "bus/rs232/rs232.h"
#include "cpu/m68000/m68000.h"
+#include "imagedev/floppy.h"
#include "machine/mc68681.h"
#include "machine/wd_fdc.h"
#include "softlist.h"
diff --git a/src/mame/drivers/icebox.cpp b/src/mame/drivers/icebox.cpp
index b1052d290fb..fc037cfc0e2 100644
--- a/src/mame/drivers/icebox.cpp
+++ b/src/mame/drivers/icebox.cpp
@@ -118,6 +118,7 @@ http://bitsavers.org/pdf/caltech/ovro/Caltech-OVRO_Forth_Manual_Jun78.pdf
#include "emu.h"
#include "cpu/z80/z80.h"
+#include "imagedev/floppy.h"
#include "machine/i8251.h"
#include "machine/com8116.h"
#include "bus/rs232/rs232.h"
diff --git a/src/mame/drivers/itt3030.cpp b/src/mame/drivers/itt3030.cpp
index b5bfce7f1e5..b2eab8073bf 100644
--- a/src/mame/drivers/itt3030.cpp
+++ b/src/mame/drivers/itt3030.cpp
@@ -192,6 +192,7 @@ Beeper Circuit, all ICs shown:
#include "emu.h"
#include "cpu/mcs48/mcs48.h" //Keyboard MCU ... talks to the 8278 on the keyboard circuit
#include "cpu/z80/z80.h"
+#include "imagedev/floppy.h"
#include "machine/bankdev.h"
#include "machine/ram.h"
#include "machine/wd_fdc.h"
diff --git a/src/mame/drivers/jupiter.cpp b/src/mame/drivers/jupiter.cpp
index eb449a3bfbf..bea56375950 100644
--- a/src/mame/drivers/jupiter.cpp
+++ b/src/mame/drivers/jupiter.cpp
@@ -28,6 +28,7 @@ ToDo: (both)
#include "emu.h"
#include "cpu/m6800/m6800.h"
#include "cpu/z80/z80.h"
+#include "imagedev/floppy.h"
#include "machine/keyboard.h"
#include "machine/6850acia.h"
#include "bus/rs232/rs232.h"
diff --git a/src/mame/drivers/kdt6.cpp b/src/mame/drivers/kdt6.cpp
index 2d4c9309c32..e201993d87a 100644
--- a/src/mame/drivers/kdt6.cpp
+++ b/src/mame/drivers/kdt6.cpp
@@ -13,6 +13,7 @@
#include "emu.h"
#include "cpu/z80/z80.h"
+#include "imagedev/floppy.h"
#include "machine/timer.h"
#include "machine/z80ctc.h"
#include "machine/z80dma.h"
diff --git a/src/mame/drivers/m20.cpp b/src/mame/drivers/m20.cpp
index b89732137e0..a16c42bc3b2 100644
--- a/src/mame/drivers/m20.cpp
+++ b/src/mame/drivers/m20.cpp
@@ -43,6 +43,7 @@ E I1 Vectored interrupt error
#include "bus/rs232/rs232.h"
#include "cpu/i86/i86.h"
#include "cpu/z8000/z8000.h"
+#include "imagedev/floppy.h"
#include "machine/i8251.h"
#include "machine/i8255.h"
#include "machine/pic8259.h"
diff --git a/src/mame/drivers/mbc200.cpp b/src/mame/drivers/mbc200.cpp
index bfd1258ee6e..4c22b3f5324 100644
--- a/src/mame/drivers/mbc200.cpp
+++ b/src/mame/drivers/mbc200.cpp
@@ -45,6 +45,7 @@ TODO:
#include "emu.h"
#include "cpu/z80/z80.h"
+#include "imagedev/floppy.h"
#include "machine/i8251.h"
#include "machine/i8255.h"
#include "machine/keyboard.h"
diff --git a/src/mame/drivers/microdec.cpp b/src/mame/drivers/microdec.cpp
index f8a3d10e8eb..7449b881c9c 100644
--- a/src/mame/drivers/microdec.cpp
+++ b/src/mame/drivers/microdec.cpp
@@ -28,6 +28,7 @@ ToDo:
#include "emu.h"
#include "cpu/z80/z80.h"
+#include "imagedev/floppy.h"
#include "machine/upd765.h"
#include "machine/clock.h"
#include "machine/i8251.h"
diff --git a/src/mame/drivers/miniframe.cpp b/src/mame/drivers/miniframe.cpp
index 92e76c4bd30..552017c6b64 100644
--- a/src/mame/drivers/miniframe.cpp
+++ b/src/mame/drivers/miniframe.cpp
@@ -11,6 +11,7 @@
#include "emu.h"
#include "cpu/m68000/m68000.h"
+#include "imagedev/floppy.h"
#include "machine/ram.h"
#include "machine/wd_fdc.h"
#include "machine/bankdev.h"
diff --git a/src/mame/drivers/mips.cpp b/src/mame/drivers/mips.cpp
index 85c15f47ddd..4ee6203addd 100644
--- a/src/mame/drivers/mips.cpp
+++ b/src/mame/drivers/mips.cpp
@@ -132,6 +132,8 @@
#include "includes/mips.h"
+#include "imagedev/floppy.h"
+
#include "debugger.h"
#define LOG_GENERAL (1U << 0)
diff --git a/src/mame/drivers/ms0515.cpp b/src/mame/drivers/ms0515.cpp
index ee0c2878ea7..6fb9ae6f081 100644
--- a/src/mame/drivers/ms0515.cpp
+++ b/src/mame/drivers/ms0515.cpp
@@ -29,6 +29,7 @@
#include "bus/rs232/rs232.h"
#include "cpu/t11/t11.h"
+#include "imagedev/floppy.h"
#include "machine/clock.h"
#include "machine/i8251.h"
#include "machine/i8255.h"
diff --git a/src/mame/drivers/mycom.cpp b/src/mame/drivers/mycom.cpp
index c3369a115e3..8500fbed27d 100644
--- a/src/mame/drivers/mycom.cpp
+++ b/src/mame/drivers/mycom.cpp
@@ -51,6 +51,7 @@
#include "emu.h"
#include "cpu/z80/z80.h"
#include "imagedev/cassette.h"
+#include "imagedev/floppy.h"
#include "machine/i8255.h"
#include "machine/msm5832.h"
#include "machine/timer.h"
diff --git a/src/mame/drivers/mz3500.cpp b/src/mame/drivers/mz3500.cpp
index 861e6fef769..10a5b39383b 100644
--- a/src/mame/drivers/mz3500.cpp
+++ b/src/mame/drivers/mz3500.cpp
@@ -30,6 +30,7 @@
#include "emu.h"
#include "cpu/z80/z80.h"
+#include "imagedev/floppy.h"
#include "machine/upd765.h"
#include "machine/i8255.h"
#include "machine/pit8253.h"
diff --git a/src/mame/drivers/mz6500.cpp b/src/mame/drivers/mz6500.cpp
index adc199e03a0..0e78bcdf745 100644
--- a/src/mame/drivers/mz6500.cpp
+++ b/src/mame/drivers/mz6500.cpp
@@ -10,6 +10,7 @@
#include "emu.h"
#include "cpu/i86/i86.h"
+#include "imagedev/floppy.h"
#include "machine/upd765.h"
#include "video/upd7220.h"
#include "emupal.h"
diff --git a/src/mame/drivers/nanos.cpp b/src/mame/drivers/nanos.cpp
index 38c2a6db01a..1c511c10adb 100644
--- a/src/mame/drivers/nanos.cpp
+++ b/src/mame/drivers/nanos.cpp
@@ -11,6 +11,7 @@
#include "emu.h"
#include "cpu/z80/z80.h"
+#include "imagedev/floppy.h"
#include "machine/z80daisy.h"
#include "machine/ram.h"
#include "machine/timer.h"
diff --git a/src/mame/drivers/nc.cpp b/src/mame/drivers/nc.cpp
index bcec4300fad..1630eb6aa6e 100644
--- a/src/mame/drivers/nc.cpp
+++ b/src/mame/drivers/nc.cpp
@@ -99,6 +99,7 @@
#include "includes/nc.h"
#include "cpu/z80/z80.h"
+#include "imagedev/floppy.h"
#include "machine/mc146818.h" // for NC200 real time clock
#include "machine/rp5c01.h" // for NC100 real time clock
#include "formats/pc_dsk.h" // for NC200 disk image
diff --git a/src/mame/drivers/ngen.cpp b/src/mame/drivers/ngen.cpp
index 2eb027c09d5..26eb9838464 100644
--- a/src/mame/drivers/ngen.cpp
+++ b/src/mame/drivers/ngen.cpp
@@ -65,6 +65,7 @@
#include "bus/rs232/rs232.h"
#include "cpu/i386/i386.h"
#include "cpu/i86/i186.h"
+#include "imagedev/floppy.h"
#include "imagedev/harddriv.h"
#include "machine/am9517a.h"
#include "machine/clock.h"
diff --git a/src/mame/drivers/notetaker.cpp b/src/mame/drivers/notetaker.cpp
index b35cad7af75..d26dd61c627 100644
--- a/src/mame/drivers/notetaker.cpp
+++ b/src/mame/drivers/notetaker.cpp
@@ -102,6 +102,7 @@ DONE:
#include "emu.h"
#include "cpu/i86/i86.h"
+#include "imagedev/floppy.h"
#include "machine/ay31015.h"
#include "machine/pic8259.h"
#include "machine/wd_fdc.h"
diff --git a/src/mame/drivers/olyboss.cpp b/src/mame/drivers/olyboss.cpp
index f164741811d..bbf469f3c2e 100644
--- a/src/mame/drivers/olyboss.cpp
+++ b/src/mame/drivers/olyboss.cpp
@@ -36,6 +36,7 @@
#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/i8085/i8085.h"
+#include "imagedev/floppy.h"
#include "machine/keyboard.h"
#include "video/upd3301.h"
#include "machine/i8257.h"
diff --git a/src/mame/drivers/olytext.cpp b/src/mame/drivers/olytext.cpp
index 78c36763dec..9af7a15d98f 100644
--- a/src/mame/drivers/olytext.cpp
+++ b/src/mame/drivers/olytext.cpp
@@ -23,6 +23,7 @@
#include "emu.h"
#include "cpu/z80/z80.h"
+#include "imagedev/floppy.h"
#include "machine/wd_fdc.h"
#include "machine/keyboard.h"
#include "emupal.h"
diff --git a/src/mame/drivers/osbexec.cpp b/src/mame/drivers/osbexec.cpp
index 4f937ae5d14..e01519bcbf0 100644
--- a/src/mame/drivers/osbexec.cpp
+++ b/src/mame/drivers/osbexec.cpp
@@ -10,6 +10,7 @@
#include "bus/rs232/rs232.h"
#include "cpu/z80/z80.h"
+#include "imagedev/floppy.h"
#include "machine/z80daisy.h"
#include "machine/6821pia.h"
#include "machine/input_merger.h"
diff --git a/src/mame/drivers/p8k.cpp b/src/mame/drivers/p8k.cpp
index fa91464b0c8..9e6625a21a7 100644
--- a/src/mame/drivers/p8k.cpp
+++ b/src/mame/drivers/p8k.cpp
@@ -49,6 +49,7 @@
#include "cpu/z80/z80.h"
#include "machine/z80daisy.h"
#include "cpu/z8000/z8000.h"
+#include "imagedev/floppy.h"
#include "machine/upd765.h"
#include "machine/z80ctc.h"
#include "machine/z80sio.h"
diff --git a/src/mame/drivers/pasopia7.cpp b/src/mame/drivers/pasopia7.cpp
index e485c675a85..78588632151 100644
--- a/src/mame/drivers/pasopia7.cpp
+++ b/src/mame/drivers/pasopia7.cpp
@@ -25,6 +25,7 @@
#include "includes/pasopia.h"
#include "cpu/z80/z80.h"
+#include "imagedev/floppy.h"
#include "machine/i8255.h"
#include "machine/upd765.h"
#include "machine/z80ctc.h"
diff --git a/src/mame/drivers/pcd.cpp b/src/mame/drivers/pcd.cpp
index 2805ff9780e..127530249c7 100644
--- a/src/mame/drivers/pcd.cpp
+++ b/src/mame/drivers/pcd.cpp
@@ -15,6 +15,7 @@
#include "bus/rs232/rs232.h"
#include "bus/scsi/omti5100.h"
#include "cpu/i86/i186.h"
+#include "imagedev/floppy.h"
#include "machine/mc146818.h"
#include "machine/mc2661.h"
#include "machine/nvram.h"
diff --git a/src/mame/drivers/peoplepc.cpp b/src/mame/drivers/peoplepc.cpp
index c8f85258605..10e4c8a4fe0 100644
--- a/src/mame/drivers/peoplepc.cpp
+++ b/src/mame/drivers/peoplepc.cpp
@@ -3,6 +3,7 @@
#include "emu.h"
#include "cpu/i86/i86.h"
+#include "imagedev/floppy.h"
#include "machine/pic8259.h"
#include "machine/pit8253.h"
#include "machine/i8255.h"
diff --git a/src/mame/drivers/pg685.cpp b/src/mame/drivers/pg685.cpp
index cd9db8c52fc..2778847fd66 100644
--- a/src/mame/drivers/pg685.cpp
+++ b/src/mame/drivers/pg685.cpp
@@ -82,6 +82,7 @@ Memory: 54x 64KBit RAM, 18 empty sockets, 9 bit and 4 bit wire straps
#include "cpu/i86/i286.h"
#include "cpu/i86/i86.h"
#include "cpu/nec/nec.h"
+#include "imagedev/floppy.h"
#include "machine/i8251.h"
#include "machine/i8255.h"
#include "machine/i8279.h"
diff --git a/src/mame/drivers/prof180x.cpp b/src/mame/drivers/prof180x.cpp
index 0ba1d386377..a6ecb6ab273 100644
--- a/src/mame/drivers/prof180x.cpp
+++ b/src/mame/drivers/prof180x.cpp
@@ -27,6 +27,7 @@
#include "includes/prof180x.h"
#include "cpu/z80/z80.h"
+#include "imagedev/floppy.h"
#include "machine/ram.h"
#include "machine/upd765.h"
#include "screen.h"
diff --git a/src/mame/drivers/proteus.cpp b/src/mame/drivers/proteus.cpp
index 689813e5da8..17d6ef67eff 100644
--- a/src/mame/drivers/proteus.cpp
+++ b/src/mame/drivers/proteus.cpp
@@ -42,6 +42,7 @@
#include "emu.h"
#include "cpu/m6809/m6809.h"
#include "cpu/z80/z80.h"
+#include "imagedev/floppy.h"
#include "machine/6821pia.h"
#include "machine/6840ptm.h"
#include "machine/6850acia.h"
diff --git a/src/mame/drivers/pulsar.cpp b/src/mame/drivers/pulsar.cpp
index 481537ccbad..8efe47911b5 100644
--- a/src/mame/drivers/pulsar.cpp
+++ b/src/mame/drivers/pulsar.cpp
@@ -41,6 +41,7 @@ X - Test off-board memory banks
#include "emu.h"
#include "bus/rs232/rs232.h"
#include "cpu/z80/z80.h"
+#include "imagedev/floppy.h"
#include "machine/z80daisy.h"
#include "machine/z80dart.h"
#include "machine/msm5832.h"
diff --git a/src/mame/drivers/pwrview.cpp b/src/mame/drivers/pwrview.cpp
index 1b10cb79fcd..e2e12f97988 100644
--- a/src/mame/drivers/pwrview.cpp
+++ b/src/mame/drivers/pwrview.cpp
@@ -8,6 +8,7 @@
#include "emu.h"
#include "cpu/i86/i186.h"
+#include "imagedev/floppy.h"
#include "machine/upd765.h"
#include "machine/i8251.h"
#include "machine/z80dart.h"
diff --git a/src/mame/drivers/pyl601.cpp b/src/mame/drivers/pyl601.cpp
index 22e435868c7..861df9814d6 100644
--- a/src/mame/drivers/pyl601.cpp
+++ b/src/mame/drivers/pyl601.cpp
@@ -37,6 +37,7 @@
#include "emu.h"
#include "cpu/m6800/m6800.h"
+#include "imagedev/floppy.h"
#include "machine/ram.h"
#include "machine/upd765.h"
#include "sound/spkrdev.h"
diff --git a/src/mame/drivers/qx10.cpp b/src/mame/drivers/qx10.cpp
index d28d48cb4d6..3303cb96d19 100644
--- a/src/mame/drivers/qx10.cpp
+++ b/src/mame/drivers/qx10.cpp
@@ -35,6 +35,7 @@
#include "bus/rs232/rs232.h"
#include "cpu/z80/z80.h"
+#include "imagedev/floppy.h"
#include "machine/am9517a.h"
#include "machine/i8255.h"
#include "machine/mc146818.h"
diff --git a/src/mame/drivers/rc702.cpp b/src/mame/drivers/rc702.cpp
index 0b1d4912a5f..3118eb79565 100644
--- a/src/mame/drivers/rc702.cpp
+++ b/src/mame/drivers/rc702.cpp
@@ -24,6 +24,7 @@ Issues:
#include "bus/rs232/rs232.h"
#include "cpu/z80/z80.h"
+#include "imagedev/floppy.h"
#include "machine/z80daisy.h"
#include "machine/7474.h"
#include "machine/am9517a.h"
diff --git a/src/mame/drivers/rc759.cpp b/src/mame/drivers/rc759.cpp
index d188eb3fd24..5a6b107d558 100644
--- a/src/mame/drivers/rc759.cpp
+++ b/src/mame/drivers/rc759.cpp
@@ -12,6 +12,7 @@
#include "cpu/i86/i186.h"
#include "imagedev/cassette.h"
+#include "imagedev/floppy.h"
#include "machine/i8255.h"
#include "machine/keyboard.h"
#include "machine/mm58167.h"
diff --git a/src/mame/drivers/sbrain.cpp b/src/mame/drivers/sbrain.cpp
index fc143eb1af5..647b624d74c 100644
--- a/src/mame/drivers/sbrain.cpp
+++ b/src/mame/drivers/sbrain.cpp
@@ -40,6 +40,7 @@ To Do:
#include "emu.h"
#include "cpu/z80/z80.h"
#include "bus/rs232/rs232.h"
+#include "imagedev/floppy.h"
#include "machine/com8116.h"
#include "machine/i8251.h"
#include "machine/i8255.h"
diff --git a/src/mame/drivers/slicer.cpp b/src/mame/drivers/slicer.cpp
index 79e14f9fd8a..cc388934a9d 100644
--- a/src/mame/drivers/slicer.cpp
+++ b/src/mame/drivers/slicer.cpp
@@ -7,6 +7,7 @@
#include "emu.h"
#include "cpu/i86/i186.h"
+#include "imagedev/floppy.h"
#include "machine/74259.h"
#include "machine/wd_fdc.h"
#include "machine/mc68681.h"
diff --git a/src/mame/drivers/smc777.cpp b/src/mame/drivers/smc777.cpp
index 08ea1dc41fa..3bc8655453c 100644
--- a/src/mame/drivers/smc777.cpp
+++ b/src/mame/drivers/smc777.cpp
@@ -21,7 +21,7 @@
#include "emu.h"
#include "cpu/z80/z80.h"
-#include "imagedev/flopdrv.h"
+#include "imagedev/floppy.h"
#include "machine/timer.h"
#include "machine/wd_fdc.h"
#include "sound/beep.h"
diff --git a/src/mame/drivers/squale.cpp b/src/mame/drivers/squale.cpp
index 5e434cd86f7..b8d71898146 100644
--- a/src/mame/drivers/squale.cpp
+++ b/src/mame/drivers/squale.cpp
@@ -59,6 +59,7 @@
#include "bus/generic/carts.h"
#include "bus/generic/slot.h"
#include "cpu/m6809/m6809.h"
+#include "imagedev/floppy.h"
#include "machine/6821pia.h"
#include "machine/6850acia.h"
#include "machine/timer.h"
diff --git a/src/mame/drivers/sun3x.cpp b/src/mame/drivers/sun3x.cpp
index 062c8d3265e..6fb4a9d82a1 100644
--- a/src/mame/drivers/sun3x.cpp
+++ b/src/mame/drivers/sun3x.cpp
@@ -135,6 +135,7 @@
#include "cpu/m68000/m68000.h"
#include "formats/mfi_dsk.h"
#include "formats/pc_dsk.h"
+#include "imagedev/floppy.h"
#include "machine/ncr539x.h"
#include "machine/timekpr.h"
#include "machine/timer.h"
diff --git a/src/mame/drivers/sun4.cpp b/src/mame/drivers/sun4.cpp
index 8e6e2558409..8647575379e 100644
--- a/src/mame/drivers/sun4.cpp
+++ b/src/mame/drivers/sun4.cpp
@@ -417,6 +417,7 @@
#include "bus/sbus/sbus.h"
#include "bus/sbus/bwtwo.h"
#include "cpu/sparc/sparc.h"
+#include "imagedev/floppy.h"
#include "machine/am79c90.h"
#include "machine/bankdev.h"
#include "machine/ncr5390.h"
diff --git a/src/mame/drivers/tavernie.cpp b/src/mame/drivers/tavernie.cpp
index d6753e55a84..86b58ee4e76 100644
--- a/src/mame/drivers/tavernie.cpp
+++ b/src/mame/drivers/tavernie.cpp
@@ -53,6 +53,7 @@ Z - more scan lines per row (cursor is bigger)
#include "bus/rs232/rs232.h"
#include "cpu/m6809/m6809.h"
#include "imagedev/cassette.h"
+#include "imagedev/floppy.h"
#include "machine/6821pia.h"
#include "machine/6840ptm.h"
#include "machine/6850acia.h"
diff --git a/src/mame/drivers/tim011.cpp b/src/mame/drivers/tim011.cpp
index 61d70ecccc7..eabf4f92de8 100644
--- a/src/mame/drivers/tim011.cpp
+++ b/src/mame/drivers/tim011.cpp
@@ -10,6 +10,7 @@
#include "emu.h"
#include "cpu/z180/z180.h"
+#include "imagedev/floppy.h"
#include "machine/upd765.h"
#include "emupal.h"
#include "screen.h"
diff --git a/src/mame/drivers/ts802.cpp b/src/mame/drivers/ts802.cpp
index 36d2579f0e2..1f3ca782d91 100644
--- a/src/mame/drivers/ts802.cpp
+++ b/src/mame/drivers/ts802.cpp
@@ -23,6 +23,7 @@
#include "emu.h"
#include "cpu/z80/z80.h"
+#include "imagedev/floppy.h"
#include "machine/z80daisy.h"
#include "machine/terminal.h"
#include "machine/z80dma.h"
diff --git a/src/mame/drivers/ts803.cpp b/src/mame/drivers/ts803.cpp
index 4d73a014587..fc631616ee6 100644
--- a/src/mame/drivers/ts803.cpp
+++ b/src/mame/drivers/ts803.cpp
@@ -48,6 +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 "imagedev/floppy.h"
#include "machine/z80daisy.h"
#include "machine/keyboard.h"
#include "machine/timer.h"
diff --git a/src/mame/drivers/unixpc.cpp b/src/mame/drivers/unixpc.cpp
index b71015bb4ab..aae3cc50cde 100644
--- a/src/mame/drivers/unixpc.cpp
+++ b/src/mame/drivers/unixpc.cpp
@@ -19,6 +19,7 @@
#include "cpu/m68000/m68000.h"
#include "bus/centronics/ctronics.h"
#include "bus/rs232/rs232.h"
+#include "imagedev/floppy.h"
#include "machine/6850acia.h"
#include "machine/74259.h"
#include "machine/bankdev.h"
diff --git a/src/mame/drivers/v6809.cpp b/src/mame/drivers/v6809.cpp
index c07e56e1229..c9fbcad7fcc 100644
--- a/src/mame/drivers/v6809.cpp
+++ b/src/mame/drivers/v6809.cpp
@@ -50,6 +50,7 @@ ToDo:
#include "emu.h"
#include "cpu/m6809/m6809.h"
+#include "imagedev/floppy.h"
#include "machine/6821pia.h"
#include "machine/6840ptm.h"
#include "machine/6850acia.h"
diff --git a/src/mame/drivers/wangpc.cpp b/src/mame/drivers/wangpc.cpp
index 922f098a411..1be93bb9be3 100644
--- a/src/mame/drivers/wangpc.cpp
+++ b/src/mame/drivers/wangpc.cpp
@@ -26,6 +26,7 @@
#include "bus/wangpc/wangpc.h"
#include "cpu/i86/i86.h"
#include "formats/pc_dsk.h"
+#include "imagedev/floppy.h"
#include "machine/am9517a.h"
#include "machine/i8255.h"
#include "machine/im6402.h"
diff --git a/src/mame/drivers/wicat.cpp b/src/mame/drivers/wicat.cpp
index 67b1173c318..2755c587f30 100644
--- a/src/mame/drivers/wicat.cpp
+++ b/src/mame/drivers/wicat.cpp
@@ -22,6 +22,7 @@ Wicat - various systems.
#include "cpu/8x300/8x300.h"
#include "cpu/m68000/m68000.h"
#include "cpu/z8000/z8000.h"
+#include "imagedev/floppy.h"
#include "machine/74259.h"
#include "machine/6522via.h"
#include "machine/am9517a.h"
diff --git a/src/mame/includes/abc1600.h b/src/mame/includes/abc1600.h
index 01f17f7171a..262bdce4cc6 100644
--- a/src/mame/includes/abc1600.h
+++ b/src/mame/includes/abc1600.h
@@ -18,6 +18,7 @@
#include "machine/z80dart.h"
#include "machine/z80dma.h"
#include "machine/z8536.h"
+#include "imagedev/floppy.h"
#include "video/abc1600.h"
diff --git a/src/mame/includes/amstrad.h b/src/mame/includes/amstrad.h
index 7b3b1bda601..ac333140579 100644
--- a/src/mame/includes/amstrad.h
+++ b/src/mame/includes/amstrad.h
@@ -16,6 +16,7 @@
#include "video/mc6845.h"
#include "machine/i8255.h"
#include "machine/mc146818.h"
+#include "imagedev/floppy.h"
#include "imagedev/snapquik.h"
#include "bus/cpc/cpcexp.h"
#include "bus/cpc/ddi1.h"
diff --git a/src/mame/includes/archimds.h b/src/mame/includes/archimds.h
index 713d93c22bd..3cf49d4a768 100644
--- a/src/mame/includes/archimds.h
+++ b/src/mame/includes/archimds.h
@@ -13,6 +13,7 @@
#include "sound/dac.h"
#include "machine/i2cmem.h"
#include "machine/wd_fdc.h"
+#include "imagedev/floppy.h"
#include "emupal.h"
#include "screen.h"
diff --git a/src/mame/includes/atarist.h b/src/mame/includes/atarist.h
index 0fe15731cfb..0d60c5e787c 100644
--- a/src/mame/includes/atarist.h
+++ b/src/mame/includes/atarist.h
@@ -13,6 +13,7 @@
#include "bus/centronics/ctronics.h"
#include "bus/generic/slot.h"
#include "bus/generic/carts.h"
+#include "imagedev/floppy.h"
#include "machine/mc68901.h"
#include "machine/ram.h"
#include "machine/rescap.h"
diff --git a/src/mame/includes/aussiebyte.h b/src/mame/includes/aussiebyte.h
index cbbab83cd75..bd4b51aba70 100644
--- a/src/mame/includes/aussiebyte.h
+++ b/src/mame/includes/aussiebyte.h
@@ -16,6 +16,7 @@
#include "cpu/z80/z80.h"
#include "machine/z80daisy.h"
+#include "imagedev/floppy.h"
#include "machine/msm5832.h"
#include "machine/wd_fdc.h"
#include "machine/z80ctc.h"
diff --git a/src/mame/includes/bbc.h b/src/mame/includes/bbc.h
index b18b6db1c69..61f040b1804 100644
--- a/src/mame/includes/bbc.h
+++ b/src/mame/includes/bbc.h
@@ -14,6 +14,7 @@
#include "cpu/m6502/m6502.h"
#include "cpu/m6502/m65sc02.h"
+#include "imagedev/floppy.h"
#include "machine/74259.h"
#include "machine/6522via.h"
#include "machine/6850acia.h"
diff --git a/src/mame/includes/bebox.h b/src/mame/includes/bebox.h
index 92cb69eafc3..85a1eb3abdd 100644
--- a/src/mame/includes/bebox.h
+++ b/src/mame/includes/bebox.h
@@ -13,6 +13,7 @@
#include "cpu/powerpc/ppc.h"
+#include "imagedev/floppy.h"
#include "machine/53c810.h"
#include "machine/am9517a.h"
#include "machine/idectrl.h"
diff --git a/src/mame/includes/bullet.h b/src/mame/includes/bullet.h
index d4aa8e4d179..558fc877a80 100644
--- a/src/mame/includes/bullet.h
+++ b/src/mame/includes/bullet.h
@@ -7,8 +7,9 @@
#include "cpu/z80/z80.h"
#include "bus/centronics/ctronics.h"
-#include "machine/ram.h"
#include "bus/scsi/scsi.h"
+#include "imagedev/floppy.h"
+#include "machine/ram.h"
#include "machine/timer.h"
#include "machine/wd_fdc.h"
#include "machine/z80ctc.h"
diff --git a/src/mame/includes/bw12.h b/src/mame/includes/bw12.h
index c3fed54dc08..893dad9d27c 100644
--- a/src/mame/includes/bw12.h
+++ b/src/mame/includes/bw12.h
@@ -7,6 +7,7 @@
#include "cpu/z80/z80.h"
#include "machine/ram.h"
#include "formats/bw12_dsk.h"
+#include "imagedev/floppy.h"
#include "machine/6821pia.h"
#include "bus/centronics/ctronics.h"
#include "machine/kb3600.h"
diff --git a/src/mame/includes/bw2.h b/src/mame/includes/bw2.h
index ee692f30b71..0c1202a6a94 100644
--- a/src/mame/includes/bw2.h
+++ b/src/mame/includes/bw2.h
@@ -8,6 +8,7 @@
#include "bus/bw2/exp.h"
#include "cpu/z80/z80.h"
#include "formats/bw2_dsk.h"
+#include "imagedev/floppy.h"
#include "bus/centronics/ctronics.h"
#include "machine/i8251.h"
#include "machine/i8255.h"
diff --git a/src/mame/includes/dgn_beta.h b/src/mame/includes/dgn_beta.h
index 69fd714face..d3aaef6eaa0 100644
--- a/src/mame/includes/dgn_beta.h
+++ b/src/mame/includes/dgn_beta.h
@@ -12,6 +12,7 @@
#pragma once
#include "video/mc6845.h"
+#include "imagedev/floppy.h"
#include "machine/wd_fdc.h"
#include "machine/6821pia.h"
#include "machine/ram.h"
diff --git a/src/mame/includes/fm7.h b/src/mame/includes/fm7.h
index 1f086dab1e6..5a8f07ac8b7 100644
--- a/src/mame/includes/fm7.h
+++ b/src/mame/includes/fm7.h
@@ -14,6 +14,7 @@
#include "machine/buffer.h"
#include "bus/centronics/ctronics.h"
#include "imagedev/cassette.h"
+#include "imagedev/floppy.h"
#include "sound/beep.h"
#include "sound/2203intf.h"
#include "machine/wd_fdc.h"
diff --git a/src/mame/includes/interpro.h b/src/mame/includes/interpro.h
index 350d9ed6737..ad28c68a546 100644
--- a/src/mame/includes/interpro.h
+++ b/src/mame/includes/interpro.h
@@ -14,6 +14,7 @@
#include "machine/interpro_sga.h"
#include "machine/interpro_arbga.h"
+#include "imagedev/floppy.h"
#include "machine/ram.h"
#include "machine/28fxxx.h"
#include "machine/mc146818.h"
diff --git a/src/mame/includes/kaypro.h b/src/mame/includes/kaypro.h
index 893cd61bd5c..1999a6ded80 100644
--- a/src/mame/includes/kaypro.h
+++ b/src/mame/includes/kaypro.h
@@ -9,6 +9,7 @@
#include "machine/z80daisy.h"
#include "machine/z80pio.h"
#include "bus/centronics/ctronics.h"
+#include "imagedev/floppy.h"
#include "imagedev/snapquik.h"
#include "sound/beep.h"
#include "video/mc6845.h"
diff --git a/src/mame/includes/m5.h b/src/mame/includes/m5.h
index de2eaab34ae..1a01d695f87 100644
--- a/src/mame/includes/m5.h
+++ b/src/mame/includes/m5.h
@@ -4,6 +4,7 @@
#define MAME_INCLUDES_M5_H
#include "imagedev/cassette.h"
+#include "imagedev/floppy.h"
#include "imagedev/snapquik.h"
#include "cpu/z80/z80.h"
diff --git a/src/mame/includes/mbee.h b/src/mame/includes/mbee.h
index a19c14c3b60..da03bdafc90 100644
--- a/src/mame/includes/mbee.h
+++ b/src/mame/includes/mbee.h
@@ -16,6 +16,7 @@
#include "machine/z80daisy.h"
#include "imagedev/cassette.h"
+#include "imagedev/floppy.h"
#include "imagedev/snapquik.h"
#include "machine/8530scc.h"
diff --git a/src/mame/includes/mikromik.h b/src/mame/includes/mikromik.h
index e4750c6071a..85446d4d1a5 100644
--- a/src/mame/includes/mikromik.h
+++ b/src/mame/includes/mikromik.h
@@ -8,6 +8,7 @@
#include "bus/rs232/rs232.h"
#include "cpu/i8085/i8085.h"
#include "formats/mm_dsk.h"
+#include "imagedev/floppy.h"
#include "machine/am9517a.h"
#include "machine/i8212.h"
#include "machine/mm1kb.h"
diff --git a/src/mame/includes/next.h b/src/mame/includes/next.h
index 3002d3a2935..d6f89821cc5 100644
--- a/src/mame/includes/next.h
+++ b/src/mame/includes/next.h
@@ -6,6 +6,7 @@
#define MAME_INCLUDES_NEXT_H
#include "cpu/m68000/m68000.h"
+#include "imagedev/floppy.h"
#include "machine/nscsi_bus.h"
#include "machine/mccs1850.h"
#include "machine/8530scc.h"
diff --git a/src/mame/includes/orion.h b/src/mame/includes/orion.h
index 7124212c50c..51d009e9d31 100644
--- a/src/mame/includes/orion.h
+++ b/src/mame/includes/orion.h
@@ -16,6 +16,8 @@
#include "cpu/i8085/i8085.h"
#include "cpu/z80/z80.h"
+#include "imagedev/floppy.h"
+
#include "machine/i8255.h"
#include "machine/mc146818.h"
#include "machine/ram.h"
diff --git a/src/mame/includes/osborne1.h b/src/mame/includes/osborne1.h
index 088d968a7c7..d38f1ae8fd7 100644
--- a/src/mame/includes/osborne1.h
+++ b/src/mame/includes/osborne1.h
@@ -15,6 +15,8 @@
#include "cpu/z80/z80.h"
+#include "imagedev/floppy.h"
+
#include "machine/6821pia.h"
#include "machine/6850acia.h"
#include "machine/ram.h"
diff --git a/src/mame/includes/pc1512.h b/src/mame/includes/pc1512.h
index 1dfba03e1fb..668bdc190c7 100644
--- a/src/mame/includes/pc1512.h
+++ b/src/mame/includes/pc1512.h
@@ -12,6 +12,7 @@
#include "bus/pc1512/mouse.h"
#include "cpu/i86/i86.h"
#include "cpu/mcs48/mcs48.h"
+#include "imagedev/floppy.h"
#include "machine/am9517a.h"
#include "machine/buffer.h"
#include "machine/ins8250.h"
diff --git a/src/mame/includes/pc8801.h b/src/mame/includes/pc8801.h
index e788cb976a1..98a14770986 100644
--- a/src/mame/includes/pc8801.h
+++ b/src/mame/includes/pc8801.h
@@ -14,6 +14,7 @@
#include "cpu/z80/z80.h"
#include "bus/centronics/ctronics.h"
#include "imagedev/cassette.h"
+#include "imagedev/floppy.h"
#include "machine/i8214.h"
#include "machine/i8251.h"
#include "machine/i8255.h"
diff --git a/src/mame/includes/pc88va.h b/src/mame/includes/pc88va.h
index 5e88ebcd74d..6563ed697d9 100644
--- a/src/mame/includes/pc88va.h
+++ b/src/mame/includes/pc88va.h
@@ -13,6 +13,7 @@
#include "cpu/nec/nec.h"
#include "cpu/z80/z80.h"
+#include "imagedev/floppy.h"
#include "machine/am9517a.h"
#include "machine/i8255.h"
#include "machine/pic8259.h"
diff --git a/src/mame/includes/pc9801.h b/src/mame/includes/pc9801.h
index 17b62f72d84..e52a946007a 100644
--- a/src/mame/includes/pc9801.h
+++ b/src/mame/includes/pc9801.h
@@ -10,6 +10,7 @@
#include "cpu/i86/i86.h"
#include "cpu/nec/nec.h"
+#include "imagedev/floppy.h"
#include "machine/am9517a.h"
#include "machine/bankdev.h"
#include "machine/buffer.h"
diff --git a/src/mame/includes/pcw.h b/src/mame/includes/pcw.h
index 09443e670f2..8724463889b 100644
--- a/src/mame/includes/pcw.h
+++ b/src/mame/includes/pcw.h
@@ -10,6 +10,7 @@
#pragma once
+#include "imagedev/floppy.h"
#include "machine/upd765.h"
#include "machine/ram.h"
#include "machine/timer.h"
diff --git a/src/mame/includes/pcw16.h b/src/mame/includes/pcw16.h
index de075e79a41..2a9c76f8566 100644
--- a/src/mame/includes/pcw16.h
+++ b/src/mame/includes/pcw16.h
@@ -19,6 +19,7 @@
#include "sound/beep.h" /* pcw/pcw16 beeper */
#include "machine/intelfsh.h"
#include "formats/pc_dsk.h"
+#include "imagedev/floppy.h"
#include "machine/ram.h"
#include "machine/timer.h"
#include "emupal.h"
diff --git a/src/mame/includes/poly.h b/src/mame/includes/poly.h
index a67bcf14a72..2bff9e146c1 100644
--- a/src/mame/includes/poly.h
+++ b/src/mame/includes/poly.h
@@ -36,6 +36,7 @@
#pragma once
#include "cpu/m6809/m6809.h"
+#include "imagedev/floppy.h"
#include "machine/6821pia.h"
#include "machine/6840ptm.h"
#include "machine/6850acia.h"
diff --git a/src/mame/includes/prof80.h b/src/mame/includes/prof80.h
index b938acbc631..c62706b051f 100644
--- a/src/mame/includes/prof80.h
+++ b/src/mame/includes/prof80.h
@@ -8,6 +8,7 @@
#include "bus/ecbbus/ecbbus.h"
#include "bus/rs232/rs232.h"
#include "cpu/z80/z80.h"
+#include "imagedev/floppy.h"
#include "machine/z80daisy.h"
#include "machine/prof80mmu.h"
#include "machine/74259.h"
diff --git a/src/mame/includes/sage2.h b/src/mame/includes/sage2.h
index ff0259dc7df..0ef2f11d127 100644
--- a/src/mame/includes/sage2.h
+++ b/src/mame/includes/sage2.h
@@ -6,6 +6,7 @@
#include "machine/i8251.h"
#include "machine/i8255.h"
#include "bus/ieee488/ieee488.h"
+#include "imagedev/floppy.h"
#include "machine/pit8253.h"
#include "machine/pic8259.h"
#include "machine/ram.h"
diff --git a/src/mame/includes/samcoupe.h b/src/mame/includes/samcoupe.h
index 076dbffa3ee..748309ba40f 100644
--- a/src/mame/includes/samcoupe.h
+++ b/src/mame/includes/samcoupe.h
@@ -15,6 +15,7 @@
#include "bus/centronics/ctronics.h"
#include "imagedev/cassette.h"
+#include "imagedev/floppy.h"
#include "machine/msm6242.h"
#include "machine/ram.h"
#include "machine/wd_fdc.h"
diff --git a/src/mame/includes/sg1000.h b/src/mame/includes/sg1000.h
index eef5b228232..ec939e35e9f 100644
--- a/src/mame/includes/sg1000.h
+++ b/src/mame/includes/sg1000.h
@@ -6,6 +6,7 @@
#include "cpu/z80/z80.h"
#include "formats/sf7000_dsk.h"
+#include "imagedev/floppy.h"
#include "imagedev/printer.h"
#include "bus/centronics/ctronics.h"
#include "machine/i8255.h"
diff --git a/src/mame/includes/spectrum.h b/src/mame/includes/spectrum.h
index b223756ce66..fae8b6bce1d 100644
--- a/src/mame/includes/spectrum.h
+++ b/src/mame/includes/spectrum.h
@@ -17,6 +17,7 @@
#include "bus/generic/carts.h"
#include "bus/generic/slot.h"
#include "imagedev/cassette.h"
+#include "imagedev/floppy.h"
#include "imagedev/snapquik.h"
#include "machine/ram.h"
#include "machine/upd765.h"
diff --git a/src/mame/includes/super6.h b/src/mame/includes/super6.h
index e34dc3e90cd..c51a7f9e59a 100644
--- a/src/mame/includes/super6.h
+++ b/src/mame/includes/super6.h
@@ -6,6 +6,7 @@
#pragma once
#include "cpu/z80/z80.h"
+#include "imagedev/floppy.h"
#include "machine/z80daisy.h"
#include "machine/com8116.h"
#include "machine/ram.h"
diff --git a/src/mame/includes/super80.h b/src/mame/includes/super80.h
index b6d5a5e17aa..ef67d729eb2 100644
--- a/src/mame/includes/super80.h
+++ b/src/mame/includes/super80.h
@@ -9,6 +9,7 @@
#include "cpu/z80/z80.h"
#include "machine/z80daisy.h"
#include "imagedev/cassette.h"
+#include "imagedev/floppy.h"
#include "imagedev/snapquik.h"
#include "machine/buffer.h"
#include "machine/timer.h"
diff --git a/src/mame/includes/tandy2k.h b/src/mame/includes/tandy2k.h
index 7b9d0d48781..3029976842c 100644
--- a/src/mame/includes/tandy2k.h
+++ b/src/mame/includes/tandy2k.h
@@ -8,6 +8,7 @@
#include "cpu/i86/i186.h"
#include "cpu/mcs48/mcs48.h"
#include "formats/tandy2k_dsk.h"
+#include "imagedev/floppy.h"
#include "imagedev/harddriv.h"
#include "machine/i8255.h"
#include "machine/i8251.h"
diff --git a/src/mame/includes/tdv2324.h b/src/mame/includes/tdv2324.h
index 2c23a74afc6..d0fdb05455f 100644
--- a/src/mame/includes/tdv2324.h
+++ b/src/mame/includes/tdv2324.h
@@ -8,6 +8,7 @@
#include "cpu/i8085/i8085.h"
#include "cpu/m6800/m6800.h"
+#include "imagedev/floppy.h"
#include "imagedev/harddriv.h"
#include "machine/pit8253.h"
#include "machine/pic8259.h"
diff --git a/src/mame/includes/tiki100.h b/src/mame/includes/tiki100.h
index 136aebd8b79..22ecaee488f 100644
--- a/src/mame/includes/tiki100.h
+++ b/src/mame/includes/tiki100.h
@@ -12,6 +12,7 @@
#include "machine/z80daisy.h"
#include "formats/tiki100_dsk.h"
#include "imagedev/cassette.h"
+#include "imagedev/floppy.h"
#include "machine/ram.h"
#include "machine/timer.h"
#include "machine/z80ctc.h"
diff --git a/src/mame/includes/trs80m2.h b/src/mame/includes/trs80m2.h
index 133ee0c2a8b..b60215aaa85 100644
--- a/src/mame/includes/trs80m2.h
+++ b/src/mame/includes/trs80m2.h
@@ -11,6 +11,7 @@
#include "cpu/mcs48/mcs48.h"
#include "cpu/m68000/m68000.h"
#include "bus/centronics/ctronics.h"
+#include "imagedev/floppy.h"
#include "machine/am9519.h"
#include "machine/keyboard.h"
#include "machine/ram.h"
diff --git a/src/mame/includes/v1050.h b/src/mame/includes/v1050.h
index 0dc397a225b..81a2bdeb803 100644
--- a/src/mame/includes/v1050.h
+++ b/src/mame/includes/v1050.h
@@ -9,6 +9,7 @@
#include "cpu/m6502/m6502.h"
#include "bus/centronics/ctronics.h"
#include "bus/scsi/s1410.h"
+#include "imagedev/floppy.h"
#include "machine/clock.h"
#include "machine/i8214.h"
#include "machine/i8251.h"
diff --git a/src/mame/includes/vixen.h b/src/mame/includes/vixen.h
index 1b2791cfdd8..dc5fea07047 100644
--- a/src/mame/includes/vixen.h
+++ b/src/mame/includes/vixen.h
@@ -7,6 +7,7 @@
#include "bus/rs232/rs232.h"
#include "cpu/z80/z80.h"
+#include "imagedev/floppy.h"
#include "machine/i8155.h"
#include "machine/i8251.h"
#include "machine/timer.h"
diff --git a/src/mame/includes/x68k.h b/src/mame/includes/x68k.h
index c565081eadb..8b555b1d90e 100644
--- a/src/mame/includes/x68k.h
+++ b/src/mame/includes/x68k.h
@@ -12,6 +12,7 @@
#define MAME_INCLUDES_X68K_H
#include "cpu/m68000/m68000.h"
+#include "imagedev/floppy.h"
#include "machine/8530scc.h"
#include "machine/hd63450.h"
#include "machine/i8255.h"
diff --git a/src/mame/includes/xerox820.h b/src/mame/includes/xerox820.h
index 5dbe35eccda..e99c0d3de69 100644
--- a/src/mame/includes/xerox820.h
+++ b/src/mame/includes/xerox820.h
@@ -22,6 +22,7 @@
#include "machine/z80dart.h"
#include "sound/spkrdev.h"
#include "sound/beep.h"
+#include "imagedev/floppy.h"
#include "imagedev/snapquik.h"
#include "emupal.h"
diff --git a/src/mame/includes/xor100.h b/src/mame/includes/xor100.h
index c41718eae0d..c813abb7c27 100644
--- a/src/mame/includes/xor100.h
+++ b/src/mame/includes/xor100.h
@@ -7,6 +7,7 @@
#include "bus/s100/s100.h"
#include "cpu/z80/z80.h"
+#include "imagedev/floppy.h"
#include "machine/ram.h"
#include "machine/com8116.h"
#include "bus/centronics/ctronics.h"
diff --git a/src/mame/includes/zorba.h b/src/mame/includes/zorba.h
index e7201a5214a..94019e01d77 100644
--- a/src/mame/includes/zorba.h
+++ b/src/mame/includes/zorba.h
@@ -9,6 +9,8 @@
#include "bus/ieee488/ieee488.h"
+#include "imagedev/floppy.h"
+
#include "machine/6821pia.h"
#include "machine/i8251.h"
#include "machine/wd_fdc.h"
diff --git a/src/mame/machine/beta.h b/src/mame/machine/beta.h
index 4dd62aa1f31..2a7fdffa31e 100644
--- a/src/mame/machine/beta.h
+++ b/src/mame/machine/beta.h
@@ -15,6 +15,7 @@
#pragma once
#include "machine/wd_fdc.h"
+#include "imagedev/floppy.h"
#define BETA_DISK_TAG "beta"
diff --git a/src/mame/machine/isbc_208.h b/src/mame/machine/isbc_208.h
index ed9075da852..b49546a0ade 100644
--- a/src/mame/machine/isbc_208.h
+++ b/src/mame/machine/isbc_208.h
@@ -5,6 +5,7 @@
#pragma once
+#include "imagedev/floppy.h"
#include "machine/upd765.h"
#include "machine/am9517a.h"