diff --git a/.gitattributes b/.gitattributes
index 28fb6615f63..9ba0d089f0a 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -641,9 +641,9 @@ src/emu/devcb.h svneol=native#text/plain
 src/emu/devconv.h svneol=native#text/plain
 src/emu/devcpu.c svneol=native#text/plain
 src/emu/devcpu.h svneol=native#text/plain
+src/emu/device.c svneol=native#text/plain
+src/emu/device.h svneol=native#text/plain
 src/emu/devimage.c svneol=native#text/plain
-src/emu/devintrf.c svneol=native#text/plain
-src/emu/devintrf.h svneol=native#text/plain
 src/emu/devlegcy.c svneol=native#text/plain
 src/emu/devlegcy.h svneol=native#text/plain
 src/emu/devtempl.h svneol=native#text/plain
diff --git a/src/emu/devintrf.c b/src/emu/device.c
similarity index 100%
rename from src/emu/devintrf.c
rename to src/emu/device.c
diff --git a/src/emu/devintrf.h b/src/emu/device.h
similarity index 100%
rename from src/emu/devintrf.h
rename to src/emu/device.h
diff --git a/src/emu/emu.h b/src/emu/emu.h
index c599ceb389f..7870270465a 100644
--- a/src/emu/emu.h
+++ b/src/emu/emu.h
@@ -86,7 +86,7 @@ typedef device_t * (*machine_config_constructor)(machine_config &config, device_
 #include "output.h"
 
 // devices and callbacks
-#include "devintrf.h"
+#include "device.h"
 #include "distate.h"
 #include "dimemory.h"
 #include "diexec.h"
diff --git a/src/emu/emu.mak b/src/emu/emu.mak
index b5987d19f6f..12e990c1acf 100644
--- a/src/emu/emu.mak
+++ b/src/emu/emu.mak
@@ -57,9 +57,9 @@ EMUOBJS = \
 	$(EMUOBJ)/delegate.o \
 	$(EMUOBJ)/devcb.o \
 	$(EMUOBJ)/devcpu.o \
+	$(EMUOBJ)/device.o \
 	$(EMUOBJ)/devimage.o \
 	$(EMUOBJ)/devlegcy.o \
-	$(EMUOBJ)/devintrf.o \
 	$(EMUOBJ)/didisasm.o \
 	$(EMUOBJ)/diexec.o \
 	$(EMUOBJ)/diimage.o \
diff --git a/src/emu/sound/mas3507d.h b/src/emu/sound/mas3507d.h
index b7e3bc69221..4f2c12eadb0 100644
--- a/src/emu/sound/mas3507d.h
+++ b/src/emu/sound/mas3507d.h
@@ -3,7 +3,6 @@
 #ifndef __MAS3507D_H__
 #define __MAS3507D_H__
 
-#include "devintrf.h"
 
 //**************************************************************************
 //  INTERFACE CONFIGURATION MACROS