diff --git a/gnu/usr.bin/cc/cc1/Makefile b/gnu/usr.bin/cc/cc1/Makefile
index 573fc52af37..22ca8643b32 100644
--- a/gnu/usr.bin/cc/cc1/Makefile
+++ b/gnu/usr.bin/cc/cc1/Makefile
@@ -23,12 +23,10 @@ LDADD+=	${LIBCC_INT}
 c-parse.c c-parse.h: c-parse.in
 	sed -e "/^ifobjc$$/,/^end ifobjc$$/d" \
 	    -e "/^ifc$$/d" -e "/^end ifc$$/d" \
-	    ${GCCDIR}/c-parse.in > c-parse.y
+	    ${.ALLSRC} > c-parse.y
 	${YACC} -d -o c-parse.c c-parse.y
-	mv c-parse.y c-parse.y.out
 
-CLEANFILES+=	c-parse.c c-parse.h \
-		c-parse.y c-parse.y.out		# insurance
+CLEANFILES+=	c-parse.c c-parse.h c-parse.y 		# insurance
 
 #-----------------------------------------------------------------------
 
diff --git a/gnu/usr.bin/cc/cc1obj/Makefile b/gnu/usr.bin/cc/cc1obj/Makefile
index 876d089822a..7bf9545f550 100644
--- a/gnu/usr.bin/cc/cc1obj/Makefile
+++ b/gnu/usr.bin/cc/cc1obj/Makefile
@@ -23,13 +23,11 @@ LDADD+=	${LIBCC_INT}
 objc-parse.c c-parse.h: c-parse.in
 	sed -e "/^ifc$$/,/^end ifc$$/d" \
 	    -e "/^ifobjc$$/d" -e "/^end ifobjc$$/d" \
-	    ${GCCDIR}/c-parse.in > objc-parse.y
+	    ${.ALLSRC} > objc-parse.y
 	${YACC} -d -o objc-parse.c objc-parse.y
 	mv objc-parse.h c-parse.h
-	mv objc-parse.y objc-parse.y.out
 
-CLEANFILES+=	objc-parse.c c-parse.h \
-		objc-parse.y objc-parse.y.out	# insurance
+CLEANFILES+=	objc-parse.c c-parse.h objc-parse.y 	# insurance
 
 #-----------------------------------------------------------------------
 
diff --git a/gnu/usr.bin/cc/cc1plus/Makefile b/gnu/usr.bin/cc/cc1plus/Makefile
index b157b8267f5..7b95f4d2b71 100644
--- a/gnu/usr.bin/cc/cc1plus/Makefile
+++ b/gnu/usr.bin/cc/cc1plus/Makefile
@@ -20,7 +20,7 @@ LDADD+=	${LIBCC_INT}
 
 .ORDER: parse.c parse.h
 parse.c parse.h: parse.y
-	${YACC} -d -o parse.c ${GCCDIR}/cp/parse.y
+	${YACC} -d -o parse.c ${.ALLSRC}
 	grep '^#define[   ]*YYEMPTY' parse.c >>parse.h
 
 CLEANFILES+=	parse.c parse.h