diff --git a/x11/Xserver/Xserver/Makefile.Xserver b/x11/Xserver/Xserver/Makefile.Xserver
index 4b8536109c01..5dd6dd55a599 100644
--- a/x11/Xserver/Xserver/Makefile.Xserver
+++ b/x11/Xserver/Xserver/Makefile.Xserver
@@ -1,11 +1,11 @@
-#	$NetBSD: Makefile.Xserver,v 1.6 2003/12/23 03:36:01 rtr Exp $
+#	$NetBSD: Makefile.Xserver,v 1.7 2003/12/23 10:23:07 rtr Exp $
 
 .PATH:		${NETBSDSRCDIR}/x11/Xserver/Xserver
 
 .for _SL in	dix os mi printer printer/pcl printer/ps printer/raster \
 		Xext/ext Xext/exts GL/glx GL/GLcore xkb xinput lbx dbe \
 		record randr render xtrap mfb cfb cfb16 cfb24 cfb32 fb \
-		hw/xnest hw/vfb Xfont lbxutil fontbase \
+		hw/xnest hw/vfb fontbase \
 		\
 		dix/xpstubs hw/sun hw/xfree86/xf86 hw/xfree86/xf86_os \
 		hw/xfree86/xf86config hw/xfree86/loader 
diff --git a/x11/Xserver/Xserver/XFree86/Makefile b/x11/Xserver/Xserver/XFree86/Makefile
index 6df2d039610e..6b6f8ceddeb8 100644
--- a/x11/Xserver/Xserver/XFree86/Makefile
+++ b/x11/Xserver/Xserver/XFree86/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2003/12/23 03:33:41 rtr Exp $
+#	$NetBSD: Makefile,v 1.4 2003/12/23 10:23:07 rtr Exp $
 
 .include <bsd.own.mk>
 
@@ -29,8 +29,16 @@ LDADD+=	${LDADD.hw/xfree86/xf86} ${LDADD.hw/xfree86/xf86config} \
 	${LDADD.randr} ${LDADD.render} ${LDADD.hw/xfree86/xf86_os} \
 	-lz -lm
 
+DPADD=	${DPADD.hw/xfree86/xf86} ${DPADD.hw/xfree86/xf86config} \
+	${DPADD.hw/xfree86/xf86_os} ${DPADD.hw/xfree86/loader} \
+	${DPADD.dix} ${DPADD.os} ${LIBXAU} ${LIBXDMCP} ${DPADD.fontbase} \
+	${DPADD.Xext/exts} ${DPADD.xkb} ${DPADD.xinput} ${DPADD.lbx} \
+	${LIBLBXUTIL} ${DPADD.randr} ${DPADD.render} ${DPADD.dix/xpstubs} \
+	${DPADD.mi} ${LIBZ} ${LIBM}
+
 .if ${MACHINE} == "i386"
 LDADD+=	-li386
+DPADD+=	${LIBI386}
 .endif
 
 .include <bsd.x11.mk>
diff --git a/x11/Xserver/Xserver/Xsun/Makefile b/x11/Xserver/Xserver/Xsun/Makefile
index 4cb59d446e8b..7caf502a211d 100644
--- a/x11/Xserver/Xserver/Xsun/Makefile
+++ b/x11/Xserver/Xserver/Xsun/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2003/12/22 15:57:51 rtr Exp $
+#	$NetBSD: Makefile,v 1.3 2003/12/23 10:23:07 rtr Exp $
 
 .include <bsd.own.mk>
 
@@ -21,14 +21,14 @@ LDADD+=	${LDADD.xinput}
 DPADD=	${DPADD.xinput}
 .endif
 
-LDADD+=	${LDADD.lbx} ${LDADD.lbxutil} ${LDADD.dbe} ${LDADD.record} \
+LDADD+=	${LDADD.lbx} -llbxutil ${LDADD.dbe} ${LDADD.record} \
 	${LDADD.xtrap} ${LDADD.GL/glx} ${LDADD.GL/GLcore} ${LDADD.randr} \
-	${LDADD.render} ${LDADD.Xfont} -lfreetype ${LDADD.dix/xpstubs} \
+	${LDADD.render} -lXfont -lfreetype ${LDADD.dix/xpstubs} \
 	-lfreetype -lXau -lXdmcp -lz -lm
 
 DPADD+=	${LIBDIR.hw/sun}/sunInit.o ${DPADD.hw/sun} ${DPADD.dix} ${DPADD.os} \
 	${DPADD.cfb} ${DPADD.mfb} ${DPADD.mi} ${LIBXEXT} ${DPADD.xkb} \
-	${DPADD.lbx} ${DPADD.lbxutil} ${DPADD.dbe} ${DPADD.record} \
+	${DPADD.lbx} ${LIBLBXUTIL} ${DPADD.dbe} ${DPADD.record} \
 	${DPADD.xtrap} ${DPADD.GL/glx} ${DPADD.GL/GLcore} ${DPADD.randr} \
 	${DPADD.render} ${LIBXFONT} ${LDADD.dix/xpstubs} ${LIBFREETYPE} \
 	${LIBXAU} ${LIBXDMCP} ${LIBZ} ${LIBM}
