diff --git a/src/devices/bus/bml3/bml3mp1802.h b/src/devices/bus/bml3/bml3mp1802.h
index e49737a9c74..277d9ae89bd 100644
--- a/src/devices/bus/bml3/bml3mp1802.h
+++ b/src/devices/bus/bml3/bml3mp1802.h
@@ -15,7 +15,7 @@
 #pragma once
 
 #include "bml3bus.h"
-#include "imagedev/flopdrv.h"
+#include "imagedev/floppy.h"
 #include "machine/wd_fdc.h"
 
 
diff --git a/src/devices/bus/coco/coco_fdc.cpp b/src/devices/bus/coco/coco_fdc.cpp
index 06526073ca4..db8df415ee3 100644
--- a/src/devices/bus/coco/coco_fdc.cpp
+++ b/src/devices/bus/coco/coco_fdc.cpp
@@ -45,7 +45,7 @@
 #include "emu.h"
 #include "cococart.h"
 #include "coco_fdc.h"
-#include "imagedev/flopdrv.h"
+#include "imagedev/floppy.h"
 #include "machine/msm6242.h"
 #include "machine/ds1315.h"
 #include "machine/wd_fdc.h"
diff --git a/src/devices/bus/coco/dragon_fdc.cpp b/src/devices/bus/coco/dragon_fdc.cpp
index 80fa31b0c98..be31a660db9 100644
--- a/src/devices/bus/coco/dragon_fdc.cpp
+++ b/src/devices/bus/coco/dragon_fdc.cpp
@@ -69,7 +69,7 @@
 #include "dragon_fdc.h"
 
 #include "coco_fdc.h"
-#include "imagedev/flopdrv.h"
+#include "imagedev/floppy.h"
 #include "machine/wd_fdc.h"
 #include "formats/dmk_dsk.h"
 #include "formats/jvc_dsk.h"
diff --git a/src/devices/bus/isa/fdc.cpp b/src/devices/bus/isa/fdc.cpp
index d4cc451561c..92930eb5aa8 100644
--- a/src/devices/bus/isa/fdc.cpp
+++ b/src/devices/bus/isa/fdc.cpp
@@ -10,7 +10,6 @@
 #include "fdc.h"
 #include "machine/busmouse.h"
 #include "machine/pc_fdc.h"
-#include "imagedev/flopdrv.h"
 #include "formats/pc_dsk.h"
 #include "formats/naslite_dsk.h"
 
diff --git a/src/devices/bus/isa/fdc.h b/src/devices/bus/isa/fdc.h
index 649b133a093..7a1781cdc69 100644
--- a/src/devices/bus/isa/fdc.h
+++ b/src/devices/bus/isa/fdc.h
@@ -11,6 +11,7 @@
 #pragma once
 
 #include "isa.h"
+#include "imagedev/floppy.h"
 #include "machine/busmouse.h"
 #include "machine/upd765.h"
 
diff --git a/src/devices/bus/isa/mc1502_fdc.h b/src/devices/bus/isa/mc1502_fdc.h
index 972a005b761..57edc2d3a9c 100644
--- a/src/devices/bus/isa/mc1502_fdc.h
+++ b/src/devices/bus/isa/mc1502_fdc.h
@@ -13,7 +13,7 @@
 
 
 #include "isa.h"
-#include "imagedev/flopdrv.h"
+#include "imagedev/floppy.h"
 #include "machine/wd_fdc.h"
 
 //**************************************************************************
diff --git a/src/devices/bus/isa/myb3k_fdc.cpp b/src/devices/bus/isa/myb3k_fdc.cpp
index 0a2a33b4a5b..f0d42fbfffd 100644
--- a/src/devices/bus/isa/myb3k_fdc.cpp
+++ b/src/devices/bus/isa/myb3k_fdc.cpp
@@ -26,7 +26,6 @@
 
 #include "emu.h"
 #include "myb3k_fdc.h"
