diff --git a/scripts/src/bus.lua b/scripts/src/bus.lua
index e1bf27c50b9..20b368b0772 100644
--- a/scripts/src/bus.lua
+++ b/scripts/src/bus.lua
@@ -2140,6 +2140,24 @@ if (BUSES["A2GAMEIO"]~=null) then
 	}
 end
 
+---------------------------------------------------
+--
+--@src/devices/bus/nscsi/cd.h,BUSES["NSCSI"] = true
+--@src/devices/bus/nscsi/hd.h,BUSES["NSCSI"] = true
+--@src/devices/bus/nscsi/s1410.h,BUSES["NSCSI"] = true
+---------------------------------------------------
+
+if (BUSES["NSCSI"]~=null) then
+	files {
+		MAME_DIR .. "src/devices/bus/nscsi/cd.cpp",
+		MAME_DIR .. "src/devices/bus/nscsi/cd.h",
+		MAME_DIR .. "src/devices/bus/nscsi/hd.cpp",
+		MAME_DIR .. "src/devices/bus/nscsi/hd.h",
+		MAME_DIR .. "src/devices/bus/nscsi/s1410.cpp",
+		MAME_DIR .. "src/devices/bus/nscsi/s1410.h",
+	}
+end
+
 ---------------------------------------------------
 --
 --@src/devices/bus/nubus/nubus.h,BUSES["NUBUS"] = true
diff --git a/scripts/src/machine.lua b/scripts/src/machine.lua
index 09192e522bc..39435e18798 100644
--- a/scripts/src/machine.lua
+++ b/scripts/src/machine.lua
@@ -2224,9 +2224,6 @@ end
 --
 --@src/devices/machine/nscsi_bus.h,MACHINES["NSCSI"] = true
 --@src/devices/machine/nscsi_cb.h,MACHINES["NSCSI"] = true
---@src/devices/machine/nscsi_cd.h,MACHINES["NSCSI"] = true
---@src/devices/machine/nscsi_hd.h,MACHINES["NSCSI"] = true
---@src/devices/machine/nscsi_s1410.h,MACHINES["NSCSI"] = true
 ---------------------------------------------------
 
 if (MACHINES["NSCSI"]~=null) then
@@ -2235,12 +2232,6 @@ if (MACHINES["NSCSI"]~=null) then
 		MAME_DIR .. "src/devices/machine/nscsi_bus.h",
 		MAME_DIR .. "src/devices/machine/nscsi_cb.cpp",
 		MAME_DIR .. "src/devices/machine/nscsi_cb.h",
-		MAME_DIR .. "src/devices/machine/nscsi_cd.cpp",
-		MAME_DIR .. "src/devices/machine/nscsi_cd.h",
-		MAME_DIR .. "src/devices/machine/nscsi_hd.cpp",
-		MAME_DIR .. "src/devices/machine/nscsi_hd.h",
-		MAME_DIR .. "src/devices/machine/nscsi_s1410.cpp",
-		MAME_DIR .. "src/devices/machine/nscsi_s1410.h",
 	}
 end
 
diff --git a/scripts/target/mame/arcade.lua b/scripts/target/mame/arcade.lua
index 70176340ecd..4430d442e01 100644
--- a/scripts/target/mame/arcade.lua
+++ b/scripts/target/mame/arcade.lua
@@ -732,6 +732,7 @@ BUSES["MIDI"] = true
 BUSES["NEOGEO"] = true
 BUSES["NEOGEO_CTRL"] = true
 --BUSES["NES"] = true
+BUSES["NSCSI"] = true
 --BUSES["NUBUS"] = true
 --BUSES["O2"] = true
 --BUSES["ORICEXT"] = true
