diff --git a/external/gpl3/gcc/lib/libbacktrace/Makefile b/external/gpl3/gcc/lib/libbacktrace/Makefile
index 2e88421c125e..cbc856f93cee 100644
--- a/external/gpl3/gcc/lib/libbacktrace/Makefile
+++ b/external/gpl3/gcc/lib/libbacktrace/Makefile
@@ -1,14 +1,14 @@
 #	$NetBSD
 
-DIST=		${NETBSDSRCDIR}/external/gpl3/gcc/dist
-GNUHOSTDIST=    ${DIST}
-
 LIBISPRIVATE=   yes
 
-.include <bsd.own.mk>
+.include <bsd.init.mk>
 
 LIB=		backtrace
 
+DIST=		${GCCDIST}
+GNUHOSTDIST=    ${DIST}
+
 SRCS=		dwarf.c elf.c fileline.c mmap.c mmapio.c nounwind.c \
 		posix.c print.c state.c
 		
diff --git a/external/gpl3/gcc/lib/liblto_plugin/Makefile b/external/gpl3/gcc/lib/liblto_plugin/Makefile
index e88e608debc1..e4ed8498db79 100644
--- a/external/gpl3/gcc/lib/liblto_plugin/Makefile
+++ b/external/gpl3/gcc/lib/liblto_plugin/Makefile
@@ -1,19 +1,21 @@
-#	$NetBSD: Makefile,v 1.1 2014/03/01 10:00:42 mrg Exp $
+#	$NetBSD: Makefile,v 1.2 2014/06/01 20:24:45 mrg Exp $
 
-.include <bsd.own.mk>
+.include <bsd.init.mk>
 .include <bsd.shlib.mk>
 
-NOLINT=		# defined
+LIB=		liblto_plugin
+
+DIST=		${GCCDIST}
+GNUHOSTDIST=	${DIST}
+
+SRCS=		lto-plugin.c
+
+CPPFLAGS+=	-DHAVE_CONFIG_H -I${DIST}/include -I.
 
 LIBISMODULE=	1
 USE_SHLIBDIR=	yes
 REQUIRETOOLS=	yes
-DIST=		${NETBSDSRCDIR}/external/gpl3/gcc/dist
-GNUHOSTDIST=	${DIST}
-LIB=		liblto_plugin
-SRCS=		lto-plugin.c
-.PATH:	${DIST}/lto-plugin
-CPPFLAGS+=	-DHAVE_CONFIG_H -I${DIST}/include -I.
+NOLINT=		# defined
 
 # make this /usr/lib/gcc?
 LIBDIR=		/usr/libexec
@@ -45,6 +47,8 @@ config.h: Makefile
 
 .include <bsd.lib.mk>
 
+.PATH:	${DIST}/lto-plugin
+
 .else
 .include <bsd.prog.mk> # do nothing
 .endif
diff --git a/external/gpl3/gcc/lib/libstdc++-v3/include/pb/Makefile b/external/gpl3/gcc/lib/libstdc++-v3/include/pb/Makefile
index 1480ba75fc09..7890ca3426a9 100644
--- a/external/gpl3/gcc/lib/libstdc++-v3/include/pb/Makefile
+++ b/external/gpl3/gcc/lib/libstdc++-v3/include/pb/Makefile
@@ -1,13 +1,13 @@
-#	$NetBSD: Makefile,v 1.1 2014/03/01 10:00:48 mrg Exp $
+#	$NetBSD: Makefile,v 1.2 2014/06/01 20:24:45 mrg Exp $
 
-.include <bsd.own.mk>
 .include <bsd.init.mk>
 
 .include "${.CURDIR}/../../arch/${GCC_MACHINE_ARCH}/defs.mk"
 
 .cc: # disable .cc->NULL transform
 
-DIST=		${NETBSDSRCDIR}/external/gpl3/gcc/dist
+DIST=		${GCCDIST}
+GNUHOSTDIST=	${DIST}
 
 INCS=		${G_pb_headers1} ${G_pb_headers2} ${G_pb_headers3} ${G_pb_headers4}
 INCS+=		${G_pb_headers5} ${G_pb_headers6} ${G_pb_headers7}
diff --git a/external/gpl3/gcc/lib/libstdc++-v3/include/profile/Makefile b/external/gpl3/gcc/lib/libstdc++-v3/include/profile/Makefile
index cbe9639498b5..3a8d699d6a7a 100644
--- a/external/gpl3/gcc/lib/libstdc++-v3/include/profile/Makefile
+++ b/external/gpl3/gcc/lib/libstdc++-v3/include/profile/Makefile
@@ -1,13 +1,13 @@
-#	$NetBSD: Makefile,v 1.1 2014/03/01 10:00:48 mrg Exp $
+#	$NetBSD: Makefile,v 1.2 2014/06/01 20:24:45 mrg Exp $
 
-.include <bsd.own.mk>
 .include <bsd.init.mk>
 
 .include "${.CURDIR}/../../arch/${GCC_MACHINE_ARCH}/defs.mk"
 
 .cc: # disable .cc->NULL transform
 
-DIST=		${NETBSDSRCDIR}/external/gpl3/gcc/dist
+DIST=		${GCCDIST}
+GNUHOSTDIST=	${DIST}
 
 INCS=		${G_profile_headers} ${G_profile_impl_headers}
 INCSDIR=	/usr/include/g++/profile
diff --git a/external/gpl3/gcc/lib/libstdc++-v3/include/tr2/Makefile b/external/gpl3/gcc/lib/libstdc++-v3/include/tr2/Makefile
index 2c5f33c6880f..487e615fe290 100644
--- a/external/gpl3/gcc/lib/libstdc++-v3/include/tr2/Makefile
+++ b/external/gpl3/gcc/lib/libstdc++-v3/include/tr2/Makefile
@@ -1,13 +1,13 @@
-#	$NetBSD: Makefile,v 1.1 2014/03/01 10:00:48 mrg Exp $
+#	$NetBSD: Makefile,v 1.2 2014/06/01 20:24:45 mrg Exp $
 
-.include <bsd.own.mk>
 .include <bsd.init.mk>
 
 .include "${.CURDIR}/../../arch/${GCC_MACHINE_ARCH}/defs.mk"
 
 .cc: # disable .cc->NULL transform
 
-DIST=		${NETBSDSRCDIR}/external/gpl3/gcc/dist
+DIST=		${GCCDIST}
+GNUHOSTDIST=	${DIST}
 
 INCS=		${G_tr2_headers}
 INCSDIR=	/usr/include/g++/tr2