diff --git a/.gitattributes b/.gitattributes
index 2ef9ed1bf1e..eead20626ac 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1285,6 +1285,7 @@ src/emu/machine/linflash.c svneol=native#text/plain
 src/emu/machine/linflash.h svneol=native#text/plain
 src/emu/machine/m6m80011ap.c svneol=native#text/plain
 src/emu/machine/m6m80011ap.h svneol=native#text/plain
+src/emu/machine/machine.mak svneol=native#text/plain
 src/emu/machine/matsucd.c svneol=native#text/plain
 src/emu/machine/matsucd.h svneol=native#text/plain
 src/emu/machine/mb14241.c svneol=native#text/plain
@@ -1904,6 +1905,7 @@ src/emu/video/v9938.c svneol=native#text/plain
 src/emu/video/v9938.h svneol=native#text/plain
 src/emu/video/vector.c svneol=native#text/plain
 src/emu/video/vector.h svneol=native#text/plain
+src/emu/video/video.mak svneol=native#text/plain
 src/emu/video/vooddefs.h svneol=native#text/plain
 src/emu/video/voodoo.c svneol=native#text/plain
 src/emu/video/voodoo.h svneol=native#text/plain
diff --git a/makefile b/makefile
index 354c55c4874..e94f085e05e 100644
--- a/makefile
+++ b/makefile
@@ -628,6 +628,8 @@ LIBEMU = $(OBJ)/libemu.a
 LIBCPU = $(OBJ)/$(TARGET)/$(SUBTARGET)/libcpu.a
 LIBDASM = $(OBJ)/$(TARGET)/$(SUBTARGET)/libdasm.a
 LIBSOUND = $(OBJ)/$(TARGET)/$(SUBTARGET)/libsound.a
+LIBVIDEO = $(OBJ)/$(TARGET)/$(SUBTARGET)/libvideo.a
+LIBMACHINE = $(OBJ)/$(TARGET)/$(SUBTARGET)/libmachine.a
 LIBUTIL = $(OBJ)/libutil.a
 LIBOCORE = $(OBJ)/libocore.a
 LIBOSD = $(OBJ)/libosd.a
@@ -812,7 +814,7 @@ $(sort $(OBJDIRS)):
 
 ifndef EXECUTABLE_DEFINED
 
-$(EMULATOR): $(EMUINFOOBJ) $(DRIVLISTOBJ) $(DRVLIBS) $(LIBOSD) $(LIBCPU) $(LIBEMU) $(LIBDASM) $(LIBSOUND) $(LIBUTIL) $(EXPAT) $(SOFTFLOAT) $(JPEG_LIB) $(FLAC_LIB) $(7Z_LIB) $(FORMATS_LIB) $(LUA_LIB) $(ZLIB) $(LIBOCORE) $(MIDI_LIB) $(RESFILE)
+$(EMULATOR): $(EMUINFOOBJ) $(DRIVLISTOBJ) $(DRVLIBS) $(LIBOSD) $(LIBCPU) $(LIBMACHINE) $(LIBEMU) $(LIBDASM) $(LIBSOUND) $(LIBVIDEO) $(LIBUTIL) $(EXPAT) $(SOFTFLOAT) $(JPEG_LIB) $(FLAC_LIB) $(7Z_LIB) $(FORMATS_LIB) $(LUA_LIB) $(ZLIB) $(LIBOCORE) $(MIDI_LIB) $(RESFILE)
 	$(CC) $(CDEFS) $(CFLAGS) -c $(SRC)/version.c -o $(VERSIONOBJ)
 	@echo Linking $@...
 	$(LD) $(LDFLAGS) $(LDFLAGSEMULATOR) $(VERSIONOBJ) $^ $(LIBS) -o $@
diff --git a/src/emu/emu.mak b/src/emu/emu.mak
index 770fabc9e8b..46bed9f163e 100644
--- a/src/emu/emu.mak
+++ b/src/emu/emu.mak
@@ -135,244 +135,10 @@ EMUSOUNDOBJS = \
 	$(EMUOBJ)/sound/flt_rc.o \
 	$(EMUOBJ)/sound/wavwrite.o \
 
-EMUAUDIOOBJS = \
-
 EMUDRIVEROBJS = \
 	$(EMUDRIVERS)/empty.o \
 	$(EMUDRIVERS)/testcpu.o \
 