-#include "imagedev/flopdrv.h"
 #include "formats/pc_dsk.h"
 #include "formats/imd_dsk.h"
 
diff --git a/src/devices/bus/isa/myb3k_fdc.h b/src/devices/bus/isa/myb3k_fdc.h
index a56fa067730..819ba4a9353 100644
--- a/src/devices/bus/isa/myb3k_fdc.h
+++ b/src/devices/bus/isa/myb3k_fdc.h
@@ -11,6 +11,7 @@
 #pragma once
 
 #include "isa.h"
+#include "imagedev/floppy.h"
 #include "machine/wd_fdc.h"
 #include "formats/imd_dsk.h"
 
diff --git a/src/devices/bus/isa/p1_fdc.h b/src/devices/bus/isa/p1_fdc.h
index 2670f47c250..e1649fbb9f3 100644
--- a/src/devices/bus/isa/p1_fdc.h
+++ b/src/devices/bus/isa/p1_fdc.h
@@ -13,7 +13,6 @@
 
 
 #include "isa.h"
-#include "imagedev/flopdrv.h"
 #include "machine/wd_fdc.h"
 
 //**************************************************************************
diff --git a/src/devices/bus/msx_cart/disk.h b/src/devices/bus/msx_cart/disk.h
index 8556f807e40..908f2ef7229 100644
--- a/src/devices/bus/msx_cart/disk.h
+++ b/src/devices/bus/msx_cart/disk.h
@@ -8,7 +8,6 @@
 #include "bus/msx_cart/cartridge.h"
 #include "machine/wd_fdc.h"
 #include "machine/upd765.h"
-#include "imagedev/flopdrv.h"
 #include "imagedev/floppy.h"
 
 
diff --git a/src/devices/bus/msx_slot/disk.h b/src/devices/bus/msx_slot/disk.h
index 6b3c4ab055a..3b949f159e2 100644
--- a/src/devices/bus/msx_slot/disk.h
+++ b/src/devices/bus/msx_slot/disk.h
@@ -9,7 +9,6 @@
 #include "bus/msx_slot/rom.h"
 #include "machine/wd_fdc.h"
 #include "machine/upd765.h"
-#include "imagedev/flopdrv.h"
 #include "imagedev/floppy.h"
 
 
diff --git a/src/devices/bus/ti99/peb/bwg.h b/src/devices/bus/ti99/peb/bwg.h
index 59afa523eed..a25d844a563 100644
--- a/src/devices/bus/ti99/peb/bwg.h
+++ b/src/devices/bus/ti99/peb/bwg.h
@@ -17,7 +17,7 @@
 #pragma once
 
 #include "peribox.h"
-#include "imagedev/flopdrv.h"
+#include "imagedev/floppy.h"
 #include "machine/mm58274c.h"
 #include "machine/wd_fdc.h"
 #include "machine/ram.h"
diff --git a/src/mame/drivers/a5105.cpp b/src/mame/drivers/a5105.cpp
index e1af8460060..c4eec0078dc 100644
--- a/src/mame/drivers/a5105.cpp
+++ b/src/mame/drivers/a5105.cpp
@@ -22,7 +22,7 @@ ToDo:
 
 #include "cpu/z80/z80.h"
 #include "imagedev/cassette.h"
-#include "imagedev/flopdrv.h"
+#include "imagedev/floppy.h"
 #include "machine/ram.h"
 #include "machine/upd765.h"
 #include "machine/z80ctc.h"
diff --git a/src/mame/drivers/agat.cpp b/src/mame/drivers/agat.cpp
index 0f76285fffc..a0560a020af 100644
--- a/src/mame/drivers/agat.cpp
+++ b/src/mame/drivers/agat.cpp
@@ -56,7 +56,6 @@
 #include "cpu/m6502/m6502.h"
 
 #include "imagedev/cassette.h"