diff --git a/scripts/target/mame/mess.lua b/scripts/target/mame/mess.lua
index 52ebdba7c27..6ef5035ea2a 100644
--- a/scripts/target/mame/mess.lua
+++ b/scripts/target/mame/mess.lua
@@ -808,6 +808,7 @@ BUSES["NEOGEO_CTRL"] = true
 BUSES["NES"] = true
 BUSES["NES_CTRL"] = true
 BUSES["NEWBRAIN"] = true
+BUSES["NSCSI"] = true
 BUSES["NUBUS"] = true
 BUSES["O2"] = true
 BUSES["ORICEXT"] = true
diff --git a/src/devices/bus/a2bus/a2hsscsi.cpp b/src/devices/bus/a2bus/a2hsscsi.cpp
index 83455dc913a..c9bc0210175 100644
--- a/src/devices/bus/a2bus/a2hsscsi.cpp
+++ b/src/devices/bus/a2bus/a2hsscsi.cpp
@@ -40,8 +40,8 @@
 
 #include "emu.h"
 #include "a2hsscsi.h"
-#include "machine/nscsi_cd.h"
-#include "machine/nscsi_hd.h"
+#include "bus/nscsi/cd.h"
+#include "bus/nscsi/hd.h"
 
 /***************************************************************************
     PARAMETERS
diff --git a/src/devices/bus/a2bus/a2scsi.cpp b/src/devices/bus/a2bus/a2scsi.cpp
index 87e7c86dddc..3d4c7ac6cb6 100644
--- a/src/devices/bus/a2bus/a2scsi.cpp
+++ b/src/devices/bus/a2bus/a2scsi.cpp
@@ -33,8 +33,8 @@
 
 #include "emu.h"
 #include "a2scsi.h"
-#include "machine/nscsi_cd.h"
-#include "machine/nscsi_hd.h"
+#include "bus/nscsi/cd.h"
+#include "bus/nscsi/hd.h"
 
 /***************************************************************************
     PARAMETERS
diff --git a/src/devices/bus/amiga/zorro/a590.cpp b/src/devices/bus/amiga/zorro/a590.cpp
index 045a0eab7c8..f9dc313fcb2 100644
--- a/src/devices/bus/amiga/zorro/a590.cpp
+++ b/src/devices/bus/amiga/zorro/a590.cpp
@@ -11,8 +11,8 @@
 #include "emu.h"
 #include "a590.h"
 #include "machine/nscsi_bus.h"
-#include "machine/nscsi_cd.h"
-#include "machine/nscsi_hd.h"
+#include "bus/nscsi/cd.h"
+#include "bus/nscsi/hd.h"
 
 
 //**************************************************************************
diff --git a/src/devices/bus/hp_dio/hp98265a.cpp b/src/devices/bus/hp_dio/hp98265a.cpp
index c5c28eeda6b..5c0194b48a4 100644
--- a/src/devices/bus/hp_dio/hp98265a.cpp
+++ b/src/devices/bus/hp_dio/hp98265a.cpp
@@ -10,8 +10,8 @@
 #include "hp98265a.h"
 
 #include "machine/nscsi_bus.h"
-#include "machine/nscsi_cd.h"
-#include "machine/nscsi_hd.h"
+#include "bus/nscsi/cd.h"
+#include "bus/nscsi/hd.h"
 #include "machine/mb87030.h"
 
 #define VERBOSE 0
diff --git a/src/devices/bus/isa/aha1542b.cpp b/src/devices/bus/isa/aha1542b.cpp
index dd4a011f82f..53cd4a8cb64 100644
--- a/src/devices/bus/isa/aha1542b.cpp
+++ b/src/devices/bus/isa/aha1542b.cpp
@@ -12,10 +12,10 @@
 #include "emu.h"
 #include "aha1542b.h"
 
+#include "bus/nscsi/hd.h"
 #include "cpu/i8085/i8085.h"
 #include "machine/gen_latch.h"
 #include "machine/nscsi_bus.h"
-#include "machine/nscsi_hd.h"
 
 
 DEFINE_DEVICE_TYPE(AHA1542A, aha1542a_device, "aha1542a", "AHA-1542A SCSI Controller")
diff --git a/src/devices/bus/isa/aha174x.cpp b/src/devices/bus/isa/aha174x.cpp
index f650e9efdf8..39fd0aef9fe 100644
--- a/src/devices/bus/isa/aha174x.cpp
+++ b/src/devices/bus/isa/aha174x.cpp
@@ -33,10 +33,10 @@
 #include "emu.h"
 #include "aha174x.h"
 
+#include "bus/nscsi/hd.h"
 #include "machine/aic6250.h"
 #include "machine/i82355.h"
 #include "machine/nscsi_bus.h"
-#include "machine/nscsi_hd.h"
 
 DEFINE_DEVICE_TYPE(AHA1740, aha1740_device, "aha1740", "AHA-1740 Fast SCSI Host Adapter")
 DEFINE_DEVICE_TYPE(AHA1742A, aha1742a_device, "aha1742a", "AHA-1742A Fast SCSI Host Adapter")
diff --git a/src/devices/bus/isa/asc88.cpp b/src/devices/bus/isa/asc88.cpp
index 00db6f498d5..43dc83987aa 100644
--- a/src/devices/bus/isa/asc88.cpp
+++ b/src/devices/bus/isa/asc88.cpp
@@ -16,8 +16,8 @@
 #include "emu.h"
 #include "asc88.h"
 
+#include "bus/nscsi/hd.h"
 #include "machine/nscsi_bus.h"
-#include "machine/nscsi_hd.h"
 
 
 DEFINE_DEVICE_TYPE(ASC88, asc88_device, "asc88", "ASC-88 SCSI Adapter")
diff --git a/src/devices/bus/isa/bt54x.cpp b/src/devices/bus/isa/bt54x.cpp
index d8ef31a848f..fe6516b8a84 100644
--- a/src/devices/bus/isa/bt54x.cpp
+++ b/src/devices/bus/isa/bt54x.cpp
@@ -17,10 +17,10 @@
 #include "emu.h"
 #include "bt54x.h"
 
+#include "bus/nscsi/cd.h"
+#include "bus/nscsi/hd.h"
 #include "machine/ncr5390.h"
 //#include "machine/ncr86c05.h"
-#include "machine/nscsi_cd.h"
-#include "machine/nscsi_hd.h"
 
 DEFINE_DEVICE_TYPE(BT542B, bt542b_device, "bt542b", "BusTek BT-542B SCSI Host Adapter") // Rev. G or earlier
 DEFINE_DEVICE_TYPE(BT542BH, bt542bh_device, "bt542bh", "BusLogic BT-542B SCSI Host Adapter (Rev. H)")
diff --git a/src/devices/bus/isa/tekram_dc820.cpp b/src/devices/bus/isa/tekram_dc820.cpp
index ab2375856ce..f9747c3385d 100644
--- a/src/devices/bus/isa/tekram_dc820.cpp
+++ b/src/devices/bus/isa/tekram_dc820.cpp
@@ -23,11 +23,11 @@
 #include "emu.h"
 #include "tekram_dc820.h"
 
+#include "bus/nscsi/hd.h"
 #include "cpu/i86/i186.h"
 #include "machine/i82355.h"
 #include "machine/ncr5390.h"
 #include "machine/nscsi_bus.h"
-#include "machine/nscsi_hd.h"
 
 DEFINE_DEVICE_TYPE(TEKRAM_DC320B, tekram_dc320b_device, "dc320b", "Tekram DC-320B SCSI Controller")
 DEFINE_DEVICE_TYPE(TEKRAM_DC320E, tekram_dc320e_device, "dc320e", "Tekram DC-320E SCSI Controller")
diff --git a/src/devices/bus/isa/ultra14f.cpp b/src/devices/bus/isa/ultra14f.cpp
index 3ae8cb79811..e3cc88fd969 100644
--- a/src/devices/bus/isa/ultra14f.cpp
+++ b/src/devices/bus/isa/ultra14f.cpp
@@ -9,10 +9,10 @@
 #include "emu.h"
 #include "ultra14f.h"
 
+#include "bus/nscsi/hd.h"
 #include "cpu/m68000/m68000.h"
 #include "machine/ncr5390.h"
 #include "machine/nscsi_bus.h"
-#include "machine/nscsi_hd.h"
 
 DEFINE_DEVICE_TYPE(ULTRA14F, ultra14f_device, "ultra14f", "Ultra-14F SCSI Host Adapter")
 
diff --git a/src/devices/bus/isa/ultra24f.cpp b/src/devices/bus/isa/ultra24f.cpp
index 46341bed4c2..cdb8f0c7501 100644
--- a/src/devices/bus/isa/ultra24f.cpp
+++ b/src/devices/bus/isa/ultra24f.cpp
@@ -9,10 +9,10 @@
 #include "emu.h"
 #include "ultra24f.h"
 
+#include "bus/nscsi/hd.h"
 #include "cpu/m68000/m68000.h"
 #include "machine/ncr5390.h"
 #include "machine/nscsi_bus.h"
-#include "machine/nscsi_hd.h"
 
 DEFINE_DEVICE_TYPE(ULTRA24F, ultra24f_device, "ultra24f", "Ultra-24F SCSI Host Adapter")
 
diff --git a/src/devices/machine/nscsi_cd.cpp b/src/devices/bus/nscsi/cd.cpp
similarity index 99%
rename from src/devices/machine/nscsi_cd.cpp
rename to src/devices/bus/nscsi/cd.cpp
index ebfa49f1cae..19b32cc785a 100644
--- a/src/devices/machine/nscsi_cd.cpp
+++ b/src/devices/bus/nscsi/cd.cpp
@@ -1,7 +1,7 @@
 // license:BSD-3-Clause
 // copyright-holders:Olivier Galibert
 #include "emu.h"
-#include "machine/nscsi_cd.h"
+#include "bus/nscsi/cd.h"
 
 #define VERBOSE 0
 #include "logmacro.h"
diff --git a/src/devices/machine/nscsi_cd.h b/src/devices/bus/nscsi/cd.h
similarity index 97%
rename from src/devices/machine/nscsi_cd.h
rename to src/devices/bus/nscsi/cd.h
index 9f10e52023a..1a87e150b13 100644
--- a/src/devices/machine/nscsi_cd.h
+++ b/src/devices/bus/nscsi/cd.h
@@ -1,7 +1,7 @@
 // license:BSD-3-Clause
 // copyright-holders:Olivier Galibert
-#ifndef MAME_MACHINE_NSCSI_CD_H
-#define MAME_MACHINE_NSCSI_CD_H
+#ifndef MAME_BUS_NSCSI_CD_H
+#define MAME_BUS_NSCSI_CD_H
 
 #pragma once
 
@@ -123,4 +123,4 @@ DECLARE_DEVICE_TYPE(NSCSI_XM5701, nscsi_toshiba_xm5701_device)
 DECLARE_DEVICE_TYPE(NSCSI_XM5701SUN, nscsi_toshiba_xm5701_sun_device)
 DECLARE_DEVICE_TYPE(NSCSI_CDROM_APPLE, nscsi_cdrom_apple_device)
 
-#endif // MAME_MACHINE_NSCSI_CD_H
+#endif // MAME_BUS_NSCSI_CD_H
diff --git a/src/devices/machine/nscsi_hd.cpp b/src/devices/bus/nscsi/hd.cpp
similarity index 99%
rename from src/devices/machine/nscsi_hd.cpp
rename to src/devices/bus/nscsi/hd.cpp
index 5d320a75158..f2639673a92 100644
--- a/src/devices/machine/nscsi_hd.cpp
+++ b/src/devices/bus/nscsi/hd.cpp
@@ -1,7 +1,7 @@
 // license:BSD-3-Clause
 // copyright-holders:Olivier Galibert
 #include "emu.h"
-#include "machine/nscsi_hd.h"
+#include "bus/nscsi/hd.h"
 #include "imagedev/harddriv.h"
 
 #define LOG_GENERAL (1U << 0)
diff --git a/src/devices/machine/nscsi_hd.h b/src/devices/bus/nscsi/hd.h
similarity index 91%
rename from src/devices/machine/nscsi_hd.h
rename to src/devices/bus/nscsi/hd.h
index 5ddbf3e8519..7ee1f851d26 100644
--- a/src/devices/machine/nscsi_hd.h
+++ b/src/devices/bus/nscsi/hd.h
@@ -1,7 +1,7 @@
 // license:BSD-3-Clause
 // copyright-holders:Olivier Galibert
-#ifndef MAME_MACHINE_NSCSI_HD_H
-#define MAME_MACHINE_NSCSI_HD_H
+#ifndef MAME_BUS_NSCSI_HD_H
+#define MAME_BUS_NSCSI_HD_H
 
 #pragma once
 
@@ -35,4 +35,4 @@ protected:
 
 DECLARE_DEVICE_TYPE(NSCSI_HARDDISK, nscsi_harddisk_device)
 
-#endif // MAME_MACHINE_NSCSI_HD_H
+#endif // MAME_BUS_NSCSI_HD_H
diff --git a/src/devices/machine/nscsi_s1410.cpp b/src/devices/bus/nscsi/s1410.cpp
similarity index 98%
rename from src/devices/machine/nscsi_s1410.cpp
rename to src/devices/bus/nscsi/s1410.cpp
index 7b39b28a76c..5ecf65ef693 100644
--- a/src/devices/machine/nscsi_s1410.cpp
+++ b/src/devices/bus/nscsi/s1410.cpp
@@ -1,7 +1,7 @@
 // license:BSD-3-Clause
 // copyright-holders:Olivier Galibert
 #include "emu.h"
-#include "machine/nscsi_s1410.h"
+#include "bus/nscsi/s1410.h"
 
 DEFINE_DEVICE_TYPE(NSCSI_S1410, nscsi_s1410_device, "scsi_s1410", "S1410 Hard Disk")
 
diff --git a/src/devices/machine/nscsi_s1410.h b/src/devices/bus/nscsi/s1410.h
similarity index 96%
rename from src/devices/machine/nscsi_s1410.h
rename to src/devices/bus/nscsi/s1410.h
index a6234d4c027..bd44a53c830 100644
--- a/src/devices/machine/nscsi_s1410.h
+++ b/src/devices/bus/nscsi/s1410.h
@@ -6,7 +6,7 @@
 #pragma once
 
 #include "machine/nscsi_bus.h"
-#include "machine/nscsi_hd.h"
+#include "bus/nscsi/hd.h"
 
 class nscsi_s1410_device : public nscsi_harddisk_device
 {
@@ -75,4 +75,4 @@ protected:
 
 DECLARE_DEVICE_TYPE(NSCSI_S1410, nscsi_s1410_device)
 
-#endif // MAME_MACHINE_NSCSI_S1410_H
+#endif // MAME_BUS_NSCSI_S1410_H
diff --git a/src/mame/drivers/4dpi.cpp b/src/mame/drivers/4dpi.cpp
index 4fb914dcf21..95643af993b 100644
--- a/src/mame/drivers/4dpi.cpp
+++ b/src/mame/drivers/4dpi.cpp
@@ -55,8 +55,8 @@
 
 // buses and connectors
 #include "machine/nscsi_bus.h"
-#include "machine/nscsi_hd.h"
-#include "machine/nscsi_cd.h"
+#include "bus/nscsi/hd.h"
+#include "bus/nscsi/cd.h"
 #include "bus/rs232/rs232.h"
 #include "bus/sgikbd/sgikbd.h"
 #include "bus/rs232/hlemouse.h"
diff --git a/src/mame/drivers/ampro.cpp b/src/mame/drivers/ampro.cpp
index 2d11883ec3c..409583fff33 100644
--- a/src/mame/drivers/ampro.cpp
+++ b/src/mame/drivers/ampro.cpp
@@ -23,8 +23,8 @@ of a hard drive of up to 88MB.
 #include "cpu/z80/z80.h"
 #include "imagedev/floppy.h"
 #include "machine/ncr5380n.h"
-#include "machine/nscsi_cd.h"
-#include "machine/nscsi_hd.h"
+#include "bus/nscsi/cd.h"
+#include "bus/nscsi/hd.h"
 #include "machine/output_latch.h"
 #include "machine/z80daisy.h"
 #include "machine/z80ctc.h"
diff --git a/src/mame/drivers/cps3.cpp b/src/mame/drivers/cps3.cpp
index ad6db84fde7..5986ad19a8a 100644
--- a/src/mame/drivers/cps3.cpp
+++ b/src/mame/drivers/cps3.cpp
@@ -464,7 +464,7 @@ hardware modification to the security cart.....
 #include "machine/intelfsh.h"
 #include "machine/nvram.h"
 #include "includes/cps3.h"
-#include "machine/nscsi_cd.h"
+#include "bus/nscsi/cd.h"
 #include "machine/wd33c9x.h"
 #include "screen.h"
 #include "speaker.h"
diff --git a/src/mame/drivers/decstation.cpp b/src/mame/drivers/decstation.cpp
index 04623dfa6a4..17ffb7eac0d 100644
--- a/src/mame/drivers/decstation.cpp
+++ b/src/mame/drivers/decstation.cpp
@@ -65,8 +65,8 @@
 #include "machine/z80scc.h"
 #include "machine/ncr5390.h"
 #include "machine/nscsi_bus.h"
-#include "machine/nscsi_cd.h"
-#include "machine/nscsi_hd.h"
+#include "bus/nscsi/cd.h"
+#include "bus/nscsi/hd.h"
 #include "machine/dec_lk201.h"
 #include "machine/am79c90.h"
 #include "machine/dc7085.h"
diff --git a/src/mame/drivers/indy_indigo2.cpp b/src/mame/drivers/indy_indigo2.cpp
index ca6b520801f..3faea787328 100644
--- a/src/mame/drivers/indy_indigo2.cpp
+++ b/src/mame/drivers/indy_indigo2.cpp
@@ -64,8 +64,8 @@
 #include "machine/hpc3.h"
 #include "machine/ioc2.h"
 #include "machine/nscsi_bus.h"
-#include "machine/nscsi_cd.h"
-#include "machine/nscsi_hd.h"
+#include "bus/nscsi/cd.h"
+#include "bus/nscsi/hd.h"
 #include "machine/sgi.h"
 #include "machine/vino.h"
 #include "machine/wd33c9x.h"
diff --git a/src/mame/drivers/krz2000.cpp b/src/mame/drivers/krz2000.cpp
index 6e622905596..213f93c0369 100644
--- a/src/mame/drivers/krz2000.cpp
+++ b/src/mame/drivers/krz2000.cpp
@@ -24,8 +24,8 @@
 #include "machine/bankdev.h"
 #include "machine/upd765.h"
 #include "machine/ncr5380n.h"
-#include "machine/nscsi_cd.h"
-#include "machine/nscsi_hd.h"
+#include "bus/nscsi/cd.h"
+#include "bus/nscsi/hd.h"
 #include "video/t6963c.h"
 #include "screen.h"
 #include "emupal.h"
diff --git a/src/mame/drivers/lb186.cpp b/src/mame/drivers/lb186.cpp
index 92ddb98e54e..b2488e4b979 100644
--- a/src/mame/drivers/lb186.cpp
+++ b/src/mame/drivers/lb186.cpp
@@ -5,8 +5,8 @@
 #include "cpu/i86/i186.h"
 #include "machine/wd_fdc.h"
 #include "machine/mc68681.h"
+#include "bus/nscsi/hd.h"
 #include "bus/rs232/rs232.h"
-#include "machine/nscsi_hd.h"
 #include "machine/ncr5380n.h"
 #include "imagedev/floppy.h"
 #include "formats/pc_dsk.h"
diff --git a/src/mame/drivers/next.cpp b/src/mame/drivers/next.cpp
index ace185152d0..013cdd6c270 100644
--- a/src/mame/drivers/next.cpp
+++ b/src/mame/drivers/next.cpp
@@ -28,8 +28,8 @@
 #include "emu.h"
 #include "includes/next.h"
 
-#include "machine/nscsi_cd.h"
-#include "machine/nscsi_hd.h"
+#include "bus/nscsi/cd.h"
+#include "bus/nscsi/hd.h"
 #include "screen.h"
 #include "softlist.h"
 
diff --git a/src/mame/drivers/r9751.cpp b/src/mame/drivers/r9751.cpp
index c7b6d851c9a..0eb7b3a64ba 100644
--- a/src/mame/drivers/r9751.cpp
+++ b/src/mame/drivers/r9751.cpp
@@ -53,8 +53,8 @@
 #include "machine/terminal.h"
 
 #include "machine/nscsi_bus.h"
-#include "machine/nscsi_cd.h"
-#include "machine/nscsi_hd.h"
+#include "bus/nscsi/cd.h"
+#include "bus/nscsi/hd.h"
 
 #include "machine/wd33c9x.h"
 
diff --git a/src/mame/drivers/rastersp.cpp b/src/mame/drivers/rastersp.cpp
index 411c4cdff64..6e4fd1fd0ab 100644
--- a/src/mame/drivers/rastersp.cpp
+++ b/src/mame/drivers/rastersp.cpp
@@ -16,11 +16,11 @@
 ****************************************************************************/
 
 #include "emu.h"
