Include floppy.h explicitly in drivers and bus cards, rather than indirectly through popular FDC headers (nw)

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

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"
 

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"
 

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"
 

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"
 

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"
 

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"
 

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"
 

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"
 
 

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"

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"

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"
 

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"

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"

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"

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"

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"

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"
 

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"
 

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"

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"
 
 

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

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"

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"
 

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"

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"
 

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"
 
 //**************************************************************************

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"
 

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"
 
 

src/devices/bus/epson_sio/pf10.cpp

@@ -12,6 +12,7 @@
 
 #include "emu.h"
 #include "pf10.h"
+#include "imagedev/floppy.h"
 
 
 //**************************************************************************

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)

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"
 

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"
 

src/devices/bus/iq151/disc2.h

@@ -6,6 +6,7 @@
 #pragma once
 
 #include "iq151.h"
+#include "imagedev/floppy.h"
 #include "machine/upd765.h"
 
 //**************************************************************************

src/devices/bus/isa/omti8621.h

@@ -17,6 +17,7 @@
 
 #include "isa.h"
 #include "machine/pc_fdc.h"
+#include "imagedev/floppy.h"
 
 /***************************************************************************
  FUNCTION PROTOTYPES

src/devices/bus/isa/p1_fdc.h

@@ -13,6 +13,7 @@
 
 
 #include "isa.h"
+#include "imagedev/floppy.h"
 #include "machine/wd_fdc.h"
 
 //**************************************************************************

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"
 
 

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"
 
 

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"
 
 

src/devices/bus/nasbus/floppy.h

@@ -12,6 +12,7 @@
 #pragma once
 
 #include "nasbus.h"
+#include "imagedev/floppy.h"
 #include "machine/wd_fdc.h"
 
 

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"
 
 

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"

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"
 
 

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"
 
 

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"
 

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"
 

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"
 

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"
 

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

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

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)
 {

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:

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")
 

src/devices/machine/i8271.h

@@ -5,9 +5,10 @@
 
 #pragma once
 
-#include "imagedev/floppy.h"
 #include "fdc_pll.h"
 
+class floppy_image_device;
+
 
 /***************************************************************************
     MACROS

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
 

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

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

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

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
  *

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"

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"

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"

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"

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"
 

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"