-#include "imagedev/flopdrv.h"
 
 #include "machine/bankdev.h"
 #include "machine/kb3600.h"
@@ -74,8 +73,6 @@
 #include "softlist.h"
 #include "speaker.h"
 
-#include "formats/ap2_dsk.h"
-
 
 #define A7_CPU_TAG "maincpu"
 #define A7_KBDC_TAG "ay3600"
diff --git a/src/mame/drivers/apple2.cpp b/src/mame/drivers/apple2.cpp
index 55bcc079600..5ecfb8f093a 100644
--- a/src/mame/drivers/apple2.cpp
+++ b/src/mame/drivers/apple2.cpp
@@ -44,7 +44,6 @@ II Plus: RAM options reduced to 16/32/48 KB.
 #include "cpu/m6502/m6502.h"
 
 #include "imagedev/cassette.h"
-#include "imagedev/flopdrv.h"
 
 #include "machine/74259.h"
 #include "machine/bankdev.h"
diff --git a/src/mame/drivers/apricot.cpp b/src/mame/drivers/apricot.cpp
index f2245eba556..c0496c3963e 100644
--- a/src/mame/drivers/apricot.cpp
+++ b/src/mame/drivers/apricot.cpp
@@ -19,7 +19,7 @@
 #include "cpu/i86/i86.h"
 #include "cpu/i8089/i8089.h"
 #include "formats/apridisk.h"
-#include "imagedev/flopdrv.h"
+#include "imagedev/floppy.h"
 #include "machine/clock.h"
 #include "machine/ram.h"
 #include "machine/74153.h"
diff --git a/src/mame/drivers/apricotf.cpp b/src/mame/drivers/apricotf.cpp
index c569ba937f7..a91ee74b0a7 100644
--- a/src/mame/drivers/apricotf.cpp
+++ b/src/mame/drivers/apricotf.cpp
@@ -28,7 +28,7 @@
 #include "bus/centronics/ctronics.h"
 #include "cpu/i86/i86.h"
 #include "formats/apridisk.h"
-#include "imagedev/flopdrv.h"
+#include "imagedev/floppy.h"
 #include "machine/apricotkb.h"
 #include "machine/buffer.h"
 #include "machine/input_merger.h"
diff --git a/src/mame/drivers/dgn_beta.cpp b/src/mame/drivers/dgn_beta.cpp
index 2490e949356..567addc3d99 100644
--- a/src/mame/drivers/dgn_beta.cpp
+++ b/src/mame/drivers/dgn_beta.cpp
@@ -52,7 +52,7 @@ documentation still exists.
 
 #include "formats/vdk_dsk.h"
 #include "formats/dmk_dsk.h"