+#include "bus/nscsi/hd.h"
 #include "cpu/i386/i386.h"
 #include "cpu/tms32031/tms32031.h"
 #include "machine/53c7xx.h"
 #include "machine/mc146818.h"
-#include "machine/nscsi_hd.h"
 #include "machine/nvram.h"
 #include "machine/timer.h"
 #include "sound/dac.h"
diff --git a/src/mame/drivers/sun3.cpp b/src/mame/drivers/sun3.cpp
index 78e65bf33da..520df9cbe3d 100644
--- a/src/mame/drivers/sun3.cpp
+++ b/src/mame/drivers/sun3.cpp
@@ -189,8 +189,8 @@ fefc34a - start of mem_size, which queries ECC registers for each memory board
 #include "machine/z80scc.h"
 #include "machine/am79c90.h"
 #include "machine/ncr5380n.h"
-#include "machine/nscsi_cd.h"
-#include "machine/nscsi_hd.h"
+#include "bus/nscsi/cd.h"
+#include "bus/nscsi/hd.h"
 
 #include "bus/rs232/rs232.h"
 #include "bus/sunkbd/sunkbd.h"
diff --git a/src/mame/drivers/sun4.cpp b/src/mame/drivers/sun4.cpp
index 7f13ed74617..5f3e6d9f8cd 100644
--- a/src/mame/drivers/sun4.cpp
+++ b/src/mame/drivers/sun4.cpp
@@ -411,6 +411,8 @@
 
 #include "emu.h"
 