-EMUMACHINEOBJS = \
-	$(EMUMACHINE)/53c7xx.o      \
-	$(EMUMACHINE)/53c810.o      \
-	$(EMUMACHINE)/6522via.o     \
-	$(EMUMACHINE)/6525tpi.o     \
-	$(EMUMACHINE)/6526cia.o     \
-	$(EMUMACHINE)/6532riot.o    \
-	$(EMUMACHINE)/6821pia.o     \
-	$(EMUMACHINE)/6840ptm.o     \
-	$(EMUMACHINE)/6850acia.o    \
-	$(EMUMACHINE)/68681.o       \
-	$(EMUMACHINE)/7200fifo.o    \
-	$(EMUMACHINE)/74123.o       \
-	$(EMUMACHINE)/74145.o       \
-	$(EMUMACHINE)/74148.o       \
-	$(EMUMACHINE)/74153.o       \
-	$(EMUMACHINE)/74181.o       \
-	$(EMUMACHINE)/7474.o        \
-	$(EMUMACHINE)/8042kbdc.o    \
-	$(EMUMACHINE)/8257dma.o     \
-	$(EMUMACHINE)/aakart.o      \
-	$(EMUMACHINE)/adc0808.o     \
-	$(EMUMACHINE)/adc083x.o     \
-	$(EMUMACHINE)/adc1038.o     \
-	$(EMUMACHINE)/adc1213x.o    \
-	$(EMUMACHINE)/am53cf96.o    \
-	$(EMUMACHINE)/am9517a.o     \
-	$(EMUMACHINE)/amigafdc.o    \
-	$(EMUMACHINE)/at28c16.o     \
-	$(EMUMACHINE)/at29040a.o    \
-	$(EMUMACHINE)/at45dbxx.o    \
-	$(EMUMACHINE)/ataflash.o    \
-	$(EMUMACHINE)/ay31015.o     \
-	$(EMUMACHINE)/bankdev.o     \
-	$(EMUMACHINE)/cdp1852.o     \
-	$(EMUMACHINE)/cdp1871.o     \
-	$(EMUMACHINE)/com8116.o     \
-	$(EMUMACHINE)/cr589.o       \
-	$(EMUMACHINE)/ctronics.o    \
-	$(EMUMACHINE)/ds1302.o      \
-	$(EMUMACHINE)/ds2401.o      \
-	$(EMUMACHINE)/ds2404.o      \
-	$(EMUMACHINE)/ds75160a.o    \
-	$(EMUMACHINE)/ds75161a.o    \
-	$(EMUMACHINE)/e0516.o       \
-	$(EMUMACHINE)/eeprom.o      \
-	$(EMUMACHINE)/er2055.o      \
-	$(EMUMACHINE)/er59256.o     \
-	$(EMUMACHINE)/f3853.o       \
-	$(EMUMACHINE)/fdc_pll.o     \
-	$(EMUMACHINE)/generic.o     \
-	$(EMUMACHINE)/i2cmem.o      \
-	$(EMUMACHINE)/i8155.o       \
-	$(EMUMACHINE)/i8212.o       \
-	$(EMUMACHINE)/i8214.o       \
-	$(EMUMACHINE)/i8243.o       \
-	$(EMUMACHINE)/i8251.o       \
-	$(EMUMACHINE)/i8255.o       \
-	$(EMUMACHINE)/i8279.o       \
-	$(EMUMACHINE)/i8355.o       \
-	$(EMUMACHINE)/idectrl.o     \
-	$(EMUMACHINE)/im6402.o      \
-	$(EMUMACHINE)/ins8154.o     \
-	$(EMUMACHINE)/ins8250.o     \
-	$(EMUMACHINE)/intelfsh.o    \
-	$(EMUMACHINE)/jvsdev.o      \
-	$(EMUMACHINE)/jvshost.o     \
-	$(EMUMACHINE)/k033906.o     \
-	$(EMUMACHINE)/k053252.o     \
-	$(EMUMACHINE)/k056230.o     \
-	$(EMUMACHINE)/laserdsc.o    \
-	$(EMUMACHINE)/latch8.o      \
-	$(EMUMACHINE)/lc89510.o     \
-	$(EMUMACHINE)/ldpr8210.o    \
-	$(EMUMACHINE)/ldstub.o      \
-	$(EMUMACHINE)/ldv1000.o     \
-	$(EMUMACHINE)/ldvp931.o     \
-	$(EMUMACHINE)/linflash.o    \
-	$(EMUMACHINE)/m6m80011ap.o  \
-	$(EMUMACHINE)/matsucd.o     \
-	$(EMUMACHINE)/mb14241.o     \
-	$(EMUMACHINE)/mb3773.o      \
-	$(EMUMACHINE)/mb87078.o     \
-	$(EMUMACHINE)/mb89371.o     \
-	$(EMUMACHINE)/mc146818.o    \
-	$(EMUMACHINE)/mc2661.o      \
-	$(EMUMACHINE)/mc6843.o      \
-	$(EMUMACHINE)/mc6846.o      \
-	$(EMUMACHINE)/mc6852.o      \
-	$(EMUMACHINE)/mc6854.o      \
-	$(EMUMACHINE)/mc68901.o     \
-	$(EMUMACHINE)/mccs1850.o    \
-	$(EMUMACHINE)/mcf5206e.o    \
-	$(EMUMACHINE)/microtch.o    \
-	$(EMUMACHINE)/mm58274c.o    \
-	$(EMUMACHINE)/mm74c922.o    \
-	$(EMUMACHINE)/mos6526.o     \
-	$(EMUMACHINE)/mos6529.o     \
-	$(EMUMACHINE)/mos6530.o     \
-	$(EMUMACHINE)/mos6551.o     \
-	$(EMUMACHINE)/msm5832.o     \
-	$(EMUMACHINE)/msm58321.o    \
-	$(EMUMACHINE)/msm6242.o     \
-	$(EMUMACHINE)/n68681.o      \
-	$(EMUMACHINE)/ncr539x.o     \
-	$(EMUMACHINE)/net_lib.o     \
-	$(EMUMACHINE)/netlist.o     \
-	$(EMUMACHINE)/nmc9306.o     \
-	$(EMUMACHINE)/nscsi_bus.o   \
-	$(EMUMACHINE)/nscsi_cd.o    \
-	$(EMUMACHINE)/nscsi_hd.o    \
-	$(EMUMACHINE)/nvram.o       \
-	$(EMUMACHINE)/pc16552d.o    \
-	$(EMUMACHINE)/pccard.o      \
-	$(EMUMACHINE)/pcf8593.o     \
-	$(EMUMACHINE)/pci.o         \
-	$(EMUMACHINE)/pckeybrd.o    \
-	$(EMUMACHINE)/pd4990a.o     \
-	$(EMUMACHINE)/pic8259.o     \
-	$(EMUMACHINE)/pit8253.o     \
-	$(EMUMACHINE)/pla.o         \
-	$(EMUMACHINE)/ram.o         \
-	$(EMUMACHINE)/rf5c296.o     \
-	$(EMUMACHINE)/roc10937.o    \
-	$(EMUMACHINE)/rp5c01.o      \
-	$(EMUMACHINE)/rp5c15.o      \
-	$(EMUMACHINE)/rp5h01.o      \
-	$(EMUMACHINE)/rtc4543.o     \
-	$(EMUMACHINE)/rtc65271.o    \
-	$(EMUMACHINE)/rtc9701.o     \
-	$(EMUMACHINE)/s3520cf.o     \
-	$(EMUMACHINE)/s3c2400.o     \
-	$(EMUMACHINE)/s3c2410.o     \
-	$(EMUMACHINE)/s3c2440.o     \
-	$(EMUMACHINE)/saturn.o      \
-	$(EMUMACHINE)/scsibus.o     \
-	$(EMUMACHINE)/scsicb.o      \
-	$(EMUMACHINE)/scsicd.o      \
-	$(EMUMACHINE)/scsidev.o     \
-	$(EMUMACHINE)/scsihd.o      \
-	$(EMUMACHINE)/scsihle.o     \
-	$(EMUMACHINE)/scudsp.o      \
-	$(EMUMACHINE)/secflash.o    \
-	$(EMUMACHINE)/seibu_cop.o   \
-	$(EMUMACHINE)/smc91c9x.o    \
-	$(EMUMACHINE)/smpc.o        \
-	$(EMUMACHINE)/stvcd.o       \
-	$(EMUMACHINE)/tc009xlvc.o   \
-	$(EMUMACHINE)/timekpr.o     \
-	$(EMUMACHINE)/tmp68301.o    \
-	$(EMUMACHINE)/tms6100.o     \
-	$(EMUMACHINE)/tms9901.o     \
-	$(EMUMACHINE)/tms9902.o     \
-	$(EMUMACHINE)/upd1990a.o    \
-	$(EMUMACHINE)/upd4701.o     \
-	$(EMUMACHINE)/upd7002.o     \
-	$(EMUMACHINE)/upd765.o      \
-	$(EMUMACHINE)/v3021.o       \
-	$(EMUMACHINE)/wd_fdc.o      \
-	$(EMUMACHINE)/wd11c00_17.o  \
-	$(EMUMACHINE)/wd17xx.o      \
-	$(EMUMACHINE)/wd2010.o      \
-	$(EMUMACHINE)/wd33c93.o     \
-	$(EMUMACHINE)/x2212.o       \
-	$(EMUMACHINE)/x76f041.o     \
-	$(EMUMACHINE)/x76f100.o     \
-	$(EMUMACHINE)/z80ctc.o      \
-	$(EMUMACHINE)/z80dart.o     \
-	$(EMUMACHINE)/z80dma.o      \
-	$(EMUMACHINE)/z80pio.o      \
-	$(EMUMACHINE)/z80sio.o      \
-	$(EMUMACHINE)/z80sti.o      \
-	$(EMUMACHINE)/z8536.o       \
-
-EMUVIDEOOBJS = \
-	$(EMUVIDEO)/315_5124.o      \
-	$(EMUVIDEO)/bufsprite.o     \
-	$(EMUVIDEO)/cdp1861.o       \
-	$(EMUVIDEO)/cdp1862.o       \
-	$(EMUVIDEO)/cgapal.o        \
-	$(EMUVIDEO)/crt9007.o       \
-	$(EMUVIDEO)/crt9021.o       \
-	$(EMUVIDEO)/crt9212.o       \
-	$(EMUVIDEO)/dl1416.o        \
-	$(EMUVIDEO)/dm9368.o        \
-	$(EMUVIDEO)/ef9340_1.o      \
-	$(EMUVIDEO)/generic.o       \
-	$(EMUVIDEO)/h63484.o        \
-	$(EMUVIDEO)/hd44102.o       \
-	$(EMUVIDEO)/hd44352.o       \
-	$(EMUVIDEO)/hd44780.o       \
-	$(EMUVIDEO)/hd61830.o       \
-	$(EMUVIDEO)/hd63484.o       \
-	$(EMUVIDEO)/hd66421.o       \
-	$(EMUVIDEO)/huc6202.o       \
-	$(EMUVIDEO)/huc6260.o       \
-	$(EMUVIDEO)/huc6261.o       \
-	$(EMUVIDEO)/huc6270.o       \
-	$(EMUVIDEO)/huc6272.o       \
-	$(EMUVIDEO)/i8244.o         \
-	$(EMUVIDEO)/i8275.o         \
-	$(EMUVIDEO)/i8275x.o        \
-	$(EMUVIDEO)/k053250.o       \
-	$(EMUVIDEO)/m50458.o        \
-	$(EMUVIDEO)/mb90082.o       \
-	$(EMUVIDEO)/mc6845.o        \
-	$(EMUVIDEO)/mc6847.o        \
-	$(EMUVIDEO)/msm6255.o       \
-	$(EMUVIDEO)/pc_cga.o        \
-	$(EMUVIDEO)/pc_vga.o        \
-	$(EMUVIDEO)/poly.o          \
-	$(EMUVIDEO)/psx.o           \
-	$(EMUVIDEO)/ramdac.o        \
-	$(EMUVIDEO)/resnet.o        \
-	$(EMUVIDEO)/rgbutil.o       \
-	$(EMUVIDEO)/s2636.o         \
-	$(EMUVIDEO)/saa5050.o       \
-	$(EMUVIDEO)/sed1330.o       \
-	$(EMUVIDEO)/stvvdp1.o       \
-	$(EMUVIDEO)/stvvdp2.o       \
-	$(EMUVIDEO)/tlc34076.o      \
-	$(EMUVIDEO)/tms34061.o      \
-	$(EMUVIDEO)/tms3556.o       \
-	$(EMUVIDEO)/tms9927.o       \
-	$(EMUVIDEO)/tms9928a.o      \
-	$(EMUVIDEO)/upd3301.o       \
-	$(EMUVIDEO)/upd7220.o       \
-	$(EMUVIDEO)/upd7227.o       \
-	$(EMUVIDEO)/v9938.o         \
-	$(EMUVIDEO)/vector.o        \
-	$(EMUVIDEO)/voodoo.o        \
-
 EMUIMAGEDEVOBJS = \
 	$(EMUIMAGEDEV)/bitbngr.o    \
 	$(EMUIMAGEDEV)/cartslot.o   \
