diff --git a/src/emu/driver.c b/src/emu/driver.c
index 52cfbfa69e7..48f80c17657 100644
--- a/src/emu/driver.c
+++ b/src/emu/driver.c
@@ -782,8 +782,3 @@ WRITE8_MEMBER( driver_device::fatal_generic_write )
 {
 	throw emu_fatalerror("Attempted to write to generic address space (offs %X = %02X)\n", offset, data);
 }
-
-void driver_device::set_led_status(int num, int value)
-{
-	::set_led_status(machine(), num, value);
-}
\ No newline at end of file
diff --git a/src/emu/driver.h b/src/emu/driver.h
index 1738701d900..e3ad1f0dd2d 100644
--- a/src/emu/driver.h
+++ b/src/emu/driver.h
@@ -402,9 +402,6 @@ public:
 	DECLARE_READ8_MEMBER( fatal_generic_read );
 	DECLARE_WRITE8_MEMBER( fatal_generic_write );
 
-	// led status handling	
-	void set_led_status(int num, int value);
-
 protected:
 	// helpers called at startup
 	virtual void driver_start();
diff --git a/src/emu/emu.mak b/src/emu/emu.mak
index 46bed9f163e..c1f4b010d5e 100644
--- a/src/emu/emu.mak
+++ b/src/emu/emu.mak
@@ -138,7 +138,12 @@ EMUSOUNDOBJS = \
 EMUDRIVEROBJS = \
 	$(EMUDRIVERS)/empty.o \
 	$(EMUDRIVERS)/testcpu.o \
-
+	
+EMUMACHINEOBJS = \
+    $(EMUMACHINE)/generic.o     \
+	$(EMUMACHINE)/ram.o     	\
+	$(EMUMACHINE)/nvram.o     	\
+	
 EMUIMAGEDEVOBJS = \
 	$(EMUIMAGEDEV)/bitbngr.o    \
 	$(EMUIMAGEDEV)/cartslot.o   \
@@ -148,13 +153,13 @@ EMUIMAGEDEVOBJS = \
 	$(EMUIMAGEDEV)/floppy.o     \
 	$(EMUIMAGEDEV)/harddriv.o   \
 	$(EMUIMAGEDEV)/midiin.o     \
-	$(EMUIMAGEDEV)/midiout.o     \
+	$(EMUIMAGEDEV)/midiout.o    \
 	$(EMUIMAGEDEV)/printer.o    \
 	$(EMUIMAGEDEV)/serial.o     \
 	$(EMUIMAGEDEV)/snapquik.o   \
 
 
-LIBEMUOBJS = $(EMUOBJS) $(EMUSOUNDOBJS) $(EMUDRIVEROBJS) $(EMUIMAGEDEVOBJS)
+LIBEMUOBJS = $(EMUOBJS) $(EMUSOUNDOBJS) $(EMUDRIVEROBJS) $(EMUMACHINEOBJS) $(EMUIMAGEDEVOBJS)
 
 $(LIBEMU): $(LIBEMUOBJS)
 
diff --git a/src/emu/machine/machine.mak b/src/emu/machine/machine.mak
index f277dd5b934..a0e6282b0e7 100644
--- a/src/emu/machine/machine.mak
+++ b/src/emu/machine/machine.mak
@@ -18,11 +18,6 @@ MACHINEOBJ = $(EMUOBJ)/machine
 # Core machine types
 #-------------------------------------------------
 
-MACHINEOBJS +=  $(MACHINEOBJ)/generic.o   	\
-				$(MACHINEOBJ)/nvram.o       \
-				$(MACHINEOBJ)/ram.o         \
-
-
 MACHINEOBJS +=  $(MACHINEOBJ)/53c7xx.o      \
 				$(MACHINEOBJ)/53c810.o      \
 				$(MACHINEOBJ)/6522via.o     \