diff --git a/x11/Xserver/GL/GLcore/Makefile.GLcore b/x11/Xserver/GL/GLcore/Makefile.GLcore
index c328a51911fa..b09b9451f2f8 100644
--- a/x11/Xserver/GL/GLcore/Makefile.GLcore
+++ b/x11/Xserver/GL/GLcore/Makefile.GLcore
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.GLcore,v 1.5 2004/03/07 13:50:25 rtr Exp $
+#	$NetBSD: Makefile.GLcore,v 1.6 2004/04/05 12:03:25 lukem Exp $
 
 LIB=	GLcore
 
@@ -61,6 +61,7 @@ SRCS+=		compsize.c xf86glx.c xf86glx_util.c
 CPPFLAGS+=	-I${DESTDIR}${X11INCDIR}/X11 \
 		-I${DESTDIR}${X11INCDIR}/X11/extensions \
  		-I${X11SRCDIR.xc}/extras/Mesa/include \
+		-I${X11SRCDIR.xc}/lib/GL/glx \
 		-I${X11SRCDIR.xc}/lib/GL/include \
  		-I${X11SRCDIR.xc}/extras/Mesa/src \
 		-I${X11SRCDIR.xc}/programs/Xserver/include \
diff --git a/x11/Xserver/os/Makefile b/x11/Xserver/os/Makefile
index ba1f74f1befd..1f29356f3948 100644
--- a/x11/Xserver/os/Makefile
+++ b/x11/Xserver/os/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.10 2004/03/06 03:31:08 rtr Exp $
+#	$NetBSD: Makefile,v 1.11 2004/04/05 12:03:25 lukem Exp $
 
 .include "../Makefile.serverlib"
 
@@ -46,7 +46,7 @@ CPPFLAGS.io.c=		${X11FLAGS.EXTENSION}
 CPPFLAGS.lbxio.c=	${X11FLAGS.EXTENSION}
 CPPFLAGS.oscolor.c=	-DNDBM
 CPPFLAGS.osinit.c=	-DADMPATH=\"/var/log/X\%smsgs\"
-CPPFLAGS.transport.c=	-DBSD44SOCKETS
+CPPFLAGS.transport.c=	-DBSD44SOCKETS -I${X11SRCDIR.xc}/lib/xtrans
 CPPFLAGS.utils.c=	-DXDMCP ${X11FLAGS.EXTENSION}
 CPPFLAGS.xdmauth.c=	-DXDMCP
 COPTS.xdmauth.c=	-Wno-error	# XXX
diff --git a/x11/bin/lbxproxy/Makefile b/x11/bin/lbxproxy/Makefile
index a7a3d25fc66c..e114eb2b5d79 100644
--- a/x11/bin/lbxproxy/Makefile
+++ b/x11/bin/lbxproxy/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.4 2003/11/17 05:18:20 lukem Exp $
+#	$NetBSD: Makefile,v 1.5 2004/04/05 12:03:25 lukem Exp $
 
 .include <bsd.own.mk>
 
@@ -32,8 +32,8 @@ CPPFLAGS.${_S}=	${X11FLAGS.CONNECTION} \
 
 CPPFLAGS.connection.c+=	-DLBXPROXY_t -DTRANS_SERVER -DBSD44SOCKETS
 CPPFLAGS.io.c+=		-DLBXPROXY_t -DTRANS_SERVER ${X11FLAGS.EXTENSION}
-CPPFLAGS.transport.c+=	-DLBXPROXY_t -DTRANS_SERVER -DBSD44SOCKETS
-
+CPPFLAGS.transport.c+=	-DLBXPROXY_t -DTRANS_SERVER -DBSD44SOCKETS \
+			-I${X11SRCDIR.xc}/lib/xtrans  
 
 .PATH:		${X11SRCDIR.xc}/programs/${PROG}/config
 FILES=		AtomControl
diff --git a/x11/lib/FS/Makefile b/x11/lib/FS/Makefile
index c2051a4bc817..d9743313d413 100644
--- a/x11/lib/FS/Makefile
+++ b/x11/lib/FS/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.5 2003/10/20 05:12:40 jdolecek Exp $
+#	$NetBSD: Makefile,v 1.6 2004/04/05 12:03:25 lukem Exp $
 
 .include <bsd.own.mk>
 
@@ -16,6 +16,8 @@ INCS=	FSlib.h
 INCSDIR=${X11INCDIR}/X11/fonts
 
 CPPFLAGS+=	-I${DESTDIR}${X11INCDIR}/X11/fonts
+CPPFLAGS+=	-I${X11SRCDIR.xc}/lib/${LIB}
+CPPFLAGS+=	-I${X11SRCDIR.xc}/lib/xtrans
 
 CONN_DEFINES = ${X11FLAGS.CONNECTION} -DFS_t -DTRANS_CLIENT
 SOCK_DEFINES = -DBSD44SOCKETS
diff --git a/x11/lib/font/Makefile b/x11/lib/font/Makefile
index 04fb43a946f7..6ac0db2aef25 100644
--- a/x11/lib/font/Makefile
+++ b/x11/lib/font/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.7 2004/03/06 03:05:39 rtr Exp $
+#	$NetBSD: Makefile,v 1.8 2004/04/05 12:03:25 lukem Exp $
 
 .include <bsd.own.mk>
 
@@ -41,6 +41,7 @@ SRCS.fc=	fsconvert.c fserve.c fsio.c transport.c
 .for fn in ${SRCS.fc}
 CPPFLAGS.${fn}=	-I${DESTDIR}${X11INCDIR}/X11/fonts \
 		-I${X11SRCDIR.xc}/lib/font/include \
+		-I${X11SRCDIR.xc}/lib/xtrans \
 		-I${X11SRCDIR.xc}/include/fonts
 CPPFLAGS.${fn}+=${X11FLAGS.CONNECTION} -DFONT_t -DTRANS_CLIENT \
 		-DTRANS_SERVER -DTRANS_REOPEN -DBSD44SOCKETS