diff -Naur makefile makefile
--- makefile	2007-02-19 21:24:09.000000000 -0700
+++ makefile	2007-02-19 10:29:26.000000000 -0700
@@ -392,7 +392,7 @@
 # executable targets and dependencies
 #-------------------------------------------------
 
-$(EMULATOR): $(VERSIONOBJ) $(DRVLIBS) $(LIBOSD) $(LIBEMU) $(LIBCPU) $(LIBSOUND) $(LIBUTIL) $(EXPAT) $(ZLIB) $(LIBOCORE) $(RESFILE)
+$(EMULATOR): $(VERSIONOBJ) $(DRVLIBS) $(OSDOBJS) $(LIBEMU) $(LIBCPU) $(LIBSOUND) $(LIBUTIL) $(EXPAT) $(ZLIB) $(LIBOCORE) $(RESFILE)
 # always recompile the version string
 	$(CC) $(CDEFS) $(CFLAGS) -c $(SRC)/version.c -o $(VERSIONOBJ)
 	@echo Linking $@...
diff -Naur src/osd/windows/windows.mak src/osd/windows/windows.mak
--- src/osd/windows/windows.mak	2007-02-19 21:24:06.000000000 -0700
+++ src/osd/windows/windows.mak	2007-02-19 10:32:06.000000000 -0700
@@ -137,8 +137,8 @@
 
 # debug build: enable guard pages on all memory allocations
 ifdef DEBUG
-DEFS += -DMALLOC_DEBUG
-LDFLAGS += -Wl,--allow-multiple-definition
+#DEFS += -DMALLOC_DEBUG
+#LDFLAGS += -Wl,--allow-multiple-definition
 endif
 
 ifdef UNICODE
@@ -188,10 +188,10 @@
 	$(WINOBJ)/winalloc.o
 endif
 
-$(LIBOCORE): $(OSDCOREOBJS)
 
 
 
+
 #-------------------------------------------------
 # OSD Windows library
 #-------------------------------------------------
@@ -231,7 +231,6 @@
 endif
 endif
 
-$(LIBOSD): $(OSDOBJS)
 
 
 
@@ -245,13 +244,14 @@
 include $(WINSRC)/ui/ui.mak
 endif
 
+$(LIBOCORE): $(OSDCOREOBJS)
+$(LIBOSD): $(OSDOBJS)
 
-
 #-------------------------------------------------
 # rule for making the ledutil sample
 #-------------------------------------------------
 
-ledutil$(EXE): $(WINOBJ)/ledutil.o $(LIBOCORE)
+ledutil$(EXE): $(WINOBJ)/ledutil.o $(OSDMAIN) $(LIBOCORE)
 	@echo Linking $@...
 	$(LD) $(LDFLAGS) -mwindows $(OSDBGLDFLAGS) $^ $(LIBS) -o $@

diff -Naur src/tools/tools.mak src/tools/tools.mak
--- src/tools/tools.mak	2007-02-19 21:24:06.000000000 -0700
+++ src/tools/tools.mak	2007-02-19 10:30:49.000000000 -0700
@@ -50,7 +50,7 @@
 ROMCMPOBJS = \
 	$(TOOLSOBJ)/romcmp.o \
 
-romcmp$(EXE): $(ROMCMPOBJS) $(LIBUTIL) $(ZLIB) $(EXPAT) $(LIBOCORE)
+romcmp$(EXE): $(ROMCMPOBJS) $(LIBUTIL) $(ZLIB) $(EXPAT) $(LIBOCORE) $(OSDMAIN)
 	@echo Linking $@...
 	$(LD) $(LDFLAGS) $^ $(LIBS) -o $@
 
@@ -64,7 +64,7 @@
 	$(TOOLSOBJ)/chdman.o \
 	$(TOOLSOBJ)/chdcd.o \
 
-chdman$(EXE): $(VERSIONOBJ) $(CHDMANOBJS) $(LIBUTIL) $(ZLIB) $(EXPAT) $(LIBOCORE)
+chdman$(EXE): $(VERSIONOBJ) $(CHDMANOBJS) $(LIBUTIL) $(ZLIB) $(EXPAT) $(LIBOCORE) $(OSDMAIN)
 	@echo Linking $@...
 	$(LD) $(LDFLAGS) $^ $(LIBS) -o $@