diff --git a/devel/bonobo/buildlink2.mk b/devel/bonobo/buildlink2.mk
index 7ccda482999c..fbb01b0bffc4 100644
--- a/devel/bonobo/buildlink2.mk
+++ b/devel/bonobo/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:25 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2002/09/23 02:28:36 jlam Exp $
 
 .if !defined(BONOBO_BUILDLINK2_MK)
 BONOBO_BUILDLINK2_MK=	# defined
@@ -19,7 +19,8 @@ BUILDLINK_FILES.bonobo+=	lib/libbonobo-print.*
 BUILDLINK_FILES.bonobo+=	lib/libefs.*
 BUILDLINK_FILES.bonobo+=	share/idl/Bonobo*.idl
 
-CPPFLAGS+=	-I${BUILDLINK_PREFIX.bonobo}/include/gnome-1.0
+BUILDLINK_CPPFLAGS.bonobo=	-I${BUILDLINK_PREFIX.bonobo}/include/gnome-1.0
+CPPFLAGS+=			${BUILDLINK_CPPFLAGS.bonobo}
 
 .include "../../graphics/freetype2/buildlink2.mk"
 .include "../../graphics/gdk-pixbuf-gnome/buildlink2.mk"
diff --git a/devel/glib2/buildlink2.mk b/devel/glib2/buildlink2.mk
index 1205a08c2343..606f196a16b5 100644
--- a/devel/glib2/buildlink2.mk
+++ b/devel/glib2/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.5 2002/09/11 11:24:40 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.6 2002/09/23 02:28:37 jlam Exp $
 
 .if !defined(GLIB2_BUILDLINK2_MK)
 GLIB2_BUILDLINK2_MK=	# defined
@@ -26,8 +26,8 @@ PTHREAD_OPTS+=	native
 .include "../../mk/pthread.buildlink2.mk"
 
 .if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "none")
-CPPFLAGS+=	-I${BUILDLINK_PREFIX.ptl2}/PTL/include
 .  include "../../devel/ptl2/buildlink2.mk"
+CPPFLAGS+=	${BUILDLINK_CPPFLAGS.ptl2}
 .endif
 
 BUILDLINK_TARGETS+=	glib2-buildlink
diff --git a/devel/libglade/buildlink2.mk b/devel/libglade/buildlink2.mk
index 8942a263a0ac..15dd33005988 100644
--- a/devel/libglade/buildlink2.mk
+++ b/devel/libglade/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.4 2002/09/22 09:43:16 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.5 2002/09/23 02:28:37 jlam Exp $
 
 .if !defined(LIBGLADE_BUILDLINK2_MK)
 LIBGLADE_BUILDLINK2_MK=	# defined
