diff --git a/scripts/src/bus.lua b/scripts/src/bus.lua
index 46d11bfdb81..5d57448facb 100644
--- a/scripts/src/bus.lua
+++ b/scripts/src/bus.lua
@@ -280,6 +280,36 @@ if (BUSES["ASTROCADE"]~=null) then
 end
 
 
+---------------------------------------------------
+--
+--@src/devices/bus/ata/atadev.h,BUSES["ATA"] = true
+--@src/devices/bus/ata/ataintf.h,BUSES["ATA"] = true
+---------------------------------------------------
+
+if (MACHINES["ATAFLASH"]~=null) then
+	BUSES["ATA"] = true
+end
+
+if (BUSES["ATA"]~=null) then
+	files {
+		MAME_DIR .. "src/devices/bus/ata/atadev.cpp",
+		MAME_DIR .. "src/devices/bus/ata/atadev.h",
+		MAME_DIR .. "src/devices/bus/ata/atahle.cpp",
+		MAME_DIR .. "src/devices/bus/ata/atahle.h",
+		MAME_DIR .. "src/devices/bus/ata/ataintf.cpp",
+		MAME_DIR .. "src/devices/bus/ata/ataintf.h",
+		MAME_DIR .. "src/devices/bus/ata/atapicdr.cpp",
+		MAME_DIR .. "src/devices/bus/ata/atapicdr.h",
+		MAME_DIR .. "src/devices/bus/ata/atapihle.cpp",
+		MAME_DIR .. "src/devices/bus/ata/atapihle.h",
+		MAME_DIR .. "src/devices/bus/ata/cr589.cpp",
+		MAME_DIR .. "src/devices/bus/ata/cr589.h",
+		MAME_DIR .. "src/devices/bus/ata/idehd.cpp",
+		MAME_DIR .. "src/devices/bus/ata/idehd.h",
+	}
+end
+
+
 ---------------------------------------------------
 --
 --@src/devices/bus/bbc/fdc/fdc.h,BUSES["BBC_FDC"] = true
diff --git a/scripts/src/machine.lua b/scripts/src/machine.lua
index 27a5069ce51..63b16b28c0f 100644
--- a/scripts/src/machine.lua
+++ b/scripts/src/machine.lua
@@ -795,7 +795,6 @@ end
 ---------------------------------------------------
 
 if (MACHINES["ATAFLASH"]~=null) then
-	MACHINES["IDE"] = true
 	MACHINES["PCCARD"] = true
 	files {
 		MAME_DIR .. "src/devices/machine/ataflash.cpp",
@@ -913,18 +912,6 @@ if (MACHINES["COM8116"]~=null) then
 	}
 end
 
----------------------------------------------------
---
---@src/devices/machine/cr589.h,MACHINES["CR589"] = true
----------------------------------------------------
-
-if (MACHINES["CR589"]~=null) then
-	files {
-		MAME_DIR .. "src/devices/machine/cr589.cpp",
-		MAME_DIR .. "src/devices/machine/cr589.h",
-	}
-end
-
 ---------------------------------------------------
 --
 --@src/devices/machine/cs4031.h,MACHINES["CS4031"] = true
@@ -1436,27 +1423,14 @@ end
 
 ---------------------------------------------------
 --
---@src/devices/machine/atadev.h,MACHINES["IDE"] = true
---@src/devices/machine/ataintf.h,MACHINES["IDE"] = true
+--@src/devices/machine/idectrl.h,MACHINES["IDECTRL"] = true
+--@src/devices/machine/vt83c461.h,MACHINES["IDECTRL"] = true
 ---------------------------------------------------
 