@@ -388,7 +154,7 @@ EMUIMAGEDEVOBJS = \
 	$(EMUIMAGEDEV)/snapquik.o   \
 
 
-LIBEMUOBJS = $(EMUOBJS) $(EMUSOUNDOBJS) $(EMUAUDIOOBJS) $(EMUDRIVEROBJS) $(EMUMACHINEOBJS) $(EMUIMAGEDEVOBJS) $(EMUVIDEOOBJS)
+LIBEMUOBJS = $(EMUOBJS) $(EMUSOUNDOBJS) $(EMUDRIVEROBJS) $(EMUIMAGEDEVOBJS)
 
 $(LIBEMU): $(LIBEMUOBJS)
 
@@ -416,6 +182,24 @@ $(LIBSOUND): $(SOUNDOBJS)
 
 
 
+#-------------------------------------------------
+# video core objects
+#-------------------------------------------------
+
+include $(EMUSRC)/video/video.mak
+
+$(LIBVIDEO): $(VIDEOOBJS)
+
+
+#-------------------------------------------------
+# machine core objects
+#-------------------------------------------------
+
+include $(EMUSRC)/machine/machine.mak
+
+$(LIBMACHINE): $(MACHINEOBJS)
+
+
 #-------------------------------------------------
 # additional dependencies
 #-------------------------------------------------