-#include "imagedev/flopdrv.h"
+#include "imagedev/floppy.h"
 
 
 /*
diff --git a/src/mame/drivers/dragon.cpp b/src/mame/drivers/dragon.cpp
index 7e08812b43c..7a803f3f810 100644
--- a/src/mame/drivers/dragon.cpp
+++ b/src/mame/drivers/dragon.cpp
@@ -18,7 +18,7 @@
 #include "formats/vdk_dsk.h"
 #include "formats/dmk_dsk.h"
 #include "formats/sdf_dsk.h"
-#include "imagedev/flopdrv.h"
+#include "imagedev/floppy.h"
 
 #include "bus/coco/dragon_fdc.h"
 #include "bus/coco/dragon_jcbsnd.h"
diff --git a/src/mame/drivers/fm7.cpp b/src/mame/drivers/fm7.cpp
index 131c0c76e0d..f00fce78202 100644
--- a/src/mame/drivers/fm7.cpp
+++ b/src/mame/drivers/fm7.cpp
@@ -52,7 +52,6 @@
 #include "bus/centronics/dsjoy.h"
 
 #include "imagedev/cassette.h"
-#include "imagedev/flopdrv.h"
 
 #include "formats/fm7_cas.h"
 
diff --git a/src/mame/drivers/lb186.cpp b/src/mame/drivers/lb186.cpp
index d6e604ca9ae..fa6ed3e6c9b 100644
--- a/src/mame/drivers/lb186.cpp
+++ b/src/mame/drivers/lb186.cpp
@@ -8,7 +8,7 @@
 #include "bus/rs232/rs232.h"
 #include "machine/nscsi_hd.h"
 #include "machine/ncr5380n.h"
-#include "imagedev/flopdrv.h"
+#include "imagedev/floppy.h"
 #include "formats/pc_dsk.h"
 #include "formats/naslite_dsk.h"
 
diff --git a/src/mame/drivers/mz2000.cpp b/src/mame/drivers/mz2000.cpp
index 0b4fa35810c..1707b7cf3fa 100644
--- a/src/mame/drivers/mz2000.cpp
+++ b/src/mame/drivers/mz2000.cpp
@@ -21,7 +21,7 @@
 
 #include "cpu/z80/z80.h"
 #include "imagedev/cassette.h"
-#include "imagedev/flopdrv.h"
+#include "imagedev/floppy.h"
 #include "machine/i8255.h"
 #include "machine/pit8253.h"
 #include "machine/rp5c15.h"
diff --git a/src/mame/drivers/pc100.cpp b/src/mame/drivers/pc100.cpp
index 485ec9b3913..be1e7ac3e84 100644
--- a/src/mame/drivers/pc100.cpp
+++ b/src/mame/drivers/pc100.cpp
@@ -55,7 +55,7 @@
 #include "emu.h"
 
 #include "cpu/i86/i86.h"
-#include "imagedev/flopdrv.h"
+#include "imagedev/floppy.h"
 #include "machine/i8251.h"
 #include "machine/i8255.h"
 #include "machine/msm58321.h"
diff --git a/src/mame/drivers/pk8020.cpp b/src/mame/drivers/pk8020.cpp
index 4e36c2ba67b..00f9f48087e 100644
--- a/src/mame/drivers/pk8020.cpp
+++ b/src/mame/drivers/pk8020.cpp
@@ -16,7 +16,6 @@
 #include "bus/rs232/rs232.h"
 #include "cpu/i8085/i8085.h"
 #include "machine/i8255.h"
-#include "imagedev/flopdrv.h"
 #include "formats/pk8020_dsk.h"
 #include "machine/ram.h"
 #include "screen.h"
diff --git a/src/mame/drivers/rainbow.cpp b/src/mame/drivers/rainbow.cpp
index 25ee0863828..c10f4dd50fd 100644
--- a/src/mame/drivers/rainbow.cpp
+++ b/src/mame/drivers/rainbow.cpp
@@ -346,7 +346,7 @@ W17 pulls J1 serial  port pin 1 to GND when set (chassis to logical GND).
 #include "machine/wd_fdc.h"
 #include "formats/rx50_dsk.h"
 #include "formats/pc_dsk.h" // PC Formats
-#include "imagedev/flopdrv.h"
+#include "imagedev/floppy.h"
 
 #include "imagedev/harddriv.h"
 #include "machine/wd2010.h"
diff --git a/src/mame/drivers/rmnimbus.cpp b/src/mame/drivers/rmnimbus.cpp
index c7888ca9722..eb52d9d7a4a 100644
--- a/src/mame/drivers/rmnimbus.cpp
+++ b/src/mame/drivers/rmnimbus.cpp
@@ -14,7 +14,7 @@
 #include "machine/rmnkbd.h"
 
 #include "cpu/mcs51/mcs51.h"
-#include "imagedev/flopdrv.h"
+#include "imagedev/floppy.h"
 
 #include "bus/isa/fdc.h"
 #include "bus/rs232/rs232.h"
diff --git a/src/mame/drivers/tk2000.cpp b/src/mame/drivers/tk2000.cpp
index d2f0b121774..0c2d0b1bd40 100644
--- a/src/mame/drivers/tk2000.cpp
+++ b/src/mame/drivers/tk2000.cpp
@@ -19,7 +19,6 @@
 
 #include "cpu/m6502/m6502.h"
 #include "imagedev/cassette.h"
-#include "imagedev/flopdrv.h"
 #include "machine/bankdev.h"
 #include "machine/ram.h"
 #include "machine/timer.h"
diff --git a/src/mame/drivers/z100.cpp b/src/mame/drivers/z100.cpp
index 423c82d488a..8acc8bb13f4 100644
--- a/src/mame/drivers/z100.cpp
+++ b/src/mame/drivers/z100.cpp
@@ -146,7 +146,7 @@ ZDIPSW      EQU 0FFH    ; Configuration dip switches
 #include "emu.h"
 #include "cpu/i86/i86.h"
 //#include "bus/s100/s100.h"
-#include "imagedev/flopdrv.h"
+#include "imagedev/floppy.h"
 #include "machine/6821pia.h"
 #include "machine/pic8259.h"
 #include "machine/wd_fdc.h"
diff --git a/src/mame/drivers/z80ne.cpp b/src/mame/drivers/z80ne.cpp
index d5d61727a67..c9f7137a6a3 100644
--- a/src/mame/drivers/z80ne.cpp
+++ b/src/mame/drivers/z80ne.cpp
@@ -94,7 +94,6 @@
 #include "emu.h"
 #include "cpu/z80/z80.h"
 #include "includes/z80ne.h"
-#include "imagedev/flopdrv.h"
 #include "formats/dmk_dsk.h"
 #include "machine/ram.h"
 #include "softlist.h"
diff --git a/src/mame/includes/abc80.h b/src/mame/includes/abc80.h
index 4737a0a1d86..3c3e3ba1f4f 100644
--- a/src/mame/includes/abc80.h
+++ b/src/mame/includes/abc80.h
@@ -15,8 +15,6 @@
 #include "bus/rs232/rs232.h"
 #include "cpu/z80/z80.h"
 #include "machine/z80daisy.h"
-#include "imagedev/flopdrv.h"
-#include "imagedev/printer.h"
 #include "imagedev/cassette.h"
 #include "imagedev/snapquik.h"
 #include "machine/abc80kb.h"
diff --git a/src/mame/includes/atom.h b/src/mame/includes/atom.h
index 4b85a2121cd..b7a341000b2 100644
--- a/src/mame/includes/atom.h
+++ b/src/mame/includes/atom.h
@@ -8,7 +8,7 @@
 
 #include "cpu/m6502/m6502.h"
 #include "imagedev/cassette.h"
-#include "imagedev/flopdrv.h"
+#include "imagedev/floppy.h"
 #include "imagedev/snapquik.h"
 #include "machine/6522via.h"
 #include "machine/i8255.h"
diff --git a/src/mame/includes/dgnalpha.h b/src/mame/includes/dgnalpha.h
index f5d6c7922ca..eea5ddf2af0 100644
--- a/src/mame/includes/dgnalpha.h
+++ b/src/mame/includes/dgnalpha.h
@@ -15,6 +15,7 @@
 
 
 #include "includes/dragon.h"
+#include "imagedev/floppy.h"
 #include "sound/ay8910.h"
 #include "machine/wd_fdc.h"
 
diff --git a/src/mame/includes/hec2hrp.h b/src/mame/includes/hec2hrp.h
index feca946642d..b96590ef949 100644
--- a/src/mame/includes/hec2hrp.h
+++ b/src/mame/includes/hec2hrp.h
@@ -43,7 +43,7 @@
 
 #pragma once
 
-#include "imagedev/flopdrv.h"
+#include "imagedev/floppy.h"
 #include "imagedev/cassette.h"
 #include "imagedev/printer.h"
 #include "machine/upd765.h"
diff --git a/src/mame/includes/mbc55x.h b/src/mame/includes/mbc55x.h
index 664fe5a32a0..d841245aac2 100644
--- a/src/mame/includes/mbc55x.h
+++ b/src/mame/includes/mbc55x.h
@@ -14,7 +14,7 @@
 
 #include "bus/centronics/ctronics.h"
 #include "cpu/i86/i86.h"
-#include "imagedev/flopdrv.h"
+#include "imagedev/floppy.h"
 #include "machine/bankdev.h"
 #include "machine/i8251.h"
 #include "machine/i8255.h"
diff --git a/src/mame/includes/msx.h b/src/mame/includes/msx.h
index b8f705a7e59..3f4d8032f9e 100644
--- a/src/mame/includes/msx.h
+++ b/src/mame/includes/msx.h
@@ -20,7 +20,6 @@
 #include "sound/ym2413.h"
 #include "video/v9938.h"
 #include "video/tms9928a.h"
-#include "imagedev/flopdrv.h"
 #include "imagedev/cassette.h"
 #include "formats/fmsx_cas.h"
 #include "formats/msx_dsk.h"
diff --git a/src/mame/includes/mz2500.h b/src/mame/includes/mz2500.h
index 04f707b33ef..f925419c2ce 100644
--- a/src/mame/includes/mz2500.h
+++ b/src/mame/includes/mz2500.h
@@ -27,7 +27,7 @@
 #include "speaker.h"
 
 //#include "imagedev/cassette.h"
-#include "imagedev/flopdrv.h"
+#include "imagedev/floppy.h"
 
 #define RP5C15_TAG      "rp5c15"
 
diff --git a/src/mame/includes/partner.h b/src/mame/includes/partner.h
index e1787f9492c..ee315670c22 100644
--- a/src/mame/includes/partner.h
+++ b/src/mame/includes/partner.h
@@ -13,6 +13,7 @@
 
 #include "includes/radio86.h"
 
+#include "imagedev/floppy.h"
 #include "machine/i8255.h"
 #include "machine/wd_fdc.h"
 #include "machine/ram.h"
diff --git a/src/mame/includes/pk8020.h b/src/mame/includes/pk8020.h
index 42ecbfc4672..fe40d80a176 100644
--- a/src/mame/includes/pk8020.h
+++ b/src/mame/includes/pk8020.h
@@ -11,6 +11,7 @@
 #pragma once
 
 #include "imagedev/cassette.h"
+#include "imagedev/floppy.h"
 #include "machine/i8251.h"
 #include "machine/i8255.h"
 #include "machine/pic8259.h"
diff --git a/src/mame/includes/rm380z.h b/src/mame/includes/rm380z.h
index d5aaccc866b..71726340dbe 100644
--- a/src/mame/includes/rm380z.h
+++ b/src/mame/includes/rm380z.h
@@ -15,7 +15,7 @@ Research Machines RM 380Z
 #include "cpu/z80/z80.h"
 #include "imagedev/cassette.h"
 #include "machine/ram.h"
-#include "imagedev/flopdrv.h"
+#include "imagedev/floppy.h"
 #include "machine/wd_fdc.h"
 #include "machine/keyboard.h"
 
diff --git a/src/mame/includes/sorcerer.h b/src/mame/includes/sorcerer.h
index aaa07156943..72e55d03b85 100644
--- a/src/mame/includes/sorcerer.h
+++ b/src/mame/includes/sorcerer.h
@@ -18,7 +18,7 @@
 #include "machine/ram.h"
 #include "imagedev/cassette.h"
 #include "imagedev/snapquik.h"
-#include "imagedev/flopdrv.h"
+#include "imagedev/floppy.h"
 #include "formats/sorc_dsk.h"
 #include "formats/sorc_cas.h"
 #include "machine/micropolis.h"
diff --git a/src/mame/includes/swtpc09.h b/src/mame/includes/swtpc09.h
index d8c310dfe2c..17178c7434c 100644
--- a/src/mame/includes/swtpc09.h
+++ b/src/mame/includes/swtpc09.h
@@ -14,7 +14,7 @@
 #include "cpu/m6809/m6809.h"
 #include "video/generic.h"
 #include "machine/wd_fdc.h"
-#include "imagedev/flopdrv.h"
+#include "imagedev/floppy.h"
 #include "machine/6840ptm.h"
 #include "machine/6821pia.h"
 #include "machine/6850acia.h"
diff --git a/src/mame/includes/trs80.h b/src/mame/includes/trs80.h
index 23346cff7f5..961185d203f 100644
--- a/src/mame/includes/trs80.h
+++ b/src/mame/includes/trs80.h
@@ -11,7 +11,7 @@
 #include "cpu/z80/z80.h"
 #include "machine/bankdev.h"
 #include "imagedev/cassette.h"
-#include "imagedev/flopdrv.h"
+#include "imagedev/floppy.h"
 #include "imagedev/snapquik.h"
 #include "machine/ay31015.h"
 #include "machine/com8116.h"
diff --git a/src/mame/includes/trs80m3.h b/src/mame/includes/trs80m3.h
index 09b6d98db3e..cf5bc3f3022 100644
--- a/src/mame/includes/trs80m3.h
+++ b/src/mame/includes/trs80m3.h
@@ -12,7 +12,7 @@
 #include "machine/ram.h"
 #include "machine/bankdev.h"
 #include "imagedev/cassette.h"
-#include "imagedev/flopdrv.h"
+#include "imagedev/floppy.h"
 #include "imagedev/snapquik.h"
 #include "machine/ay31015.h"
 #include "machine/com8116.h"
diff --git a/src/mame/includes/vector06.h b/src/mame/includes/vector06.h
index fe22ffc30e4..6dd05323630 100644
--- a/src/mame/includes/vector06.h
+++ b/src/mame/includes/vector06.h
@@ -16,7 +16,7 @@
 #include "cpu/i8085/i8085.h"
 
 #include "imagedev/cassette.h"
-#include "imagedev/flopdrv.h"
+#include "imagedev/floppy.h"
 
 #include "machine/ram.h"
 #include "machine/wd_fdc.h"
diff --git a/src/mame/includes/x1.h b/src/mame/includes/x1.h
index 6ceabad1255..dd9fdd2c531 100644
--- a/src/mame/includes/x1.h
+++ b/src/mame/includes/x1.h
@@ -16,7 +16,7 @@
 #include "cpu/z80/z80.h"
 #include "machine/z80daisy.h"
 #include "imagedev/cassette.h"
-#include "imagedev/flopdrv.h"
+#include "imagedev/floppy.h"
 #include "machine/bankdev.h"
 #include "machine/i8255.h"
 #include "machine/timer.h"
diff --git a/src/mame/includes/z80ne.h b/src/mame/includes/z80ne.h
index 36574449dcc..5e77718158a 100644
--- a/src/mame/includes/z80ne.h
+++ b/src/mame/includes/z80ne.h
@@ -17,6 +17,7 @@
 
 #include "video/mc6847.h"
 #include "imagedev/cassette.h"
+#include "imagedev/floppy.h"
 #include "machine/ay31015.h"
 #include "machine/kr2376.h"
 #include "machine/ram.h"
diff --git a/src/mame/machine/dgn_beta.cpp b/src/mame/machine/dgn_beta.cpp
index c271a943168..47dd832648d 100644
--- a/src/mame/machine/dgn_beta.cpp
+++ b/src/mame/machine/dgn_beta.cpp
@@ -67,7 +67,7 @@
 #include "includes/dgn_beta.h"
 #include "includes/coco.h"
 #include "machine/mos6551.h"
-#include "imagedev/flopdrv.h"
+#include "imagedev/floppy.h"
 
 #include "debugger.h"
 #include "debug/debugcon.h"
diff --git a/src/mame/machine/dgnalpha.cpp b/src/mame/machine/dgnalpha.cpp
index fcd0dfffe1d..59faa0f3ebc 100644
--- a/src/mame/machine/dgnalpha.cpp
+++ b/src/mame/machine/dgnalpha.cpp
@@ -69,7 +69,6 @@ keeping track of it in a variable in the driver.
 #include "emu.h"
 #include "includes/dgnalpha.h"
 #include "sound/ay8910.h"
-#include "imagedev/flopdrv.h"
 
 //-------------------------------------------------
 //  device_start
diff --git a/src/mame/machine/imds2ioc.h b/src/mame/machine/imds2ioc.h
index a144f2e0571..2697863710c 100644
--- a/src/mame/machine/imds2ioc.h
+++ b/src/mame/machine/imds2ioc.h
@@ -11,7 +11,7 @@
 #include "sound/beep.h"
 #include "machine/pit8253.h"
 #include "machine/i8271.h"
-#include "imagedev/flopdrv.h"
+#include "imagedev/floppy.h"
 #include "bus/centronics/ctronics.h"
 #include "emupal.h"
 
diff --git a/src/mame/machine/partner.cpp b/src/mame/machine/partner.cpp
index 6d5ecff2a30..0b1397b4295 100644
--- a/src/mame/machine/partner.cpp
+++ b/src/mame/machine/partner.cpp
@@ -14,7 +14,6 @@
 #include "imagedev/cassette.h"
 #include "includes/radio86.h"
 #include "includes/partner.h"
-#include "imagedev/flopdrv.h"
 
 /* Driver initialization */
 void partner_state::init_partner()