-if (MACHINES["IDE"]~=null) then
-	MACHINES["T10"] = true
+if (MACHINES["IDECTRL"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/atadev.cpp",
-		MAME_DIR .. "src/devices/machine/atadev.h",
-		MAME_DIR .. "src/devices/machine/atahle.cpp",
-		MAME_DIR .. "src/devices/machine/atahle.h",
-		MAME_DIR .. "src/devices/machine/ataintf.cpp",
-		MAME_DIR .. "src/devices/machine/ataintf.h",
-		MAME_DIR .. "src/devices/machine/atapicdr.cpp",
-		MAME_DIR .. "src/devices/machine/atapicdr.h",
-		MAME_DIR .. "src/devices/machine/atapihle.cpp",
-		MAME_DIR .. "src/devices/machine/atapihle.h",
 		MAME_DIR .. "src/devices/machine/idectrl.cpp",
 		MAME_DIR .. "src/devices/machine/idectrl.h",
-		MAME_DIR .. "src/devices/machine/idehd.cpp",
-		MAME_DIR .. "src/devices/machine/idehd.h",
 		MAME_DIR .. "src/devices/machine/vt83c461.cpp",
 		MAME_DIR .. "src/devices/machine/vt83c461.h",
 	}
@@ -2842,7 +2816,7 @@ end
 --
 ---------------------------------------------------
 
-if (BUSES["SCSI"]~=null) then
+if (BUSES["IDE"]~=null) or (BUSES["SCSI"]~=null) then
 	MACHINES["T10"] = true
 end
 
diff --git a/scripts/target/mame/arcade.lua b/scripts/target/mame/arcade.lua
index d3e8e3a1d4c..a00aaeb668c 100644
--- a/scripts/target/mame/arcade.lua
+++ b/scripts/target/mame/arcade.lua
@@ -480,7 +480,7 @@ MACHINES["I8255"] = true
 --MACHINES["I8271"] = true
 MACHINES["I8279"] = true
 MACHINES["I8355"] = true
-MACHINES["IDE"] = true
+MACHINES["IDECTRL"] = true
 MACHINES["IE15"] = true
 MACHINES["IM6402"] = true
 MACHINES["INS8154"] = true
@@ -703,6 +703,7 @@ MACHINES["VRENDER0"] = true
 BUSES["AMIGA_KEYBOARD"] = true
 --BUSES["ARCADIA"] = true
 --BUSES["ASTROCADE"] = true
+BUSES["ATA"] = true
 --BUSES["BML3"] = true
 --BUSES["BW2"] = true
 --BUSES["C64"] = true
diff --git a/scripts/target/mame/mess.lua b/scripts/target/mame/mess.lua
index fa3b1e175ed..79313910ef1 100644
--- a/scripts/target/mame/mess.lua
+++ b/scripts/target/mame/mess.lua
@@ -493,7 +493,7 @@ MACHINES["I8271"] = true
 MACHINES["I8279"] = true
 MACHINES["I8291A"] = true
 MACHINES["I8355"] = true
-MACHINES["IDE"] = true
+MACHINES["IDECTRL"] = true
 MACHINES["IE15"] = true
 MACHINES["IM6402"] = true
 MACHINES["INS8154"] = true
@@ -746,6 +746,7 @@ BUSES["APRICOT_KEYBOARD"] = true
 BUSES["AMIGA_KEYBOARD"] = true
 BUSES["ARCADIA"] = true
 BUSES["ASTROCADE"] = true
+BUSES["ATA"] = true
 BUSES["BBC_FDC"] = true
 BUSES["BBC_ANALOGUE"] = true
 BUSES["BBC_EXP"] = true
diff --git a/src/devices/bus/a1bus/a1cffa.h b/src/devices/bus/a1bus/a1cffa.h
index 6c68b8c8d17..4262ee26458 100644
--- a/src/devices/bus/a1bus/a1cffa.h
+++ b/src/devices/bus/a1bus/a1cffa.h
@@ -14,7 +14,7 @@
 #pragma once
 
 #include "a1bus.h"
-#include "machine/ataintf.h"
+#include "bus/ata/ataintf.h"
 
 //**************************************************************************
 //  TYPE DEFINITIONS
diff --git a/src/devices/bus/a2bus/a2cffa.cpp b/src/devices/bus/a2bus/a2cffa.cpp
index 41c5a1603f6..8dd57c376e4 100644
--- a/src/devices/bus/a2bus/a2cffa.cpp
+++ b/src/devices/bus/a2bus/a2cffa.cpp
@@ -13,7 +13,6 @@
 
 #include "emu.h"
 #include "a2cffa.h"
-#include "machine/ataintf.h"
 #include "imagedev/harddriv.h"
 #include "softlist.h"
 
diff --git a/src/devices/bus/a2bus/a2cffa.h b/src/devices/bus/a2bus/a2cffa.h
index 09fd4cd5d0d..d36d8470e8a 100644
--- a/src/devices/bus/a2bus/a2cffa.h
+++ b/src/devices/bus/a2bus/a2cffa.h
@@ -15,7 +15,7 @@
 #pragma once
 
 #include "a2bus.h"
-#include "machine/ataintf.h"
+#include "bus/ata/ataintf.h"
 
 //**************************************************************************
 //  TYPE DEFINITIONS
diff --git a/src/devices/bus/a2bus/a2vulcan.cpp b/src/devices/bus/a2bus/a2vulcan.cpp
index 292f80b219a..6bb4beaaf0a 100644
--- a/src/devices/bus/a2bus/a2vulcan.cpp
+++ b/src/devices/bus/a2bus/a2vulcan.cpp
@@ -55,7 +55,6 @@
 
 #include "emu.h"
 #include "a2vulcan.h"
-#include "machine/ataintf.h"
 #include "imagedev/harddriv.h"
 
 //**************************************************************************
diff --git a/src/devices/bus/a2bus/a2vulcan.h b/src/devices/bus/a2bus/a2vulcan.h
index a1f867196c4..0eddf59ecd9 100644
--- a/src/devices/bus/a2bus/a2vulcan.h
+++ b/src/devices/bus/a2bus/a2vulcan.h
@@ -14,7 +14,7 @@
 #pragma once
 
 #include "a2bus.h"
-#include "machine/ataintf.h"
+#include "bus/ata/ataintf.h"
 
 //**************************************************************************
 //  TYPE DEFINITIONS
diff --git a/src/devices/bus/a2bus/a2zipdrive.cpp b/src/devices/bus/a2bus/a2zipdrive.cpp
index 44fc6afc0ae..6f76de550b0 100644
--- a/src/devices/bus/a2bus/a2zipdrive.cpp
+++ b/src/devices/bus/a2bus/a2zipdrive.cpp
@@ -68,7 +68,6 @@
 
 #include "emu.h"
 #include "a2zipdrive.h"
-#include "machine/ataintf.h"
 #include "imagedev/harddriv.h"
 
 //**************************************************************************
diff --git a/src/devices/bus/a2bus/a2zipdrive.h b/src/devices/bus/a2bus/a2zipdrive.h
index 9e3e68e79f2..e9b90f06ed7 100644
--- a/src/devices/bus/a2bus/a2zipdrive.h
+++ b/src/devices/bus/a2bus/a2zipdrive.h
@@ -17,7 +17,7 @@
 #pragma once
 
 #include "a2bus.h"
-#include "machine/ataintf.h"
+#include "bus/ata/ataintf.h"
 
 //**************************************************************************
 //  TYPE DEFINITIONS
diff --git a/src/devices/bus/adam/ide.h b/src/devices/bus/adam/ide.h
index bfce0f9851f..fc01088eeec 100644
--- a/src/devices/bus/adam/ide.h
+++ b/src/devices/bus/adam/ide.h
@@ -12,7 +12,7 @@
 #pragma once
 
 #include "exp.h"
-#include "machine/ataintf.h"
+#include "bus/ata/ataintf.h"
 #include "machine/output_latch.h"
 
 
diff --git a/src/devices/bus/amiga/zorro/buddha.h b/src/devices/bus/amiga/zorro/buddha.h
index bf671902cc0..61ad183cbfb 100644
--- a/src/devices/bus/amiga/zorro/buddha.h
+++ b/src/devices/bus/amiga/zorro/buddha.h
@@ -15,7 +15,7 @@
 
 #include "zorro.h"
 #include "machine/autoconfig.h"
-#include "machine/ataintf.h"
+#include "bus/ata/ataintf.h"
 
 
 //**************************************************************************
diff --git a/src/devices/bus/ata/atadev.cpp b/src/devices/bus/ata/atadev.cpp
new file mode 100644
index 00000000000..a44a162c6fb
--- /dev/null
+++ b/src/devices/bus/ata/atadev.cpp
@@ -0,0 +1,71 @@
+// license:BSD-3-Clause
+// copyright-holders:smf
+/***************************************************************************
+
+    ATA Device implementation.
+
+***************************************************************************/
+
+#include "emu.h"
+#include "atadev.h"
+
+#include "atapicdr.h"
+#include "idehd.h"
+
+//-------------------------------------------------
+//  device_ata_interface - constructor
+//-------------------------------------------------
+
+device_ata_interface::device_ata_interface(const machine_config &mconfig, device_t &device) :
+	device_slot_card_interface(mconfig, device),
+	m_irq_handler(device),
+	m_dmarq_handler(device),
+	m_dasp_handler(device),
+	m_pdiag_handler(device)
+{
+}
+
+
+//**************************************************************************
+//  ATA SLOT DEVICE
+//**************************************************************************
+
+// device type definition
+DEFINE_DEVICE_TYPE(ATA_SLOT, ata_slot_device, "ata_slot", "ATA Connector")
+
+//-------------------------------------------------
+//  ata_slot_device - constructor
+//-------------------------------------------------
+
+ata_slot_device::ata_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+	: device_t(mconfig, ATA_SLOT, tag, owner, clock),
+		device_slot_interface(mconfig, *this),
+		m_dev(nullptr)
+{
+}
+
+//-------------------------------------------------
+//  device_config_complete - perform any
+//  operations now that the configuration is
+//  complete
+//-------------------------------------------------
+
+void ata_slot_device::device_config_complete()
+{
+	m_dev = dynamic_cast<device_ata_interface *>(get_card_device());
+}
+
+//-------------------------------------------------
+//  device_start - device-specific startup
+//-------------------------------------------------
+
+void ata_slot_device::device_start()
+{
+}
+
+
+void ata_devices(device_slot_interface &device)
+{
+	device.option_add("hdd", IDE_HARDDISK);
+	device.option_add("cdrom", ATAPI_CDROM);
+}
diff --git a/src/devices/machine/atadev.h b/src/devices/bus/ata/atadev.h
similarity index 65%
rename from src/devices/machine/atadev.h
rename to src/devices/bus/ata/atadev.h
index 85d76bbd16a..40904b9b7b5 100644
--- a/src/devices/machine/atadev.h
+++ b/src/devices/bus/ata/atadev.h
@@ -8,8 +8,8 @@
 
 ***************************************************************************/
 
-#ifndef MAME_MACHINE_ATADEV_H
-#define MAME_MACHINE_ATADEV_H
+#ifndef MAME_BUS_ATA_ATADEV_H
+#define MAME_BUS_ATA_ATADEV_H
 
 #pragma once
 
@@ -44,4 +44,29 @@ protected:
 	devcb_write_line m_pdiag_handler;
 };
 
