diff --git a/x11/tools/pswrap/Makefile b/x11/tools/pswrap/Makefile
index cc9a3223180b..f6e04b4147e4 100644
--- a/x11/tools/pswrap/Makefile
+++ b/x11/tools/pswrap/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2003/09/20 06:20:58 lukem Exp $
+#	$NetBSD: Makefile,v 1.4 2003/09/30 05:58:56 matt Exp $
 
 NOMAN=		1
 
@@ -11,6 +11,7 @@ SRCS=		main.c pswparser.y lexer.l pswdict.c pswfile.c \
 		systemnames.c psw.c pswstring.c pswsemantics.c
 
 HOST_CPPFLAGS+=	-DXENVIRONMENT -DFRIENDSFILE='"<DPS/dpsfriends.h>"' -I.
+HOST_CPPFLAGS+=	-I${X11SRCDIR.xc}/config/${HOSTPROG}
 
 YHEADER=	1
 
diff --git a/x11/tools/xkbcomp/Makefile b/x11/tools/xkbcomp/Makefile
index 69e4abc67fe5..41baca90d727 100644
--- a/x11/tools/xkbcomp/Makefile
+++ b/x11/tools/xkbcomp/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2003/09/13 20:19:10 lukem Exp $
+#	$NetBSD: Makefile,v 1.3 2003/09/30 05:58:56 matt Exp $
 
 NOMAN=		1
 
@@ -26,6 +26,7 @@ SRCS+=		XKB.c XKBAlloc.c XKBGAlloc.c XKBMAlloc.c XKBMisc.c \
 HOST_CPPFLAGS+=	-I${DESTDIR}/${X11INCDIR} \
 		-I. \
 		-I${X11SRCDIR.xc}/lib/X11 \
+		-I${X11SRCDIR.xc}/programs/${HOSTPROG} \
 		-DDFLT_XKB_CONFIG_ROOT=\"${X11LIBDIR}/xkb\" -DXKB