diff --git a/.gitattributes b/.gitattributes
index 1a09220183d..32476409619 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1208,6 +1208,8 @@ src/emu/machine/scsicb.c svneol=native#text/plain
 src/emu/machine/scsicb.h svneol=native#text/plain
 src/emu/machine/scsicd.c svneol=native#text/plain
 src/emu/machine/scsicd.h svneol=native#text/plain
+src/emu/machine/scsidev.c svneol=native#text/plain
+src/emu/machine/scsidev.h svneol=native#text/plain
 src/emu/machine/scsihd.c svneol=native#text/plain
 src/emu/machine/scsihd.h svneol=native#text/plain
 src/emu/machine/scsihle.c svneol=native#text/plain
diff --git a/src/emu/emu.mak b/src/emu/emu.mak
index 06645a74b5c..6683d07db12 100644
--- a/src/emu/emu.mak
+++ b/src/emu/emu.mak
@@ -249,9 +249,10 @@ EMUMACHINEOBJS = \
 	$(EMUMACHINE)/s3c2410.o		\
 	$(EMUMACHINE)/s3c2440.o		\
 	$(EMUMACHINE)/s3520cf.o		\
-	$(EMUMACHINE)/scsicb.o		\
 	$(EMUMACHINE)/scsibus.o		\
+	$(EMUMACHINE)/scsicb.o		\
 	$(EMUMACHINE)/scsicd.o		\
+	$(EMUMACHINE)/scsidev.o		\
 	$(EMUMACHINE)/scsihd.o		\
 	$(EMUMACHINE)/scsihle.o		\
 	$(EMUMACHINE)/secflash.o	\
diff --git a/src/emu/machine/scsidev.c b/src/emu/machine/scsidev.c
new file mode 100644
index 00000000000..409d9f8739d
--- /dev/null
+++ b/src/emu/machine/scsidev.c
@@ -0,0 +1,12 @@
+/***************************************************************************
+
+ scsidev.c - Base class for SCSI devices.
+
+***************************************************************************/
+
+#include "machine/scsidev.h"
+
+scsidev_device::scsidev_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock) :
+	device_t(mconfig, type, name, tag, owner, clock)
+{
+}
diff --git a/src/emu/machine/scsidev.h b/src/emu/machine/scsidev.h
new file mode 100644
index 00000000000..623cdf929a5
--- /dev/null
+++ b/src/emu/machine/scsidev.h
@@ -0,0 +1,20 @@
+/***************************************************************************
+
+ scsidev.h
+
+***************************************************************************/
+
+#ifndef _SCSIDEV_H_
+#define _SCSIDEV_H_
+
+#include "emu.h"
+
+// base handler
+class scsidev_device : public device_t
+{
+public:
+	// construction/destruction
+	scsidev_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+};
+
+#endif
diff --git a/src/emu/machine/scsihle.c b/src/emu/machine/scsihle.c
index db2c1915d1d..2818d3f87ba 100644
--- a/src/emu/machine/scsihle.c
+++ b/src/emu/machine/scsihle.c
@@ -1,6 +1,6 @@
 /***************************************************************************
 
- scsihle.c - Base class for scsi devices.
+ scsihle.c - Base class for HLE'd SCSI devices.
 
 ***************************************************************************/
 
@@ -8,7 +8,7 @@
 #include "machine/scsihle.h"
 
 scsihle_device::scsihle_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock) :
-	device_t(mconfig, type, name, tag, owner, clock)
+	scsidev_device(mconfig, type, name, tag, owner, clock)
 {
 }
 
diff --git a/src/emu/machine/scsihle.h b/src/emu/machine/scsihle.h
index 2df2af1268d..f4f348ed1b1 100644
--- a/src/emu/machine/scsihle.h
+++ b/src/emu/machine/scsihle.h
@@ -4,11 +4,13 @@
 
 ***************************************************************************/
 
-#ifndef _SCSIDEV_H_
-#define _SCSIDEV_H_
+#ifndef _SCSIHLE_H_
+#define _SCSIHLE_H_
+
+#include "machine/scsidev.h"
 
 // base handler
-class scsihle_device : public device_t
+class scsihle_device : public scsidev_device
 {
 public:
 	// construction/destruction