-#endif // MAME_MACHINE_ATADEV_H
+// ======================> ata_slot_device
+
+class ata_slot_device : public device_t,
+						public device_slot_interface
+{
+public:
+	// construction/destruction
+	ata_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0);
+
+	device_ata_interface *dev() { return m_dev; }
+
+protected:
+	// device-level overrides
+	virtual void device_start() override;
+	virtual void device_config_complete() override;
+
+private:
+	device_ata_interface *m_dev;
+};
+
+// device type definition
+DECLARE_DEVICE_TYPE(ATA_SLOT, ata_slot_device)
+
+void ata_devices(device_slot_interface &device);
+
+#endif // MAME_BUS_ATA_ATADEV_H
diff --git a/src/devices/machine/atahle.cpp b/src/devices/bus/ata/atahle.cpp
similarity index 100%
rename from src/devices/machine/atahle.cpp
rename to src/devices/bus/ata/atahle.cpp
diff --git a/src/devices/machine/atahle.h b/src/devices/bus/ata/atahle.h
similarity index 98%
rename from src/devices/machine/atahle.h
rename to src/devices/bus/ata/atahle.h
index 14d21d24b5d..176d45e8e2b 100644
--- a/src/devices/machine/atahle.h
+++ b/src/devices/bus/ata/atahle.h
@@ -8,8 +8,8 @@
 
 ***************************************************************************/
 
-#ifndef MAME_MACHINE_ATAHLE_H
-#define MAME_MACHINE_ATAHLE_H
+#ifndef MAME_BUS_ATA_ATAHLE_H
+#define MAME_BUS_ATA_ATAHLE_H
 
 #pragma once
 
@@ -216,4 +216,4 @@ private:
 	emu_timer *m_buffer_empty_timer;
 };
 
-#endif // MAME_MACHINE_ATAHLE_H
+#endif // MAME_BUS_ATA_ATAHLE_H
diff --git a/src/devices/machine/ataintf.cpp b/src/devices/bus/ata/ataintf.cpp
similarity index 80%
rename from src/devices/machine/ataintf.cpp
rename to src/devices/bus/ata/ataintf.cpp
index 5f658824c78..d2a09e7a689 100644
--- a/src/devices/machine/ataintf.cpp
+++ b/src/devices/bus/ata/ataintf.cpp
@@ -11,22 +11,8 @@
 #include "emu.h"
 #include "ataintf.h"
 
-#include "atapicdr.h"
-#include "idehd.h"
-
 #include "debugger.h"
 
-void abstract_ata_interface_device::set_default_ata_devices(const char* _master, const char* _slave)
-{
-	for (size_t slot_index = 0; slot_index < SLOT_COUNT; slot_index++)
-	{
-		slot(slot_index).option_add("hdd", IDE_HARDDISK);
-		slot(slot_index).option_add("cdrom", ATAPI_CDROM);
-	}
-	slot(SLOT_MASTER).set_default_option(_master);
-	slot(SLOT_SLAVE).set_default_option(_slave);
-}
-
 ata_slot_device &abstract_ata_interface_device::slot(int index)
 {
 	assert(index < 2);
@@ -220,12 +206,6 @@ WRITE_LINE_MEMBER( abstract_ata_interface_device::write_dmack )
 			elem->dev()->write_dmack(state);
 }
 
-void ata_devices(device_slot_interface &device)
-{
-	device.option_add("hdd", IDE_HARDDISK);
-	device.option_add("cdrom", ATAPI_CDROM);
-}
-
 abstract_ata_interface_device::abstract_ata_interface_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
 	device_t(mconfig, type, tag, owner, clock),
 	m_slot(*this, "%u", 0U),
@@ -294,41 +274,3 @@ void abstract_ata_interface_device::device_add_mconfig(machine_config &config)
 	for (size_t slot = 0; slot < SLOT_COUNT; slot++)
 		ATA_SLOT(config, m_slot[slot]);
 }
-
-
-//**************************************************************************
-//  ATA SLOT DEVICE
-//**************************************************************************
-
-// device type definition
-DEFINE_DEVICE_TYPE(ATA_SLOT, ata_slot_device, "ata_slot", "ATA Connector")
-
-//-------------------------------------------------
-//  ata_slot_device - constructor
-//-------------------------------------------------
-
-ata_slot_device::ata_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
-	: device_t(mconfig, ATA_SLOT, tag, owner, clock),
-		device_slot_interface(mconfig, *this),
-		m_dev(nullptr)
-{
-}
-
-//-------------------------------------------------
-//  device_config_complete - perform any
-//  operations now that the configuration is
-//  complete
-//-------------------------------------------------
-
-void ata_slot_device::device_config_complete()
-{
-	m_dev = dynamic_cast<device_ata_interface *>(get_card_device());
-}
-
-//-------------------------------------------------
-//  device_start - device-specific startup
-//-------------------------------------------------
-
-void ata_slot_device::device_start()
-{
-}
diff --git a/src/devices/machine/ataintf.h b/src/devices/bus/ata/ataintf.h
similarity index 84%
rename from src/devices/machine/ataintf.h
rename to src/devices/bus/ata/ataintf.h
index 974645a24cb..ce2e501886a 100644
--- a/src/devices/machine/ataintf.h
+++ b/src/devices/bus/ata/ataintf.h
@@ -8,8 +8,8 @@
 
 ***************************************************************************/
 
-#ifndef MAME_MACHINE_ATAINTF_H
-#define MAME_MACHINE_ATAINTF_H
+#ifndef MAME_BUS_ATA_ATAINTF_H
+#define MAME_BUS_ATA_ATAINTF_H
 
 #pragma once
 
@@ -19,35 +19,6 @@
     TYPE DEFINITIONS
 ***************************************************************************/
 
-// ======================> ata_slot_device
-
-class ata_slot_device : public device_t,
-						public device_slot_interface
-{
-public:
-	// construction/destruction
-	ata_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0);
-
-	device_ata_interface *dev() { return m_dev; }
-
-protected:
-	// device-level overrides
-	virtual void device_start() override;
-	virtual void device_config_complete() override;
-
-private:
-	device_ata_interface *m_dev;
-};
-
-// device type definition
-DECLARE_DEVICE_TYPE(ATA_SLOT, ata_slot_device)
-
-void ata_devices(device_slot_interface &device);
-
-/***************************************************************************
-    TYPE DEFINITIONS
-***************************************************************************/
-
 /* ----- device interface ----- */
 
 class abstract_ata_interface_device : public device_t
@@ -85,7 +56,6 @@ public:
 	}
 
 	ata_slot_device &slot(int index);
-	virtual void set_default_ata_devices(const char* _master, const char* _slave);
 
 	uint16_t read_dma();
 	void write_dma(uint16_t data);
@@ -176,4 +146,4 @@ public:
 
 DECLARE_DEVICE_TYPE(ATA_INTERFACE, ata_interface_device)
 
