--- a/open-src/Makefile	Wed Jun 30 14:10:39 2010 -0700
+++ b/open-src/Makefile	Fri Jul 02 21:03:57 2010 -0700
@@ -44,6 +44,7 @@
 
 # High level dependencies
 proto: util/util-macros util/lndir
+util/lndir: proto/x11proto
 lib: proto util
 util: proto
 app: lib data/xbitmaps
@@ -57,6 +58,7 @@
 
 OS_SUBDIRS_common = \
 	util/util-macros \
+	proto/x11proto \
 	util/lndir \
 	proto \
 	data/xbitmaps \
@@ -67,6 +69,7 @@
 	$(FONTAPPS) \
 	xserver/xorg \
 	xserver/xvnc \
+	xserver/xserver-common \
 	driver \
 	app/rgb \
 	data \