diff --git a/src/tone/Makefile b/src/tone/Makefile
index 304e3e0d08a8f80f6444b0716f7168ac609d8ac5..865e3635c87f5a4fe235b4cb79ce8dbc23d2825e 100644
--- a/src/tone/Makefile
+++ b/src/tone/Makefile
@@ -34,12 +34,11 @@
 #############################################################################
 
 SRC_ROOT	=	..
-!include $(SRC_ROOT)/build/Common.bmake
+!include $(SRC_ROOT)\build\Common.bmake
 LDFLAGS 	=	$(LDFLAGS) $(XPDEV_LDFLAGS)
 CFLAGS		=	$(CFLAGS) $(XPDEV_CFLAGS)
-LDLIBS		=	$(LDLIBS) -lm -lxpdev
 
-$(TONE):	$(OBJODIR)$(DIRSEP)tone$(OFILE)
+$(TONE):	$(OBJS)
 	@echo Creating $@
-	$(QUIET)$(CC) $(CFLAGS) $(CCFLAGS) $(LDFLAGS) -e$@ $** $(LDLIBS)
+	$(QUIET)$(CC) $(CFLAGS) $(LDFLAGS) -e$@ $** $(XPDEV_LIBS)
 
diff --git a/src/tone/objects.mk b/src/tone/objects.mk
index 18c5cfa2647489bdd9dc7cbc4c5a8b784c602559..ed27f10a624d9bfec9d91f050ce2201cc1ada361 100644
--- a/src/tone/objects.mk
+++ b/src/tone/objects.mk
@@ -8,3 +8,4 @@
 
 OBJS	= \
 	$(OBJODIR)$(DIRSEP)tone$(OFILE)
+
diff --git a/src/tone/targets.mk b/src/tone/targets.mk
index ddf317cc04f0727fc10def02171379db32a303f7..0c65c4b6e801426475c874c41d36bef77b9741db 100644
--- a/src/tone/targets.mk
+++ b/src/tone/targets.mk
@@ -1,3 +1,4 @@
 TONE	=	$(EXEODIR)$(DIRSEP)tone$(EXEFILE)
 
-all:	$(EXEODIR) $(OBJODIR) $(TONE)
+all:	$(XPDEV_LIB) $(EXEODIR) $(OBJODIR) $(TONE)
+