diff --git a/devel/apr-util/Makefile b/devel/apr-util/Makefile
index 741df4a6f57..b96bbbeec22 100644
--- a/devel/apr-util/Makefile
+++ b/devel/apr-util/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.20 2007/10/26 01:23:38 sthen Exp $
+# $OpenBSD: Makefile,v 1.21 2008/01/06 17:13:04 naddy Exp $
 
 COMMENT=	companion library to APR
 
@@ -34,7 +34,6 @@ AUTOCONF_VERSION=2.59
 CONFIGURE_ARGS=	--with-apr=${LOCALBASE} \
 		--with-dbm=db4 \
 		--with-berkeley-db=${LOCALBASE}/include/db4:${LOCALBASE}/lib/db4 \
-		--with-expat=${X11BASE} \
 		--with-iconv=${LOCALBASE} \
 		--includedir=${LOCALBASE}/include/apr-1${MT}/ \
 		--with-apr=${LOCALBASE}/bin/apr-1${MT}-config
diff --git a/devel/rats/Makefile b/devel/rats/Makefile
index 5ab4bef1392..faba8b48dbd 100644
--- a/devel/rats/Makefile
+++ b/devel/rats/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.16 2007/09/16 02:53:12 merdely Exp $
+# $OpenBSD: Makefile,v 1.17 2008/01/06 17:13:04 naddy Exp $
 
 COMMENT=		source code auditing tool
 
@@ -21,11 +21,9 @@ MASTER_SITES=		http://www.securesoftware.com/rats/ \
 			${MASTER_SITE_PACKETSTORM:=UNIX/security/}
 
 CONFIGURE_STYLE=	gnu dest
-CONFIGURE_ARGS+=	--with-expat-lib=${X11BASE}/lib \
-			--with-expat-include=${X11BASE}/include \
-			--libdir=${WRKINST}${PREFIX}/share/rats \
+CONFIGURE_ARGS+=	--libdir=${WRKINST}${PREFIX}/share/rats \
 			--datadir=${WRKINST}${PREFIX}/share/rats
-MAKE_FLAGS=		CFLAGS='${CFLAGS} -I${X11BASE}/include \
+MAKE_FLAGS=		CFLAGS='${CFLAGS} \
 			  -DHAVE_LIBEXPAT=1 -DHAVE_EXPAT_H=1 \
 			  -DDATADIR=\"${LOCALBASE}/share/rats\"'
 
diff --git a/net/ejabberd/Makefile b/net/ejabberd/Makefile
index 671e039d20a..4484fa5ec76 100644
--- a/net/ejabberd/Makefile
+++ b/net/ejabberd/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2008/01/02 12:16:43 jasper Exp $
+# $OpenBSD: Makefile,v 1.6 2008/01/06 17:13:04 naddy Exp $
 
 COMMENT=		jabber server written in Erlang
 
@@ -35,8 +35,7 @@ FAKE_FLAGS+=		EJABBERDDIR=${WRKINST}/${PREFIX}/lib/ejabberd \
 USE_GMAKE=		Yes
 CONFIGURE_STYLE=	gnu
 SHARED_ONLY=		Yes
-CONFIGURE_ARGS+=	--with-expat=${X11BASE} \
-			--enable-mod_pubsub \
+CONFIGURE_ARGS+=	--enable-mod_pubsub \
 			--enable-mod_irc \
 			--enable-mod_muc \
 			--enable-eldap \
diff --git a/textproc/sablotron/Makefile b/textproc/sablotron/Makefile
index 0e9b78526df..ab783ce6985 100644
--- a/textproc/sablotron/Makefile
+++ b/textproc/sablotron/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.27 2007/09/15 20:59:42 merdely Exp $
+# $OpenBSD: Makefile,v 1.28 2008/01/06 17:13:04 naddy Exp $
 
 COMMENT=	fast, compact and portable XSL/XSLT processor
 
@@ -32,7 +32,7 @@ MODGNU_CONFIG_GUESS_DIRS=	${WRKSRC}/autocfg
 CONFIGURE_STYLE=gnu
 CONFIGURE_ENV=	SABLOT_GPL=1
 CONFIGURE_ARGS=	${CONFIGURE_SHARED} --enable-static \
-		--enable-debugger --with-expat-prefix=${X11BASE} \
+		--enable-debugger \
 		--with-iconv-prefix=${LOCALBASE} --with-readline \
 		--with-html-dir=${PREFIX}/share/doc/sablotron
 
diff --git a/x11/matchbox/matchbox-keyboard/Makefile b/x11/matchbox/matchbox-keyboard/Makefile
index f7cd4ea6db7..31347536139 100644
--- a/x11/matchbox/matchbox-keyboard/Makefile
+++ b/x11/matchbox/matchbox-keyboard/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2007/12/15 21:43:04 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.7 2008/01/06 17:13:04 naddy Exp $
 
 COMMENT=	on-screen virtual keyboard
 DISTNAME=	matchbox-keyboard-0.1
@@ -22,9 +22,7 @@ RUN_DEPENDS=	:matchbox-common-*:x11/matchbox/matchbox-common \
 WANTLIB=	X11 Xau Xdmcp Xext Xft Xrender Xtst c expat fontconfig freetype z
 
 CONFIGURE_STYLE=gnu
-CONFIGURE_ARGS+=--enable-nls \
-		--with-expat-includes=${X11BASE}/include \
-		--with-expat-lib=${X11BASE}/lib
+CONFIGURE_ARGS+=--enable-nls
 CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/libpng" \
 		LDFLAGS="-L${LOCALBASE}/lib"