@@ -424,11 +208,6 @@ $(EMUOBJ)/rendfont.o:   $(EMUOBJ)/uismall.fh
 
 $(EMUOBJ)/video.o:  $(EMUSRC)/rendersw.c
 
-$(EMUMACHINE)/s3c2400.o:    $(EMUSRC)/machine/s3c24xx.c
-$(EMUMACHINE)/s3c2410.o:    $(EMUSRC)/machine/s3c24xx.c
-$(EMUMACHINE)/s3c2440.o:    $(EMUSRC)/machine/s3c24xx.c
-
-
 #-------------------------------------------------
 # core layouts
 #-------------------------------------------------
diff --git a/src/emu/machine/machine.mak b/src/emu/machine/machine.mak
new file mode 100644
index 00000000000..55d96559e4d
--- /dev/null
+++ b/src/emu/machine/machine.mak
@@ -0,0 +1,199 @@
+###########################################################################
+#
+#   machine.mak
+#
+#   Rules for building machine cores
+#
+#   Copyright Nicola Salmoria and the MAME Team.
+#   Visit http://mamedev.org for licensing and usage restrictions.
+#
+###########################################################################
+
+
+MACHINESRC = $(EMUSRC)/machine
+MACHINEOBJ = $(EMUOBJ)/machine
+
+
+#-------------------------------------------------
+# Core machine types
+#-------------------------------------------------
+
+MACHINEOBJS +=  $(MACHINEOBJ)/generic.o   	\
+
+
+MACHINEOBJS +=  $(MACHINEOBJ)/53c7xx.o      \
+				$(MACHINEOBJ)/53c810.o      \
+				$(MACHINEOBJ)/6522via.o     \
+				$(MACHINEOBJ)/6525tpi.o     \
+				$(MACHINEOBJ)/6526cia.o     \
+				$(MACHINEOBJ)/6532riot.o    \
+				$(MACHINEOBJ)/6821pia.o     \
+				$(MACHINEOBJ)/6840ptm.o     \
+				$(MACHINEOBJ)/6850acia.o    \
+				$(MACHINEOBJ)/68681.o       \
+				$(MACHINEOBJ)/7200fifo.o    \
+				$(MACHINEOBJ)/74123.o       \
+				$(MACHINEOBJ)/74145.o       \
+				$(MACHINEOBJ)/74148.o       \
+				$(MACHINEOBJ)/74153.o       \
+				$(MACHINEOBJ)/74181.o       \
+				$(MACHINEOBJ)/7474.o        \
+				$(MACHINEOBJ)/8042kbdc.o    \
+				$(MACHINEOBJ)/8257dma.o     \
+				$(MACHINEOBJ)/aakart.o      \
+				$(MACHINEOBJ)/adc0808.o     \
+				$(MACHINEOBJ)/adc083x.o     \
+				$(MACHINEOBJ)/adc1038.o     \
+				$(MACHINEOBJ)/adc1213x.o    \
+				$(MACHINEOBJ)/am53cf96.o    \
+				$(MACHINEOBJ)/am9517a.o     \
+				$(MACHINEOBJ)/amigafdc.o    \
+				$(MACHINEOBJ)/at28c16.o     \
+				$(MACHINEOBJ)/at29040a.o    \
+				$(MACHINEOBJ)/at45dbxx.o    \
+				$(MACHINEOBJ)/ataflash.o    \
+				$(MACHINEOBJ)/ay31015.o     \
+				$(MACHINEOBJ)/bankdev.o     \
+				$(MACHINEOBJ)/cdp1852.o     \
+				$(MACHINEOBJ)/cdp1871.o     \
+				$(MACHINEOBJ)/com8116.o     \
+				$(MACHINEOBJ)/cr589.o       \
+				$(MACHINEOBJ)/ctronics.o    \
+				$(MACHINEOBJ)/ds1302.o      \
+				$(MACHINEOBJ)/ds2401.o      \
+				$(MACHINEOBJ)/ds2404.o      \
+				$(MACHINEOBJ)/ds75160a.o    \
+				$(MACHINEOBJ)/ds75161a.o    \
+				$(MACHINEOBJ)/e0516.o       \
+				$(MACHINEOBJ)/eeprom.o      \
+				$(MACHINEOBJ)/er2055.o      \
+				$(MACHINEOBJ)/er59256.o     \
+				$(MACHINEOBJ)/f3853.o       \
+				$(MACHINEOBJ)/fdc_pll.o     \
+				$(MACHINEOBJ)/i2cmem.o      \
+				$(MACHINEOBJ)/i8155.o       \
+				$(MACHINEOBJ)/i8212.o       \
+				$(MACHINEOBJ)/i8214.o       \
+				$(MACHINEOBJ)/i8243.o       \
+				$(MACHINEOBJ)/i8251.o       \
+				$(MACHINEOBJ)/i8255.o       \
+				$(MACHINEOBJ)/i8279.o       \
+				$(MACHINEOBJ)/i8355.o       \
+				$(MACHINEOBJ)/idectrl.o     \
+				$(MACHINEOBJ)/im6402.o      \
+				$(MACHINEOBJ)/ins8154.o     \
+				$(MACHINEOBJ)/ins8250.o     \
+				$(MACHINEOBJ)/intelfsh.o    \
+				$(MACHINEOBJ)/jvsdev.o      \
+				$(MACHINEOBJ)/jvshost.o     \
+				$(MACHINEOBJ)/k033906.o     \
+				$(MACHINEOBJ)/k053252.o     \
+				$(MACHINEOBJ)/k056230.o     \
+				$(MACHINEOBJ)/laserdsc.o    \
+				$(MACHINEOBJ)/latch8.o      \
+				$(MACHINEOBJ)/lc89510.o     \
+				$(MACHINEOBJ)/ldpr8210.o    \
+				$(MACHINEOBJ)/ldstub.o      \
+				$(MACHINEOBJ)/ldv1000.o     \
+				$(MACHINEOBJ)/ldvp931.o     \
+				$(MACHINEOBJ)/linflash.o    \
+				$(MACHINEOBJ)/m6m80011ap.o  \
+				$(MACHINEOBJ)/matsucd.o     \
+				$(MACHINEOBJ)/mb14241.o     \
+				$(MACHINEOBJ)/mb3773.o      \
+				$(MACHINEOBJ)/mb87078.o     \
+				$(MACHINEOBJ)/mb89371.o     \
+				$(MACHINEOBJ)/mc146818.o    \
+				$(MACHINEOBJ)/mc2661.o      \
+				$(MACHINEOBJ)/mc6843.o      \
+				$(MACHINEOBJ)/mc6846.o      \
+				$(MACHINEOBJ)/mc6852.o      \
+				$(MACHINEOBJ)/mc6854.o      \
+				$(MACHINEOBJ)/mc68901.o     \
+				$(MACHINEOBJ)/mccs1850.o    \
+				$(MACHINEOBJ)/mcf5206e.o    \
+				$(MACHINEOBJ)/microtch.o    \
+				$(MACHINEOBJ)/mm58274c.o    \
+				$(MACHINEOBJ)/mm74c922.o    \
+				$(MACHINEOBJ)/mos6526.o     \
+				$(MACHINEOBJ)/mos6529.o     \
+				$(MACHINEOBJ)/mos6530.o     \
+				$(MACHINEOBJ)/mos6551.o     \
+				$(MACHINEOBJ)/msm5832.o     \
+				$(MACHINEOBJ)/msm58321.o    \
+				$(MACHINEOBJ)/msm6242.o     \
+				$(MACHINEOBJ)/n68681.o      \
+				$(MACHINEOBJ)/ncr539x.o     \
+				$(MACHINEOBJ)/net_lib.o     \
+				$(MACHINEOBJ)/netlist.o     \
+				$(MACHINEOBJ)/nmc9306.o     \
+				$(MACHINEOBJ)/nscsi_bus.o   \
+				$(MACHINEOBJ)/nscsi_cd.o    \
+				$(MACHINEOBJ)/nscsi_hd.o    \
+				$(MACHINEOBJ)/nvram.o       \
+				$(MACHINEOBJ)/pc16552d.o    \
+				$(MACHINEOBJ)/pccard.o      \
+				$(MACHINEOBJ)/pcf8593.o     \
+				$(MACHINEOBJ)/pci.o         \
+				$(MACHINEOBJ)/pckeybrd.o    \
+				$(MACHINEOBJ)/pd4990a.o     \
+				$(MACHINEOBJ)/pic8259.o     \
+				$(MACHINEOBJ)/pit8253.o     \
+				$(MACHINEOBJ)/pla.o         \
+				$(MACHINEOBJ)/ram.o         \
+				$(MACHINEOBJ)/rf5c296.o     \
+				$(MACHINEOBJ)/roc10937.o    \
+				$(MACHINEOBJ)/rp5c01.o      \
+				$(MACHINEOBJ)/rp5c15.o      \
+				$(MACHINEOBJ)/rp5h01.o      \
+				$(MACHINEOBJ)/rtc4543.o     \
+				$(MACHINEOBJ)/rtc65271.o    \
+				$(MACHINEOBJ)/rtc9701.o     \
+				$(MACHINEOBJ)/s3520cf.o     \
+				$(MACHINEOBJ)/s3c2400.o     \
+				$(MACHINEOBJ)/s3c2410.o     \
+				$(MACHINEOBJ)/s3c2440.o     \
+				$(MACHINEOBJ)/saturn.o      \
+				$(MACHINEOBJ)/scsibus.o     \
+				$(MACHINEOBJ)/scsicb.o      \
+				$(MACHINEOBJ)/scsicd.o      \
+				$(MACHINEOBJ)/scsidev.o     \
+				$(MACHINEOBJ)/scsihd.o      \
+				$(MACHINEOBJ)/scsihle.o     \
+				$(MACHINEOBJ)/scudsp.o      \
+				$(MACHINEOBJ)/secflash.o    \
+				$(MACHINEOBJ)/seibu_cop.o   \
+				$(MACHINEOBJ)/smc91c9x.o    \
+				$(MACHINEOBJ)/smpc.o        \
+				$(MACHINEOBJ)/stvcd.o       \
+				$(MACHINEOBJ)/tc009xlvc.o   \
+				$(MACHINEOBJ)/timekpr.o     \
+				$(MACHINEOBJ)/tmp68301.o    \
+				$(MACHINEOBJ)/tms6100.o     \
+				$(MACHINEOBJ)/tms9901.o     \
+				$(MACHINEOBJ)/tms9902.o     \
+				$(MACHINEOBJ)/upd1990a.o    \
+				$(MACHINEOBJ)/upd4701.o     \
+				$(MACHINEOBJ)/upd7002.o     \
+				$(MACHINEOBJ)/upd765.o      \
+				$(MACHINEOBJ)/v3021.o       \
+				$(MACHINEOBJ)/wd_fdc.o      \
+				$(MACHINEOBJ)/wd11c00_17.o  \
+				$(MACHINEOBJ)/wd17xx.o      \
+				$(MACHINEOBJ)/wd2010.o      \
+				$(MACHINEOBJ)/wd33c93.o     \
+				$(MACHINEOBJ)/x2212.o       \
+				$(MACHINEOBJ)/x76f041.o     \
+				$(MACHINEOBJ)/x76f100.o     \
+				$(MACHINEOBJ)/z80ctc.o      \
+				$(MACHINEOBJ)/z80dart.o     \
+				$(MACHINEOBJ)/z80dma.o      \
+				$(MACHINEOBJ)/z80pio.o      \
+				$(MACHINEOBJ)/z80sio.o      \
+				$(MACHINEOBJ)/z80sti.o      \
+				$(MACHINEOBJ)/z8536.o       \
+
+$(MACHINEOBJ)/s3c2400.o:    $(MACHINESRC)/s3c24xx.c
+$(MACHINEOBJ)/s3c2410.o:    $(MACHINESRC)/s3c24xx.c
+$(MACHINEOBJ)/s3c2440.o:    $(MACHINESRC)/s3c24xx.c
+
diff --git a/src/emu/video/video.mak b/src/emu/video/video.mak
new file mode 100644
index 00000000000..d803ca542a3
--- /dev/null
+++ b/src/emu/video/video.mak
@@ -0,0 +1,77 @@
+###########################################################################
+#
+#   video.mak
+#
+#   Rules for building video cores
+#
+#   Copyright Nicola Salmoria and the MAME Team.
+#   Visit http://mamedev.org for licensing and usage restrictions.
+#
+###########################################################################
+
+
+VIDEOSRC = $(EMUSRC)/video
+VIDEOOBJ = $(EMUOBJ)/video
+
+
+#-------------------------------------------------
+# Core video types
+#-------------------------------------------------
+
+VIDEOOBJS+= $(VIDEOOBJ)/generic.o   	\
+			$(VIDEOOBJ)/resnet.o    	\
+			$(VIDEOOBJ)/rgbutil.o   	\
+
+VIDEOOBJS+= $(VIDEOOBJ)/315_5124.o      \
+			$(VIDEOOBJ)/bufsprite.o     \
+			$(VIDEOOBJ)/cdp1861.o       \
+			$(VIDEOOBJ)/cdp1862.o       \
+			$(VIDEOOBJ)/cgapal.o        \
+			$(VIDEOOBJ)/crt9007.o       \
+			$(VIDEOOBJ)/crt9021.o       \
+			$(VIDEOOBJ)/crt9212.o       \
+			$(VIDEOOBJ)/dl1416.o        \
+			$(VIDEOOBJ)/dm9368.o        \
+			$(VIDEOOBJ)/ef9340_1.o      \
+			$(VIDEOOBJ)/h63484.o        \
+			$(VIDEOOBJ)/hd44102.o       \
+			$(VIDEOOBJ)/hd44352.o       \
+			$(VIDEOOBJ)/hd44780.o       \
+			$(VIDEOOBJ)/hd61830.o       \
+			$(VIDEOOBJ)/hd63484.o       \
+			$(VIDEOOBJ)/hd66421.o       \
+			$(VIDEOOBJ)/huc6202.o       \
+			$(VIDEOOBJ)/huc6260.o       \
+			$(VIDEOOBJ)/huc6261.o       \
+			$(VIDEOOBJ)/huc6270.o       \
+			$(VIDEOOBJ)/huc6272.o       \
+			$(VIDEOOBJ)/i8244.o         \
+			$(VIDEOOBJ)/i8275.o         \
+			$(VIDEOOBJ)/i8275x.o        \
+			$(VIDEOOBJ)/k053250.o       \
+			$(VIDEOOBJ)/m50458.o        \
+			$(VIDEOOBJ)/mb90082.o       \
+			$(VIDEOOBJ)/mc6845.o        \
+			$(VIDEOOBJ)/mc6847.o        \
+			$(VIDEOOBJ)/msm6255.o       \
+			$(VIDEOOBJ)/pc_cga.o        \
+			$(VIDEOOBJ)/pc_vga.o        \
+			$(VIDEOOBJ)/poly.o          \
+			$(VIDEOOBJ)/psx.o           \
+			$(VIDEOOBJ)/ramdac.o        \
+			$(VIDEOOBJ)/s2636.o         \
+			$(VIDEOOBJ)/saa5050.o       \
+			$(VIDEOOBJ)/sed1330.o       \
+			$(VIDEOOBJ)/stvvdp1.o       \
+			$(VIDEOOBJ)/stvvdp2.o       \
+			$(VIDEOOBJ)/tlc34076.o      \
+			$(VIDEOOBJ)/tms34061.o      \
+			$(VIDEOOBJ)/tms3556.o       \
+			$(VIDEOOBJ)/tms9927.o       \
+			$(VIDEOOBJ)/tms9928a.o      \
+			$(VIDEOOBJ)/upd3301.o       \
+			$(VIDEOOBJ)/upd7220.o       \
+			$(VIDEOOBJ)/upd7227.o       \
+			$(VIDEOOBJ)/v9938.o         \
+			$(VIDEOOBJ)/vector.o        \
+			$(VIDEOOBJ)/voodoo.o        \