+#include "bus/nscsi/cd.h"
+#include "bus/nscsi/hd.h"
 #include "bus/rs232/rs232.h"
 #include "bus/sunkbd/sunkbd.h"
 #include "bus/sunmouse/sunmouse.h"
@@ -422,8 +424,6 @@
 #include "machine/bankdev.h"
 #include "machine/ncr5390.h"
 #include "machine/nscsi_bus.h"
-#include "machine/nscsi_cd.h"
-#include "machine/nscsi_hd.h"
 #include "machine/nvram.h"
 #include "machine/ram.h"
 #include "machine/sun4c_mmu.h"
diff --git a/src/mame/drivers/tti.cpp b/src/mame/drivers/tti.cpp
index 16e3f606c26..16b1f5b8815 100644
--- a/src/mame/drivers/tti.cpp
+++ b/src/mame/drivers/tti.cpp
@@ -16,14 +16,14 @@ Other: LED, 20MHz crystal. Next to the MC68901P is another chip just as large (4
 ************************************************************************************************************************************/
 
 #include "emu.h"
+#include "bus/nscsi/cd.h"
+#include "bus/nscsi/hd.h"
 #include "bus/rs232/rs232.h"
 #include "cpu/m68000/m68000.h"
 #include "machine/74259.h"
 #include "machine/eepromser.h"
 #include "machine/mc68901.h"
 #include "machine/ncr5390.h"
-#include "machine/nscsi_cd.h"
-#include "machine/nscsi_hd.h"
 
 class tti_state : public driver_device
 {
diff --git a/src/mame/includes/interpro.h b/src/mame/includes/interpro.h
index ad28c68a546..32db12daba8 100644
--- a/src/mame/includes/interpro.h
+++ b/src/mame/includes/interpro.h
@@ -24,8 +24,8 @@
 
 #include "machine/ncr5390.h"
 #include "machine/nscsi_bus.h"
-#include "machine/nscsi_cd.h"
-#include "machine/nscsi_hd.h"
+#include "bus/nscsi/cd.h"
+#include "bus/nscsi/hd.h"
 
 #include "bus/rs232/rs232.h"
 
diff --git a/src/mame/includes/jazz.h b/src/mame/includes/jazz.h
index 8bcf2e7cbbb..e4f1d75f847 100644
--- a/src/mame/includes/jazz.h
+++ b/src/mame/includes/jazz.h
@@ -34,8 +34,8 @@
 
 // busses and connectors
 #include "machine/nscsi_bus.h"
-#include "machine/nscsi_cd.h"
-#include "machine/nscsi_hd.h"
+#include "bus/nscsi/cd.h"
+#include "bus/nscsi/hd.h"
 #include "bus/rs232/rs232.h"
 #include "bus/pc_kbd/pc_kbdc.h"
 #include "bus/pc_kbd/keyboards.h"
diff --git a/src/mame/includes/mips.h b/src/mame/includes/mips.h
index aff93ac1e94..a4c0c9e0462 100644
--- a/src/mame/includes/mips.h
+++ b/src/mame/includes/mips.h
@@ -29,8 +29,8 @@
 
 // busses and connectors
 #include "machine/nscsi_bus.h"
-#include "machine/nscsi_cd.h"
-#include "machine/nscsi_hd.h"
+#include "bus/nscsi/cd.h"
+#include "bus/nscsi/hd.h"
 
 #include "bus/pc_kbd/pc_kbdc.h"
 #include "bus/pc_kbd/keyboards.h"
diff --git a/src/mame/machine/hpc1.cpp b/src/mame/machine/hpc1.cpp
index a4c32d5d5c1..8ffb6e25a14 100644
--- a/src/mame/machine/hpc1.cpp
+++ b/src/mame/machine/hpc1.cpp
@@ -11,8 +11,8 @@
 #include "bus/rs232/rs232.h"
 #include "bus/rs232/hlemouse.h"
 #include "machine/nscsi_bus.h"
-#include "machine/nscsi_cd.h"
-#include "machine/nscsi_hd.h"
+#include "bus/nscsi/cd.h"
+#include "bus/nscsi/hd.h"
 #include "bus/sgikbd/sgikbd.h"
 #include "machine/hpc1.h"
 #include "speaker.h"