diff --git a/x11/libX11/Makefile b/x11/libX11/Makefile
index aad0e2bd01c7..ca088a0962d1 100644
--- a/x11/libX11/Makefile
+++ b/x11/libX11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2013/06/04 07:57:13 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2013/06/13 22:30:41 joerg Exp $
 
 DISTNAME=		libX11-1.6.0
 CATEGORIES=		x11 devel
@@ -35,14 +35,8 @@ LDFLAGS.MirBSD+=	-pthread
 
 BUILDLINK_API_DEPENDS.libxcb+=libxcb>=1.8.1
 
-.include "../../mk/compiler.mk"
-
-.if !empty(PKGSRC_COMPILER:Mclang)
-BUILD_DEPENDS+=		ucpp-[0-9]*:../../devel/ucpp
-CONFIGURE_ENV+=		ac_cv_path_RAWCPP="${PREFIX}/bin/ucpp -t -c90 -Uunix"
-.elif empty(PKGSRC_COMPILER:Mgcc)
-CONFIGURE_ENV+=		ac_cv_path_RAWCPP="cc -E -Uunix -"
-.endif
+BUILD_DEPENDS+=		tradcpp-[0-9]*:../../devel/tradcpp
+CONFIGURE_ENV+=		ac_cv_path_RAWCPP="${PREFIX}/bin/tradcpp -Uunix"
 
 .if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
 CONFIGURE_ENV+=		CC_FOR_BUILD=${NATIVE_CC:Q}
diff --git a/x11/libXext/Makefile b/x11/libXext/Makefile
index 91acbf8154e2..94704852bf9f 100644
--- a/x11/libXext/Makefile
+++ b/x11/libXext/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2013/06/01 06:50:27 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2013/06/13 22:30:41 joerg Exp $
 
 DISTNAME=		libXext-1.3.2
 CATEGORIES=		x11 devel
@@ -25,12 +25,8 @@ CONFIGURE_ARGS+=	--disable-malloc0returnsnull
 
 .include "../../mk/compiler.mk"
 
-.if !empty(PKGSRC_COMPILER:Mclang)
-BUILD_DEPENDS+=		ucpp-[0-9]*:../../devel/ucpp
-CONFIGURE_ENV+=		ac_cv_path_RAWCPP="${PREFIX}/bin/ucpp -t -c90 -Uunix"
-.elif empty(PKGSRC_COMPILER:Mgcc)
-CONFIGURE_ENV+=		ac_cv_path_RAWCPP="cc -E -Uunix -"
-.endif
+BUILD_DEPENDS+=		tradcpp-[0-9]*:../../devel/tradcpp
+CONFIGURE_ENV+=		ac_cv_path_RAWCPP="${PREFIX}/bin/tradcpp -Uunix"
 
 .include "../../meta-pkgs/modular-xorg/hacks.mk"
 
diff --git a/x11/libXt/Makefile b/x11/libXt/Makefile
index fc3b5cf731cf..44d58ac6968c 100644
--- a/x11/libXt/Makefile
+++ b/x11/libXt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2013/05/31 08:27:17 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2013/06/13 22:30:41 joerg Exp $
 
 DISTNAME=		libXt-1.1.4
 CATEGORIES=		x11 devel
@@ -34,12 +34,8 @@ CPPFLAGS.OSF1+=		-pthread # Required by compiler if including pthread.h
 
 .include "../../mk/compiler.mk"
 
-.if !empty(PKGSRC_COMPILER:Mclang)
-BUILD_DEPENDS+=		ucpp-[0-9]*:../../devel/ucpp
-CONFIGURE_ENV+=		ac_cv_path_RAWCPP="${PREFIX}/bin/ucpp -t -c90 -Uunix"
-.elif empty(PKGSRC_COMPILER:Mgcc)
-CONFIGURE_ENV+=		ac_cv_path_RAWCPP="cc -E -Uunix -"
-.endif
+BUILD_DEPENDS+=		tradcpp-[0-9]*:../../devel/tradcpp
+CONFIGURE_ENV+=		ac_cv_path_RAWCPP="${PREFIX}/bin/tradcpp -Uunix"
 
 .include "../../x11/libSM/buildlink3.mk"
 .include "../../x11/libICE/buildlink3.mk"
diff --git a/x11/modular-xorg-server/Makefile b/x11/modular-xorg-server/Makefile
index 8ed67dbc0bf4..c4a71eee5007 100644
--- a/x11/modular-xorg-server/Makefile
+++ b/x11/modular-xorg-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.78 2013/06/04 22:17:28 tron Exp $
+# $NetBSD: Makefile,v 1.79 2013/06/13 22:30:41 joerg Exp $
 #
 
 DISTNAME=	xorg-server-1.12.4
@@ -125,13 +125,8 @@ BUILDLINK_API_DEPENDS.renderproto+=	renderproto>=0.11
 BUILDLINK_API_DEPENDS.xf86dgaproto+=	xf86dgaproto>=2.0.3
 BUILDLINK_API_DEPENDS.xf86driproto+=	xf86driproto>=2.1.0
 