diff --git a/src/mame/machine/pk8020.cpp b/src/mame/machine/pk8020.cpp
index a9ab9b7acc3..634735ecf2f 100644
--- a/src/mame/machine/pk8020.cpp
+++ b/src/mame/machine/pk8020.cpp
@@ -13,7 +13,6 @@
 #include "emu.h"
 #include "includes/pk8020.h"
 #include "cpu/i8085/i8085.h"
-#include "imagedev/flopdrv.h"
 
 
 READ8_MEMBER(pk8020_state::keyboard_r)
diff --git a/src/mame/machine/rmnimbus.cpp b/src/mame/machine/rmnimbus.cpp
index 388263d2dfb..3448ed17146 100644
--- a/src/mame/machine/rmnimbus.cpp
+++ b/src/mame/machine/rmnimbus.cpp
@@ -66,7 +66,7 @@ chdman createhd -o ST125N.chd -chs 41921,1,1 -ss 512
 #include "debugger.h"
 #include "debug/debugcon.h"
 #include "debug/debugcpu.h"
-#include "imagedev/flopdrv.h"
+#include "imagedev/floppy.h"
 
 
 
diff --git a/src/mame/machine/vtech2.cpp b/src/mame/machine/vtech2.cpp
index 829238aaab9..98961dbf2f4 100644
--- a/src/mame/machine/vtech2.cpp
+++ b/src/mame/machine/vtech2.cpp
@@ -18,8 +18,6 @@
 #include "emu.h"
 #include "includes/vtech2.h"
 
-#include "imagedev/flopdrv.h"
-
 /* public */
 
 /* static */
diff --git a/src/mame/machine/z80ne.cpp b/src/mame/machine/z80ne.cpp
index cf25e308887..6d1251a69ee 100644
--- a/src/mame/machine/z80ne.cpp
+++ b/src/mame/machine/z80ne.cpp
@@ -13,9 +13,6 @@
 #include "emu.h"
 #include "includes/z80ne.h"
 
-/* Devices */
-#include "imagedev/flopdrv.h"
-
 //#define VERBOSE 1
 #include "logmacro.h"