@@ -13,7 +13,10 @@ BUILDLINK_FILES.libglade=	include/libglade-1.0/glade/*
 BUILDLINK_FILES.libglade+=	lib/libglade.*
 BUILDLINK_FILES.libglade+=	lib/libglade-gnome.*
 
-CPPFLAGS+=	-I${BUILDLINK_PREFIX.libglade}/include/libglade-1.0
+BUILDLINK_CPPFLAGS.libglade= \
+	-I${BUILDLINK_PREFIX.libglade}/include/libglade-1.0
+
+CPPFLAGS+=	${BUILDLINK_CPPFLAGS.libglade}
 
 .include "../../audio/esound/buildlink2.mk"
 .include "../../devel/gettext-lib/buildlink2.mk"
diff --git a/devel/libglade2/buildlink2.mk b/devel/libglade2/buildlink2.mk
index 08a350b9e176..38cf2325ac92 100644
--- a/devel/libglade2/buildlink2.mk
+++ b/devel/libglade2/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.3 2002/09/22 09:52:35 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2002/09/23 02:28:38 jlam Exp $
 
 .if !defined(LIBGLADE2_BUILDLINK2_MK)
 LIBGLADE2_BUILDLINK2_MK=	# defined
@@ -12,7 +12,10 @@ BUILDLINK_PREFIX.libglade2_DEFAULT=	${LOCALBASE}
 BUILDLINK_FILES.libglade2=	include/libglade-2.0/glade/*
 BUILDLINK_FILES.libglade2+=	lib/libglade-2.0.*
 
-CPPFLAGS+=			-I${BUILDLINK_DIR}/include/libglade-2.0
+BUILDLINK_CPPFLAGS.libglade2= \
+	-I${BUILDLINK_PREFIX.libglade2}/include/libglade-2.0
+
+CPPFLAGS+=	${BUILDLINK_CPPFLAGS.libglade2}
 
 .include "../../textproc/libxml2/buildlink2.mk"
 .include "../../x11/gtk2/buildlink2.mk"
diff --git a/devel/ptl2/buildlink2.mk b/devel/ptl2/buildlink2.mk
index 7d9b67d610f3..708072857070 100644
--- a/devel/ptl2/buildlink2.mk
+++ b/devel/ptl2/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:38 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2002/09/23 02:28:38 jlam Exp $
 
 .if !defined(PTL2_BUILDLINK2_MK)
 PTL2_BUILDLINK2_MK=	# defined
@@ -14,6 +14,8 @@ BUILDLINK_FILES.ptl2+=		PTL/include/*/*.h
 BUILDLINK_FILES.ptl2+=		PTL/include/*.h
 BUILDLINK_FILES.ptl2+=		lib/libPTL.*
 
+BUILDLINK_CPPFLAGS.ptl2=	-I${BUILDLINK_PREFIX.ptl2}/PTL/include
+
 BUILDLINK_TARGETS+=	ptl2-buildlink
 
 ptl2-buildlink: _BUILDLINK_USE
diff --git a/x11/fox/buildlink2.mk b/x11/fox/buildlink2.mk
index cf12732e8a1b..6aa1f31a098f 100644
--- a/x11/fox/buildlink2.mk
+++ b/x11/fox/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:23:27 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2002/09/23 02:28:38 jlam Exp $
 
 .if !defined(FOX_BUILDLINK2_MK)
 FOX_BUILDLINK2_MK=	# defined
@@ -13,7 +13,8 @@ BUILDLINK_FILES.fox=	include/fox/*
 BUILDLINK_FILES.fox+=	lib/libFOX-*
 BUILDLINK_FILES.fox+=	lib/libFOX.*
 
-CPPFLAGS+=	-I${BUILDLINK_PREFIX.fox}/include/fox
+BUILDLINK_CPPFLAGS.fox+=	-I${BUILDLINK_PREFIX.fox}/include/fox
+CPPFLAGS+=			${BUILDLINK_CPPFLAGS.fox}
 
 BUILDLINK_TARGETS+=	fox-buildlink
 
diff --git a/x11/wx1Motif/buildlink2.mk b/x11/wx1Motif/buildlink2.mk
index 78846b21c4ec..e5b4e0e99847 100644
--- a/x11/wx1Motif/buildlink2.mk
+++ b/x11/wx1Motif/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:23:59 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2002/09/23 02:28:39 jlam Exp $
 
 .if !defined(WX1MOTIF_BUILDLINK2_MK)
 WX1MOTIF_BUILDLINK2_MK=	# defined
@@ -13,13 +13,15 @@ BUILDLINK_PREFIX.wx1Motif_DEFAULT=	${X11PREFIX}
 BUILDLINK_FILES.wx1Motif=	include/wxwindows1/*
 BUILDLINK_FILES.wx1Motif+=	lib/wxwindows1/libwx_motif.a
 
-WX1MOTIF_CPPFLAGS=        -I${BUILDLINK_PREFIX.wx1Motif}/include/wxwindows1
-WX1MOTIF_LDFLAGS=         -L${BUILDLINK_PREFIX.wx1Motif}/lib/wxwindows1
+BUILDLINK_CPPFLAGS.wx1Motif= \
+	-I${BUILDLINK_PREFIX.wx1Motif}/include/wxwindows1
+BUILDLINK_LDFLAGS.wx1Motif= \
+	-L${BUILDLINK_PREFIX.wx1Motif}/lib/wxwindows1
 
-CFLAGS+=                ${WX1MOTIF_CPPFLAGS}
-CXXFLAGS+=              ${WX1MOTIF_CPPFLAGS}
-CPPFLAGS+=              ${WX1MOTIF_CPPFLAGS}
-LDFLAGS+=               ${WX1MOTIF_LDFLAGS}
+CFLAGS+=		${BUILDLINK_CPPFLAGS.wx1Motif}
+CXXFLAGS+=		${BUILDLINK_CPPFLAGS.wx1Motif}
+CPPFLAGS+=		${BUILDLINK_CPPFLAGS.wx1Motif}
+LDFLAGS+=		${BUILDLINK_LDFLAGS.wx1Motif}
 
 .include "../../mk/motif.buildlink2.mk"