-.include "../../mk/compiler.mk"
-.if !empty(PKGSRC_COMPILER:Mclang)
-BUILD_DEPENDS+=		ucpp-[0-9]*:../../devel/ucpp
-CONFIGURE_ENV+=		ac_cv_path_RAWCPP="${PREFIX}/bin/ucpp -t -c90 -Uunix"
-.elif empty(PKGSRC_COMPILER:Mgcc)
-CONFIGURE_ENV+=		ac_cv_path_RAWCPP="cc -E -Uunix -"
-.endif
+BUILD_DEPENDS+=		tradcpp-[0-9]*:../../devel/tradcpp
+CONFIGURE_ENV+=		ac_cv_path_RAWCPP="${PREFIX}/bin/tradcpp -Uunix"
 
 .include "options.mk"
 
diff --git a/x11/xdm/Makefile b/x11/xdm/Makefile
index d47bba8db326..8786a4d1b7e9 100644
--- a/x11/xdm/Makefile
+++ b/x11/xdm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2013/06/06 12:55:23 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2013/06/13 22:30:41 joerg Exp $
 
 DISTNAME=	xdm-1.1.11
 PKGREVISION=	4
@@ -48,12 +48,8 @@ OWN_DIRS_PERMS+=	${VARBASE}/lib/xdm \
 CFLAGS+=	-fno-strict-aliasing
 .endif
 
-.if !empty(PKGSRC_COMPILER:Mclang)
-BUILD_DEPENDS+=		ucpp-[0-9]*:../../devel/ucpp
-CONFIGURE_ENV+=		ac_cv_path_RAWCPP="${PREFIX}/bin/ucpp -t -c90 -Uunix"
-.elif empty(PKGSRC_COMPILER:Mgcc)
-CONFIGURE_ENV+=		ac_cv_path_RAWCPP="cc -E -Uunix -"
-.endif
+BUILD_DEPENDS+=		tradcpp-[0-9]*:../../devel/tradcpp
+CONFIGURE_ENV+=		ac_cv_path_RAWCPP="${PREFIX}/bin/tradcpp -Uunix"
 
 .if ${OPSYS} == "NetBSD"
 CONFIGURE_ARGS+=	--with-random-device=/dev/urandom
diff --git a/x11/xf86-video-sis/Makefile b/x11/xf86-video-sis/Makefile
index a5a09910b827..6ffe10bbe17f 100644
--- a/x11/xf86-video-sis/Makefile
+++ b/x11/xf86-video-sis/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2013/05/16 06:27:55 richard Exp $
+# $NetBSD: Makefile,v 1.16 2013/06/13 22:30:41 joerg Exp $
 #
 
 DISTNAME=	xf86-video-sis-0.10.7
@@ -18,12 +18,8 @@ USE_TOOLS+=	pkg-config
 
 .include "../../mk/bsd.prefs.mk"
 
-.if !empty(PKGSRC_COMPILER:Mclang)
-BUILD_DEPENDS+=		ucpp-[0-9]*:../../devel/ucpp
-CONFIGURE_ENV+=		ac_cv_path_RAWCPP="${PREFIX}/bin/ucpp -t -c90 -Uunix"
-.elif empty(PKGSRC_COMPILER:Mgcc)
-CONFIGURE_ENV+=		ac_cv_path_RAWCPP="cc -E -Uunix -"
-.endif
+BUILD_DEPENDS+=		tradcpp-[0-9]*:../../devel/tradcpp
+CONFIGURE_ENV+=		ac_cv_path_RAWCPP="${PREFIX}/bin/tradcpp -Uunix"
 
 .if ${OPSYS} == "SunOS"
 CONFIGURE_ENV+=	DRIVER_MAN_SUFFIX=4
diff --git a/x11/xinit/Makefile b/x11/xinit/Makefile
index c865862d8091..b8bb4a8ee8c8 100644
--- a/x11/xinit/Makefile
+++ b/x11/xinit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2012/10/29 05:07:12 asau Exp $
+# $NetBSD: Makefile,v 1.18 2013/06/13 22:30:41 joerg Exp $
 #
 
 DISTNAME=		xinit-1.3.2
@@ -15,14 +15,8 @@ GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-xinit=${PREFIX}/bin/xinit
 USE_TOOLS+=		pkg-config xauth:run
 
-.include "../../mk/compiler.mk"
-.if !empty(PKGSRC_COMPILER:Mclang)
-BUILD_DEPENDS+=		ucpp-[0-9]*:../../devel/ucpp
-CONFIGURE_ENV+=		ac_cv_path_RAWCPP="${PREFIX}/bin/ucpp -t -c90 -Uunix"
-.elif empty(PKGSRC_COMPILER:Mgcc)
-CONFIGURE_ENV+=		ac_cv_path_RAWCPP="cc -E -Uunix -"
-.endif
+BUILD_DEPENDS+=		tradcpp-[0-9]*:../../devel/tradcpp
+CONFIGURE_ENV+=		ac_cv_path_RAWCPP="${PREFIX}/bin/tradcpp -Uunix"
 
 .include "../../x11/libX11/buildlink3.mk"
-
 .include "../../mk/bsd.pkg.mk"