-#endif // MAME_MACHINE_ATAINTF_H
+#endif // MAME_BUS_ATA_ATAINTF_H
diff --git a/src/devices/machine/atapicdr.cpp b/src/devices/bus/ata/atapicdr.cpp
similarity index 100%
rename from src/devices/machine/atapicdr.cpp
rename to src/devices/bus/ata/atapicdr.cpp
diff --git a/src/devices/machine/atapicdr.h b/src/devices/bus/ata/atapicdr.h
similarity index 91%
rename from src/devices/machine/atapicdr.h
rename to src/devices/bus/ata/atapicdr.h
index c84d3a6e62d..81b1b2b86ac 100644
--- a/src/devices/machine/atapicdr.h
+++ b/src/devices/bus/ata/atapicdr.h
@@ -8,13 +8,13 @@
 
 ***************************************************************************/
 
-#ifndef MAME_MACHINE_ATAPICDR_H
-#define MAME_MACHINE_ATAPICDR_H
+#ifndef MAME_BUS_ATA_ATAPICDR_H
+#define MAME_BUS_ATA_ATAPICDR_H
 
 #pragma once
 
 #include "atapihle.h"
-#include "t10mmc.h"
+#include "machine/t10mmc.h"
 
 class atapi_cdrom_device : public atapi_hle_device, public t10mmc
 {
@@ -51,4 +51,4 @@ protected:
 DECLARE_DEVICE_TYPE(ATAPI_CDROM,       atapi_cdrom_device)
 DECLARE_DEVICE_TYPE(ATAPI_FIXED_CDROM, atapi_fixed_cdrom_device)
 
-#endif // MAME_MACHINE_ATAPICDR_H
+#endif // MAME_BUS_ATA_ATAPICDR_H
diff --git a/src/devices/machine/atapihle.cpp b/src/devices/bus/ata/atapihle.cpp
similarity index 100%
rename from src/devices/machine/atapihle.cpp
rename to src/devices/bus/ata/atapihle.cpp
diff --git a/src/devices/machine/atapihle.h b/src/devices/bus/ata/atapihle.h
similarity index 93%
rename from src/devices/machine/atapihle.h
rename to src/devices/bus/ata/atapihle.h
index d01447e5830..8d1bb95eec4 100644
--- a/src/devices/machine/atapihle.h
+++ b/src/devices/bus/ata/atapihle.h
@@ -8,13 +8,13 @@
 
 ***************************************************************************/
 
-#ifndef MAME_MACHINE_ATAPIHLE_H
-#define MAME_MACHINE_ATAPIHLE_H
+#ifndef MAME_BUS_ATA_ATAPIHLE_H
+#define MAME_BUS_ATA_ATAPIHLE_H
 
 #pragma once
 
 #include "atahle.h"
-#include "t10spc.h"
+#include "machine/t10spc.h"
 
 class atapi_hle_device : public ata_hle_device, public virtual t10spc
 {
@@ -74,4 +74,4 @@ private:
 	static constexpr int ATAPI_BUFFER_LENGTH = 0xf800;
 };
 
-#endif // MAME_MACHINE_ATAPIHLE_H
+#endif // MAME_BUS_ATA_ATAPIHLE_H
diff --git a/src/devices/machine/cr589.cpp b/src/devices/bus/ata/cr589.cpp
similarity index 100%
rename from src/devices/machine/cr589.cpp
rename to src/devices/bus/ata/cr589.cpp
diff --git a/src/devices/machine/cr589.h b/src/devices/bus/ata/cr589.h
similarity index 93%
rename from src/devices/machine/cr589.h
rename to src/devices/bus/ata/cr589.h
index 8d94d5739b9..77df277a4b0 100644
--- a/src/devices/machine/cr589.h
+++ b/src/devices/bus/ata/cr589.h
@@ -8,8 +8,8 @@
 
 ***************************************************************************/
 
-#ifndef MAME_MACHINE_CR589_H
-#define MAME_MACHINE_CR589_H
+#ifndef MAME_BUS_ATA_CR589_H
+#define MAME_BUS_ATA_CR589_H
 
 #pragma once
 
@@ -46,4 +46,4 @@ private:
 // device type definition
 DECLARE_DEVICE_TYPE(CR589, matsushita_cr589_device)
 
-#endif // MAME_MACHINE_CR589_H
+#endif // MAME_BUS_ATA_CR589_H
diff --git a/src/devices/machine/idehd.cpp b/src/devices/bus/ata/idehd.cpp
similarity index 100%
rename from src/devices/machine/idehd.cpp
rename to src/devices/bus/ata/idehd.cpp
diff --git a/src/devices/machine/idehd.h b/src/devices/bus/ata/idehd.h
similarity index 97%
rename from src/devices/machine/idehd.h
rename to src/devices/bus/ata/idehd.h
index 8c8e96f8ec2..2c57efdc2e9 100644
--- a/src/devices/machine/idehd.h
+++ b/src/devices/bus/ata/idehd.h
@@ -8,8 +8,8 @@
 
 ***************************************************************************/
 
-#ifndef MAME_MACHINE_IDEHD_H
-#define MAME_MACHINE_IDEHD_H
+#ifndef MAME_BUS_ATA_IDEHD_H
+#define MAME_BUS_ATA_IDEHD_H
 
 #pragma once
 
@@ -123,4 +123,4 @@ private:
 // device type definition
 DECLARE_DEVICE_TYPE(IDE_HARDDISK, ide_hdd_device)
 
-#endif // MAME_MACHINE_IDEHD_H
+#endif // MAME_BUS_ATA_IDEHD_H
diff --git a/src/devices/bus/c64/ide64.h b/src/devices/bus/c64/ide64.h
index bfabad10c87..366357868b9 100644
--- a/src/devices/bus/c64/ide64.h
+++ b/src/devices/bus/c64/ide64.h
@@ -13,8 +13,8 @@
 
 
 #include "exp.h"
+#include "bus/ata/ataintf.h"
 #include "machine/ds1302.h"
-#include "machine/ataintf.h"
 #include "machine/intelfsh.h"
 #include "imagedev/harddriv.h"
 
diff --git a/src/devices/bus/cpc/symbfac2.h b/src/devices/bus/cpc/symbfac2.h
index df490907a90..2a85bfbedad 100644
--- a/src/devices/bus/cpc/symbfac2.h
+++ b/src/devices/bus/cpc/symbfac2.h
@@ -12,7 +12,7 @@
 #pragma once
 
 #include "cpcexp.h"
-#include "machine/ataintf.h"
+#include "bus/ata/ataintf.h"
 #include "machine/ds128x.h"
 #include "machine/nvram.h"
 
diff --git a/src/devices/bus/isa/ide.cpp b/src/devices/bus/isa/ide.cpp
index 1b1c832cc9c..9b259161a88 100644
--- a/src/devices/bus/isa/ide.cpp
+++ b/src/devices/bus/isa/ide.cpp
@@ -9,8 +9,8 @@
 #include "emu.h"
 #include "ide.h"
 
+#include "bus/ata/atadev.h"
 #include "imagedev/harddriv.h"
-#include "machine/idectrl.h"
 #include "sound/cdda.h"
 #include "speaker.h"
 
diff --git a/src/devices/bus/isa/side116.h b/src/devices/bus/isa/side116.h
index ac49b3efead..ab86eaec032 100644
--- a/src/devices/bus/isa/side116.h
+++ b/src/devices/bus/isa/side116.h
@@ -13,7 +13,7 @@
 
 #pragma once
 
-#include "machine/ataintf.h"
+#include "bus/ata/ataintf.h"
 #include "isa.h"
 
 
diff --git a/src/devices/bus/isa/xtide.h b/src/devices/bus/isa/xtide.h
index 4402aa991fd..745def016ab 100644
--- a/src/devices/bus/isa/xtide.h
+++ b/src/devices/bus/isa/xtide.h
@@ -6,7 +6,7 @@
 #pragma once
 
 #include "isa.h"
-#include "machine/ataintf.h"
+#include "bus/ata/ataintf.h"
 #include "machine/eeprompar.h"
 
 //**************************************************************************
diff --git a/src/devices/bus/kc/d004.h b/src/devices/bus/kc/d004.h
index 2d4c49d2ebc..6a7440d6ff2 100644
--- a/src/devices/bus/kc/d004.h
+++ b/src/devices/bus/kc/d004.h
@@ -9,7 +9,7 @@
 #include "machine/z80ctc.h"
 #include "cpu/z80/z80.h"
 #include "machine/upd765.h"
-#include "machine/ataintf.h"
+#include "bus/ata/ataintf.h"
 #include "imagedev/floppy.h"
 #include "imagedev/harddriv.h"
 
diff --git a/src/devices/bus/lpci/southbridge.h b/src/devices/bus/lpci/southbridge.h
index 7c2c8f3760f..5f97f2716f4 100644
--- a/src/devices/bus/lpci/southbridge.h
+++ b/src/devices/bus/lpci/southbridge.h
@@ -12,7 +12,7 @@
 #include "machine/pic8259.h"
 #include "machine/pit8253.h"
 
-#include "machine/ataintf.h"
+#include "bus/ata/ataintf.h"
 #include "machine/at_keybc.h"
 #include "machine/idectrl.h"
 
diff --git a/src/devices/bus/ql/qubide.h b/src/devices/bus/ql/qubide.h
index 5e1ac6d1860..8f4d88d37ee 100644
--- a/src/devices/bus/ql/qubide.h
+++ b/src/devices/bus/ql/qubide.h
@@ -12,7 +12,7 @@
 #pragma once
 
 #include "exp.h"
-#include "machine/ataintf.h"
+#include "bus/ata/ataintf.h"
 
 
 
diff --git a/src/devices/bus/ti99/peb/tn_ide.h b/src/devices/bus/ti99/peb/tn_ide.h
index 51d516d5af0..2b4bd6c97de 100644
--- a/src/devices/bus/ti99/peb/tn_ide.h
+++ b/src/devices/bus/ti99/peb/tn_ide.h
@@ -17,7 +17,7 @@
 #pragma once
 
 #include "peribox.h"
-#include "machine/ataintf.h"
+#include "bus/ata/ataintf.h"
 #include "machine/ram.h"
 #include "machine/rtc65271.h"
 
diff --git a/src/devices/machine/atadev.cpp b/src/devices/machine/atadev.cpp
deleted file mode 100644
index 03cae8a67ed..00000000000
--- a/src/devices/machine/atadev.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-// license:BSD-3-Clause
-// copyright-holders:smf
-/***************************************************************************
-
-    ATA Device implementation.
-
-***************************************************************************/
-
-#include "emu.h"
-#include "atadev.h"
-
-//-------------------------------------------------
-//  device_ata_interface - constructor
-//-------------------------------------------------
-
-device_ata_interface::device_ata_interface(const machine_config &mconfig, device_t &device) :
-	device_slot_card_interface(mconfig, device),
-	m_irq_handler(device),
-	m_dmarq_handler(device),
-	m_dasp_handler(device),
-	m_pdiag_handler(device)
-{
-}
diff --git a/src/devices/machine/ataflash.h b/src/devices/machine/ataflash.h
index 71024dda20e..4df9e1f0352 100644
--- a/src/devices/machine/ataflash.h
+++ b/src/devices/machine/ataflash.h
@@ -6,7 +6,7 @@
 #pragma once
 
 #include "pccard.h"
-#include "machine/idehd.h"
+#include "bus/ata/idehd.h"
 
 DECLARE_DEVICE_TYPE(ATA_FLASH_PCCARD, ata_flash_pccard_device)
 
diff --git a/src/devices/machine/i82371sb.h b/src/devices/machine/i82371sb.h
index 5d79eec29ef..ce52bc7eefa 100644
--- a/src/devices/machine/i82371sb.h
+++ b/src/devices/machine/i82371sb.h
@@ -14,7 +14,7 @@
 #include "machine/pic8259.h"
 #include "machine/pit8253.h"
 
-#include "machine/ataintf.h"
+#include "bus/ata/ataintf.h"
 
 #include "sound/spkrdev.h"
 #include "machine/ram.h"
diff --git a/src/devices/machine/idectrl.h b/src/devices/machine/idectrl.h
index c0e84e3c562..ace0b476afc 100644
--- a/src/devices/machine/idectrl.h
+++ b/src/devices/machine/idectrl.h
@@ -13,7 +13,7 @@
 
 #pragma once
 
-#include "ataintf.h"
+#include "bus/ata/ataintf.h"
 
 class ide_controller_device : public abstract_ata_interface_device
 {
diff --git a/src/devices/machine/sis85c496.h b/src/devices/machine/sis85c496.h
index ba2ebcaf2e0..af952b20d88 100644
--- a/src/devices/machine/sis85c496.h
+++ b/src/devices/machine/sis85c496.h
@@ -11,7 +11,7 @@
 #include "machine/pic8259.h"
 #include "machine/pit8253.h"
 
-#include "machine/ataintf.h"
+#include "bus/ata/ataintf.h"
 #include "machine/at_keybc.h"
 
 #include "sound/spkrdev.h"
diff --git a/src/mame/drivers/amiga.cpp b/src/mame/drivers/amiga.cpp
index ec51d490bc1..978f624c91a 100644
--- a/src/mame/drivers/amiga.cpp
+++ b/src/mame/drivers/amiga.cpp
@@ -11,13 +11,13 @@
 
 #include "bus/amiga/keyboard/keyboard.h"
 #include "bus/amiga/zorro/zorro.h"
+#include "bus/ata/ataintf.h"
 #include "cpu/m68000/m68000.h"
 #include "cpu/m6502/m6502.h"
 #include "machine/bankdev.h"
 #include "machine/6525tpi.h"
 #include "machine/mos6526.h"
 #include "machine/gayle.h"
-#include "machine/ataintf.h"
 #include "machine/dmac.h"
 #include "machine/nvram.h"
 #include "machine/i2cmem.h"
diff --git a/src/mame/drivers/bebox.cpp b/src/mame/drivers/bebox.cpp
index d3056de6ed1..31e6187d35d 100644
--- a/src/mame/drivers/bebox.cpp
+++ b/src/mame/drivers/bebox.cpp
@@ -210,7 +210,7 @@ void bebox_state::bebox_peripherals(machine_config &config)
 	scsictrl.set_scsi_port("scsi");
 
 	ide_controller_device &idectrl(IDE_CONTROLLER(config, "ide"));
-	idectrl.set_default_ata_devices("hdd", nullptr);
+	idectrl.options(ata_devices, "hdd", nullptr, false);
 	idectrl.irq_handler().set(FUNC(bebox_state::bebox_ide_interrupt));
 
 	/* pci */
diff --git a/src/mame/drivers/chihiro.cpp b/src/mame/drivers/chihiro.cpp
index 9fc7b78db5b..1843367aaec 100644
--- a/src/mame/drivers/chihiro.cpp
+++ b/src/mame/drivers/chihiro.cpp
@@ -433,8 +433,8 @@ Thanks to Alex, Mr Mudkips, and Philip Burke for this info.
 #include "includes/xbox_pci.h"
 #include "includes/xbox.h"
 
+#include "bus/ata/idehd.h"
 #include "cpu/i386/i386.h"
-#include "machine/idehd.h"
 #include "machine/jvs13551.h"
 #include "machine/jvshost.h"
 #include "machine/naomigd.h"
diff --git a/src/mame/drivers/cobra.cpp b/src/mame/drivers/cobra.cpp
index b2f4331b15a..1a9f50b90c8 100644
--- a/src/mame/drivers/cobra.cpp
+++ b/src/mame/drivers/cobra.cpp
@@ -315,10 +315,10 @@
 
 
 #include "emu.h"
+#include "bus/ata/ataintf.h"
+#include "bus/ata/idehd.h"
 #include "cpu/powerpc/ppc.h"
 #include "machine/lpci.h"
-#include "machine/ataintf.h"
-#include "machine/idehd.h"
 #include "machine/jvshost.h"
 #include "machine/jvsdev.h"
 #include "machine/timekpr.h"
diff --git a/src/mame/drivers/csplayh5.cpp b/src/mame/drivers/csplayh5.cpp
index bca9301e1ca..426410c7227 100644
--- a/src/mame/drivers/csplayh5.cpp
+++ b/src/mame/drivers/csplayh5.cpp
@@ -30,12 +30,12 @@
 ***********************************************************************************************************/
 
 #include "emu.h"
+#include "bus/ata/atadev.h"
 #include "cpu/h8/h83002.h"
 #include "cpu/m68000/m68000.h"
 #include "machine/nvram.h"
 #include "machine/tmp68301.h"
 #include "machine/idectrl.h"
-#include "machine/idehd.h"
 #include "machine/timer.h"
 #include "video/v9938.h"
 #include "audio/nichisnd.h"
diff --git a/src/mame/drivers/djmain.cpp b/src/mame/drivers/djmain.cpp
index cde246b9f6d..b1deafa2fef 100644
--- a/src/mame/drivers/djmain.cpp
+++ b/src/mame/drivers/djmain.cpp
@@ -68,10 +68,10 @@ hard drive  3.5 adapter     long 3.5 IDE cable      3.5 adapter   PCB
 #include "emu.h"
 #include "includes/djmain.h"
 
+#include "bus/ata/ataintf.h"
+#include "bus/ata/idehd.h"
 #include "cpu/m68000/m68000.h"
-#include "machine/ataintf.h"
 #include "sound/k054539.h"
-#include "machine/idehd.h"
 
 #include "screen.h"
 #include "speaker.h"
diff --git a/src/mame/drivers/firebeat.cpp b/src/mame/drivers/firebeat.cpp
index 2341bbcbbbb..a7e09bdb5d8 100644
--- a/src/mame/drivers/firebeat.cpp
+++ b/src/mame/drivers/firebeat.cpp
@@ -138,10 +138,10 @@ Keyboard Mania 2nd Mix - dongle, program CD, audio CD
 
 #include "emu.h"
 
+#include "bus/ata/ataintf.h"
+#include "bus/ata/atapicdr.h"
 #include "cpu/m68000/m68000.h"
 #include "cpu/powerpc/ppc.h"
-#include "machine/ataintf.h"
-#include "machine/atapicdr.h"
 #include "machine/ins8250.h"
 #include "machine/intelfsh.h"
 #include "machine/midikbd.h"
diff --git a/src/mame/drivers/jaguar.cpp b/src/mame/drivers/jaguar.cpp
index 94d8cc03de5..982492dbbd5 100644
--- a/src/mame/drivers/jaguar.cpp
+++ b/src/mame/drivers/jaguar.cpp
@@ -337,13 +337,13 @@ Notes:
 
 #include "bus/generic/slot.h"
 #include "bus/generic/carts.h"
+#include "bus/ata/idehd.h"
 #include "cpu/m68000/m68000.h"
 #include "cpu/mips/mips1.h"
 #include "cpu/jaguar/jaguar.h"
 #include "imagedev/chd_cd.h"
 #include "imagedev/snapquik.h"
 #include "machine/eepromser.h"
-#include "machine/idehd.h"
 #include "machine/watchdog.h"
 #include "machine/vt83c461.h"
 #include "sound/cdda.h"
diff --git a/src/mame/drivers/kinst.cpp b/src/mame/drivers/kinst.cpp
index fd03c272bff..6f426eda325 100644
--- a/src/mame/drivers/kinst.cpp
+++ b/src/mame/drivers/kinst.cpp
@@ -180,10 +180,10 @@ Notes:
 #include "emu.h"
 #include "audio/dcs.h"
 
+#include "bus/ata/ataintf.h"
+#include "bus/ata/idehd.h"
 #include "cpu/adsp2100/adsp2100.h"
 #include "cpu/mips/mips3.h"
-#include "machine/ataintf.h"
-#include "machine/idehd.h"
 #include "emupal.h"
 #include "screen.h"
 
diff --git a/src/mame/drivers/konamim2.cpp b/src/mame/drivers/konamim2.cpp
index 22c7fd35708..0c071bfcea1 100644
--- a/src/mame/drivers/konamim2.cpp
+++ b/src/mame/drivers/konamim2.cpp
@@ -217,9 +217,9 @@ Notes:
 
 #include "emu.h"
 #include "cpu/powerpc/ppc.h"
+#include "bus/ata/ataintf.h"
+#include "bus/ata/cr589.h"
 #include "machine/3dom2.h"
-#include "machine/ataintf.h"
-#include "machine/cr589.h"
 #include "machine/eepromser.h"
 #include "machine/timekpr.h"
 #include "sound/dac.h"
diff --git a/src/mame/drivers/ksys573.cpp b/src/mame/drivers/ksys573.cpp
index f8c5f328778..29721e75a05 100644
--- a/src/mame/drivers/ksys573.cpp
+++ b/src/mame/drivers/ksys573.cpp
@@ -346,10 +346,10 @@ G: gun mania only, drives air soft gun (this game uses real BB bullet)
 
 #include "emu.h"
 #include "cpu/psx/psx.h"
+#include "bus/ata/ataintf.h"
+#include "bus/ata/cr589.h"
 #include "machine/adc083x.h"
-#include "machine/ataintf.h"
 #include "machine/bankdev.h"
-#include "machine/cr589.h"
 #include "machine/ds2401.h"
 #include "machine/linflash.h"
 #include "machine/k573cass.h"
diff --git a/src/mame/drivers/mtouchxl.cpp b/src/mame/drivers/mtouchxl.cpp
index b46833a322d..7610b54548a 100644
--- a/src/mame/drivers/mtouchxl.cpp
+++ b/src/mame/drivers/mtouchxl.cpp
@@ -30,6 +30,8 @@
 //#define REAL_PCI_CHIPSET
 
 #include "emu.h"
+#include "bus/ata/atapicdr.h"
+#include "bus/ata/idehd.h"
 #include "bus/isa/isa_cards.h"
 #include "cpu/i386/i386.h"
 #include "machine/at.h"
@@ -38,8 +40,6 @@
 #include "machine/nvram.h"
 #include "machine/ins8250.h"
 #include "machine/microtch.h"
-#include "machine/atapicdr.h"
-#include "machine/idehd.h"
 #include "machine/bankdev.h"
 #include "machine/intelfsh.h"
 #include "machine/ds128x.h"
diff --git a/src/mame/drivers/nforcepc.cpp b/src/mame/drivers/nforcepc.cpp
index 4d6cac26352..6157c868956 100644
--- a/src/mame/drivers/nforcepc.cpp
+++ b/src/mame/drivers/nforcepc.cpp
@@ -22,12 +22,11 @@
 
 
 #include "emu.h"
+#include "bus/ata/atadev.h"
 #include "cpu/i386/athlon.h"
 #include "machine/pci.h"
 #include "machine/pci-ide.h"
 #include "machine/intelfsh.h"
-#include "machine/atapicdr.h"
-#include "machine/idehd.h"
 #include "video/virge_pci.h"
 #include "includes/xbox_pci.h"
 #include "includes/nforcepc.h"
@@ -56,12 +55,6 @@ static const uint8_t test_spd_data[] = {
 };
 #endif
 
-void nforcepc_ata_devices(device_slot_interface &device)
-{
-	device.option_add("hdd", IDE_HARDDISK);
-	device.option_add("cdrom", ATAPI_CDROM);
-}
-
 /*
   Pci devices
 */
@@ -754,7 +747,7 @@ void nforcepc_state::nforcepc(machine_config &config)
 	mcpx_ide_device &ide(MCPX_IDE(config, ":pci:09.0", 0)); // 10de:01bc NVIDIA Corporation nForce IDE
 	ide.pri_interrupt_handler().set(":pci:01.0", FUNC(mcpx_isalpc_device::irq14));
 	ide.sec_interrupt_handler().set(":pci:01.0", FUNC(mcpx_isalpc_device::irq15));
-		/*subdevice<ide_controller_32_device>(":pci:09.0:ide")->options(nforcepc_ata_devices, "hdd", "cdrom", true);*/
+		/*subdevice<ide_controller_32_device>(":pci:09.0:ide")->options(ata_devices, "hdd", "cdrom", true);*/
 	NV2A_AGP(config, ":pci:1e.0", 0, 0x10de01b7, 0); // 10de:01b7 NVIDIA Corporation nForce AGP to PCI Bridge
 	VIRGEDX_PCI(config, ":pci:0a.0", 0);
 	SST_49LF020(config, "bios", 0);
diff --git a/src/mame/drivers/psattack.cpp b/src/mame/drivers/psattack.cpp
index 98a4e8fe4f3..158db0cc87a 100644
--- a/src/mame/drivers/psattack.cpp
+++ b/src/mame/drivers/psattack.cpp
@@ -126,11 +126,11 @@ GUN_xP are 6 pin gun connectors (pins 3-6 match the UNICO sytle guns):
 ****************************************************************************/
 
 #include "emu.h"
+#include "bus/ata/ataintf.h"
 #include "cpu/se3208/se3208.h"
 #include "machine/nvram.h"
 #include "machine/eepromser.h"
 #include "machine/vrender0.h"
-#include "machine/ataintf.h"
 #include "emupal.h"
 
 
diff --git a/src/mame/drivers/qdrmfgp.cpp b/src/mame/drivers/qdrmfgp.cpp
index 2262e9e6b36..d9057c8ff3c 100644
--- a/src/mame/drivers/qdrmfgp.cpp
+++ b/src/mame/drivers/qdrmfgp.cpp
@@ -24,7 +24,6 @@ GP1 HDD data contents:
 #include "includes/qdrmfgp.h"
 
 #include "cpu/m68000/m68000.h"
-#include "machine/ataintf.h"
 #include "machine/nvram.h"
 #include "sound/k054539.h"
 #include "speaker.h"
diff --git a/src/mame/drivers/taitotz.cpp b/src/mame/drivers/taitotz.cpp
index 1c20f6ea658..8d86d78168e 100644
--- a/src/mame/drivers/taitotz.cpp
+++ b/src/mame/drivers/taitotz.cpp
@@ -172,10 +172,10 @@ Notes:
 */
 
 #include "emu.h"
+#include "bus/ata/ataintf.h"
+#include "bus/ata/idehd.h"
 #include "cpu/powerpc/ppc.h"
 #include "cpu/tlcs900/tlcs900.h"
-#include "machine/ataintf.h"
-#include "machine/idehd.h"
 #include "machine/nvram.h"
 #include "video/poly.h"
 
diff --git a/src/mame/drivers/turrett.cpp b/src/mame/drivers/turrett.cpp
index bcc1ca38483..087e946aacb 100644
--- a/src/mame/drivers/turrett.cpp
+++ b/src/mame/drivers/turrett.cpp
@@ -11,6 +11,9 @@
 #include "emu.h"
 #include "includes/turrett.h"
 
+#include "bus/ata/idehd.h"
+
+
 /*************************************
  *
  *  Definitions
diff --git a/src/mame/drivers/twinkle.cpp b/src/mame/drivers/twinkle.cpp
index de2f40da541..fa94f8c9884 100644
--- a/src/mame/drivers/twinkle.cpp
+++ b/src/mame/drivers/twinkle.cpp
@@ -238,11 +238,11 @@ Notes:
 #include "cpu/psx/psx.h"
 #include "cpu/m68000/m68000.h"
 #include "video/psx.h"
+#include "bus/ata/ataintf.h"
 #include "bus/scsi/scsi.h"
 #include "bus/scsi/scsicd.h"
 #include "bus/rs232/xvd701.h"
 #include "machine/am53cf96.h"
-#include "machine/ataintf.h"
 #include "machine/fdc37c665gt.h"
 #include "machine/i2cmem.h"
 #include "machine/ram.h"
diff --git a/src/mame/drivers/vegas.cpp b/src/mame/drivers/vegas.cpp
index 59e1e0490ee..86ed8e0c689 100644
--- a/src/mame/drivers/vegas.cpp
+++ b/src/mame/drivers/vegas.cpp
@@ -278,10 +278,12 @@
 #include "emu.h"
 #include "audio/dcs.h"
 
+#include "bus/ata/idehd.h"
+#include "bus/rs232/rs232.h"
 #include "cpu/adsp2100/adsp2100.h"
 #include "cpu/mips/mips3.h"
 #include "machine/idectrl.h"
-#include "machine/idehd.h"
+#include "machine/ins8250.h"
 #include "machine/midwayic.h"
 #include "machine/smc91c9x.h"
 #include "machine/timekpr.h"
@@ -290,8 +292,6 @@
 #include "machine/pci-ide.h"
 #include "video/voodoo_pci.h"
 #include "screen.h"
-#include "machine/ins8250.h"
-#include "bus/rs232/rs232.h"
 
 #include "sf2049.lh"
 
diff --git a/src/mame/drivers/viper.cpp b/src/mame/drivers/viper.cpp
index df4f2584911..11a025f1a67 100644
--- a/src/mame/drivers/viper.cpp
+++ b/src/mame/drivers/viper.cpp
@@ -350,8 +350,8 @@ some other components. It will be documented at a later date.
 
 #include "emu.h"
 #include "cpu/powerpc/ppc.h"
-#include "machine/ataintf.h"
-#include "machine/idehd.h"
+#include "bus/ata/ataintf.h"
+#include "bus/ata/idehd.h"
 #include "machine/lpci.h"
 #include "machine/timekpr.h"
 #include "machine/timer.h"
diff --git a/src/mame/drivers/vp101.cpp b/src/mame/drivers/vp101.cpp
index 32c99a0b6de..1ff18eb91e0 100644
--- a/src/mame/drivers/vp101.cpp
+++ b/src/mame/drivers/vp101.cpp
@@ -101,7 +101,7 @@ Small outline design for easy kit retrofitting of existing cabinets.
 
 #include "emu.h"
 #include "cpu/mips/mips3.h"
-#include "machine/ataintf.h"
+#include "bus/ata/ataintf.h"
 #include "machine/nvram.h"
 #include "imagedev/harddriv.h"
 #include "screen.h"
diff --git a/src/mame/drivers/xbox.cpp b/src/mame/drivers/xbox.cpp
index fdf19f44170..dd56b5029d8 100644
--- a/src/mame/drivers/xbox.cpp
+++ b/src/mame/drivers/xbox.cpp
@@ -14,8 +14,8 @@
 #include "includes/xbox.h"
 
 #include "cpu/i386/i386.h"
-#include "machine/atapicdr.h"
-#include "machine/idehd.h"
+#include "bus/ata/atapicdr.h"
+#include "bus/ata/idehd.h"
 
 #include "debug/debugcmd.h"
 #include "debug/debugcon.h"
diff --git a/src/mame/drivers/zn.cpp b/src/mame/drivers/zn.cpp
index 7690b88651c..e13afe82cac 100644
--- a/src/mame/drivers/zn.cpp
+++ b/src/mame/drivers/zn.cpp
@@ -15,13 +15,14 @@
 #include "audio/taito_zm.h"
 #include "audio/taitosnd.h"
 
+#include "bus/ata/atadev.h"
+#include "bus/ata/ataintf.h"
 #include "cpu/m68000/m68000.h"
 #include "cpu/mcs51/mcs51.h"
 #include "cpu/psx/psx.h"
 #include "cpu/z80/z80.h"
 #include "machine/7200fifo.h"
 #include "machine/at28c16.h"
-#include "machine/ataintf.h"
 #include "machine/bankdev.h"
 #include "machine/cat702.h"
 #include "machine/gen_latch.h"
diff --git a/src/mame/includes/dccons.h b/src/mame/includes/dccons.h
index 649e5334708..557cc267057 100644
--- a/src/mame/includes/dccons.h
+++ b/src/mame/includes/dccons.h
@@ -7,9 +7,9 @@
 
 #include "dc.h"
 
+#include "bus/ata/ataintf.h"
 #include "imagedev/chd_cd.h"
 #include "machine/gdrom.h"
-#include "machine/ataintf.h"
 #include "machine/intelfsh.h"
 
 class dc_cons_state : public dc_state
diff --git a/src/mame/includes/djmain.h b/src/mame/includes/djmain.h
index 77b4102384f..0c5c35abf5d 100644
--- a/src/mame/includes/djmain.h
+++ b/src/mame/includes/djmain.h
@@ -5,7 +5,7 @@
 
 #pragma once
 
-#include "machine/ataintf.h"
+#include "bus/ata/ataintf.h"
 #include "video/konami_helper.h"
 #include "video/k054156_k054157_k056832.h"
 #include "video/k055555.h"
diff --git a/src/mame/includes/midvunit.h b/src/mame/includes/midvunit.h
index f534941ec25..c82d57677af 100644
--- a/src/mame/includes/midvunit.h
+++ b/src/mame/includes/midvunit.h
@@ -7,8 +7,8 @@
 **************************************************************************/
 
 #include "audio/dcs.h"
+#include "bus/ata/ataintf.h"
 #include "machine/adc0844.h"
-#include "machine/ataintf.h"
 #include "machine/midwayic.h"
 #include "machine/timer.h"
 #include "machine/watchdog.h"
diff --git a/src/mame/includes/pc9801.h b/src/mame/includes/pc9801.h
index dfe2961f3a1..042187cdc46 100644
--- a/src/mame/includes/pc9801.h
+++ b/src/mame/includes/pc9801.h
@@ -44,8 +44,8 @@
 #include "machine/pc9801_kbd.h"
 #include "machine/pc9801_cd.h"
 
-#include "machine/idectrl.h"
-#include "machine/idehd.h"
+#include "bus/ata/atadev.h"
+#include "bus/ata/ataintf.h"
 
 #include "debugger.h"
 #include "emupal.h"
diff --git a/src/mame/includes/qdrmfgp.h b/src/mame/includes/qdrmfgp.h
index e8edc94c0c7..59e5f7e4a74 100644
--- a/src/mame/includes/qdrmfgp.h
+++ b/src/mame/includes/qdrmfgp.h
@@ -5,7 +5,7 @@
 
 #pragma once
 
-#include "machine/ataintf.h"
+#include "bus/ata/ataintf.h"
 #include "machine/timer.h"
 #include "sound/k054539.h"
 #include "machine/k053252.h"
diff --git a/src/mame/includes/turrett.h b/src/mame/includes/turrett.h
index 10eddae2758..4056d560f19 100644
--- a/src/mame/includes/turrett.h
+++ b/src/mame/includes/turrett.h
@@ -11,8 +11,7 @@
 #pragma once
 
 #include "cpu/mips/mips1.h"
-#include "machine/ataintf.h"
-#include "machine/idehd.h"
+#include "bus/ata/ataintf.h"
 #include "emupal.h"
 #include "speaker.h"
 #include "screen.h"
diff --git a/src/mame/machine/bebox.cpp b/src/mame/machine/bebox.cpp
index 6c0cec83571..96379ce3b5b 100644
--- a/src/mame/machine/bebox.cpp
+++ b/src/mame/machine/bebox.cpp
@@ -98,7 +98,7 @@
 #include "bus/lpci/cirrus.h"
 #include "cpu/powerpc/ppc.h"
 #include "machine/mc146818.h"
-#include "machine/ataintf.h"
+#include "bus/ata/ataintf.h"
 #include "bus/lpci/pci.h"
 
 #define LOG_CPUIMASK    1
diff --git a/src/mame/machine/gdrom.h b/src/mame/machine/gdrom.h
index eae39ce0541..8fc87e95d2d 100644
--- a/src/mame/machine/gdrom.h
+++ b/src/mame/machine/gdrom.h
@@ -11,7 +11,7 @@
 
 #pragma once
 
-#include "machine/atapicdr.h"
+#include "bus/ata/atapicdr.h"
 
 class gdrom_device : public atapi_cdrom_device
 {
diff --git a/src/mame/machine/pc9801_cd.h b/src/mame/machine/pc9801_cd.h
index 9abee3a8092..69f7e00241f 100644
--- a/src/mame/machine/pc9801_cd.h
+++ b/src/mame/machine/pc9801_cd.h
@@ -4,7 +4,7 @@
 #ifndef MAME_MACHINE_PC9801_CD_H
 #define MAME_MACHINE_PC9801_CD_H
 
-#include "machine/atapicdr.h"
+#include "bus/ata/atapicdr.h"
 
 class pc9801_cd_device : public atapi_cdrom_device
 {