diff --git a/src/emu/emu.mak b/src/emu/emu.mak
index 0b4c4bf0b7f..66334c50ad5 100644
--- a/src/emu/emu.mak
+++ b/src/emu/emu.mak
@@ -134,6 +134,7 @@ EMUSOUNDOBJS = \
 	$(EMUOBJ)/sound/flt_vol.o \
 	$(EMUOBJ)/sound/flt_rc.o \
 	$(EMUOBJ)/sound/wavwrite.o \
+	$(EMUOBJ)/sound/samples.o	\
 
 EMUDRIVEROBJS = \
 	$(EMUDRIVERS)/empty.o \
@@ -162,7 +163,14 @@ EMUIMAGEDEVOBJS = \
 	$(EMUIMAGEDEV)/snapquik.o   \
 
 
-LIBEMUOBJS = $(EMUOBJS) $(EMUSOUNDOBJS) $(EMUDRIVEROBJS) $(EMUMACHINEOBJS) $(EMUIMAGEDEVOBJS)
+EMUVIDEOOBJS = \
+	$(EMUVIDEO)/generic.o   	\
+	$(EMUVIDEO)/resnet.o    	\
+	$(EMUVIDEO)/rgbutil.o   	\
+	$(EMUVIDEO)/vector.o		\
+
+
+LIBEMUOBJS = $(EMUOBJS) $(EMUSOUNDOBJS) $(EMUDRIVEROBJS) $(EMUMACHINEOBJS) $(EMUIMAGEDEVOBJS) $(EMUVIDEOOBJS)
 
 $(LIBEMU): $(LIBEMUOBJS)
 
diff --git a/src/emu/sound/sound.mak b/src/emu/sound/sound.mak
index e60a5fa9842..f84524381c0 100644
--- a/src/emu/sound/sound.mak
+++ b/src/emu/sound/sound.mak
@@ -13,15 +13,6 @@
 SOUNDSRC = $(EMUSRC)/sound
 SOUNDOBJ = $(EMUOBJ)/sound
 
-
-#-------------------------------------------------
-# Core sound types; samples always required
-#-------------------------------------------------
-
-SOUNDOBJS += $(SOUNDOBJ)/samples.o
-
-
-
 #-------------------------------------------------
 # DACs
 #-------------------------------------------------
diff --git a/src/emu/video/video.mak b/src/emu/video/video.mak
index 3f5e2337dd8..fed2f29d056 100644
--- a/src/emu/video/video.mak
+++ b/src/emu/video/video.mak
@@ -14,15 +14,6 @@ VIDEOSRC = $(EMUSRC)/video
 VIDEOOBJ = $(EMUOBJ)/video
 
 
-#-------------------------------------------------
-# Core video types
-#-------------------------------------------------
-
-VIDEOOBJS+= $(VIDEOOBJ)/generic.o   	\
-			$(VIDEOOBJ)/resnet.o    	\
-			$(VIDEOOBJ)/rgbutil.o   	\
-			$(VIDEOOBJ)/vector.o		\
-
 #-------------------------------------------------
 # 
 #-------------------------------------------------