diff --git a/x11/Xserver/Xserver/Xsun24/Makefile b/x11/Xserver/Xserver/Xsun24/Makefile
index 483b7ebc11ab..ddf8520b81e2 100644
--- a/x11/Xserver/Xserver/Xsun24/Makefile
+++ b/x11/Xserver/Xserver/Xsun24/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2003/12/22 15:57:51 rtr Exp $
+#	$NetBSD: Makefile,v 1.3 2003/12/23 10:23:07 rtr Exp $
 
 .include <bsd.own.mk>
 
@@ -21,16 +21,15 @@ LDADD+= ${LDADD.xinput}
 DPADD=	${DPADD.xinput}
 .endif
 
-LDADD+=	${LDADD.lbx} ${LDADD.lbxutil} \
-	${LDADD.dbe} ${LDADD.record} ${LDADD.xtrap} ${LDADD.GL/glx} \
-	${LDADD.GL/GLcore} ${LDADD.randr} ${LDADD.render} \
-	${LDADD.Xfont} -lfreetype ${LDADD.dix/xpstubs} -lfreetype -lXau \
-	-lXdmcp -lz -lm
+LDADD+=	${LDADD.lbx} -llbxutil ${LDADD.dbe} ${LDADD.record} \
+	${LDADD.xtrap} ${LDADD.GL/glx} ${LDADD.GL/GLcore} ${LDADD.randr} \
+	${LDADD.render} -lXfont -lfreetype ${LDADD.dix/xpstubs} -lfreetype \
+	-lXau -lXdmcp -lz -lm
 
 DPADD+=	${LIBDIR.hw/sun}/sunInitMulti.o ${DPADD.hw/sun} ${DPADD.dix} \
 	${DPADD.os} ${DPADD.cfb16} ${DPADD.cfb24} ${DPADD.cfb32} \
 	${DPADD.cfb} ${DPADD.mfb} ${DPADD.mi} ${LIBXEXT} ${DPADD.xkb} \
-	${DPADD.lbx} ${DPADD.lbxutil} ${DPADD.dbe} ${DPADD.record} \
+	${DPADD.lbx} ${LIBLBXUTIL} ${DPADD.dbe} ${DPADD.record} \
 	${DPADD.xtrap} ${DPADD.GL/glx} ${DPADD.GL/GLcore} ${DPADD.randr} \
 	${DPADD.render} ${LIBXFONT} ${DPADD.dix/xpstubs} ${LIBFREETYPE} \
 	${LIBXAU} ${LIBXDMCP} ${LIBZ} ${LIBM}
diff --git a/x11/Xserver/Xserver/XsunMono/Makefile b/x11/Xserver/Xserver/XsunMono/Makefile
index 0b663e8d1e0b..79a135286810 100644
--- a/x11/Xserver/Xserver/XsunMono/Makefile
+++ b/x11/Xserver/Xserver/XsunMono/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2003/12/22 15:57:51 rtr Exp $
+#	$NetBSD: Makefile,v 1.3 2003/12/23 10:23:08 rtr Exp $
 
 .include <bsd.own.mk>
 
@@ -20,14 +20,13 @@ LDADD+= ${LDADD.xinput}
 DPADD+=	${DPADD.xinput}
 .endif
 
-LDADD+=	${LDADD.lbx} ${LDADD.lbxutil} \
-	${LDADD.dbe} ${LDADD.record} ${LDADD.xtrap} ${LDADD.GL/glx} \
-	${LDADD.GL/GLcore} ${LDADD.randr} ${LDADD.render} ${LDADD.Xfont} \
-	-lfreetype ${LDADD.dix/xpstubs} -lfreetype -lXau -lXdmcp -lz -lm
+LDADD+=	${LDADD.lbx} -llbxutil ${LDADD.dbe} ${LDADD.record} ${LDADD.xtrap} \
+	${LDADD.GL/glx} ${LDADD.GL/GLcore} ${LDADD.randr} ${LDADD.render} \
+	-lXfont -lfreetype ${LDADD.dix/xpstubs} -lfreetype -lXau -lXdmcp -lz -lm
 
 DPADD+=	${LIBDIR.hw/sun}/sunInitMono.o ${LIBDIR.hw/sun}/sunInExMono.o \
 	${DPADD.hw/sun} ${DPADD.dix} ${DPADD.os} ${DPADD.mfb} ${DPADD.mi} \
-	${LIBXEXT} ${DPADD.xkb} ${DPADD.lbx} ${DPADD.lbxutil} ${DPADD.dbe} \
+	${LIBXEXT} ${DPADD.xkb} ${DPADD.lbx} ${LIBLBXUTIL} ${DPADD.dbe} \
 	${DPADD.record} ${DPADD.xtrap} ${DPADD.GL/glx} ${DPADD.GL/GLcore} \
 	${DPADD.randr} ${DPADD.render} ${LIBXFONT} ${DPADD.dix/xpstubs} \
 	${LIBFREETYPE} ${LIBXAU} ${LIBXDMCP} ${LIBZ} ${LIBM}