Index: head/gnu/usr.bin/cc/cc1/Makefile
===================================================================
--- head/gnu/usr.bin/cc/cc1/Makefile	(revision 60883)
+++ head/gnu/usr.bin/cc/cc1/Makefile	(revision 60884)
@@ -1,34 +1,35 @@
 # $FreeBSD$
 
 .include "../Makefile.inc"
 
 .PATH: ../cc_tools ${GCCDIR}
  
 PROG=	cc1
 SRCS=	c-parse.c c-parse.h c-lang.c
-SRCS+=	c-lex.c
+# Ugh, compiled twice...
+SRCS+=	c-decl.c c-lex.c
 BINDIR=	/usr/libexec
 NOMAN=	1
 NOSHARED=yes
 
 CFLAGS+= -I.
 
 DPADD+=	${LIBCC_INT} 
 LDADD+=	${LIBCC_INT}
 
 #-----------------------------------------------------------------------
 # C parser
 .ORDER: c-parse.c c-parse.h
 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
 	${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
 
 #-----------------------------------------------------------------------
 
 .include <bsd.prog.mk>
Index: head/gnu/usr.bin/cc/cc1obj/Makefile
===================================================================
--- head/gnu/usr.bin/cc/cc1obj/Makefile	(revision 60883)
+++ head/gnu/usr.bin/cc/cc1obj/Makefile	(revision 60884)
@@ -1,36 +1,36 @@
 # $FreeBSD$
 
 .include "../Makefile.inc"
 
 .PATH: ../cc_tools ${GCCDIR}/objc ${GCCDIR}
 
 PROG=	cc1obj
 SRCS=	objc-parse.c objc-parse.h objc-parse.h objc-act.c
 # Ugh, compiled twice...
-SRCS+=	c-lex.c
+SRCS+=	c-decl.c c-lex.c
 BINDIR=	/usr/libexec
 NOMAN=	1
 NOSHARED=yes
 
 CFLAGS+= -I${GCCDIR}/objc -I.
 
 DPADD+=	${LIBCC_INT} 
 LDADD+=	${LIBCC_INT}
 
 #-----------------------------------------------------------------------
 # objc parser
 .ORDER: objc-parse.c objc-parse.h
 objc-parse.c objc-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
 	${YACC} -d -o objc-parse.c objc-parse.y
 	ln -sf objc-parse.h c-parse.h
 	mv objc-parse.y objc-parse.y.out
 
 CLEANFILES+=	objc-parse.c objc-parse.h c-parse.h \
 		objc-parse.y objc-parse.y.out	# insurance
 
 #-----------------------------------------------------------------------
 
 .include <bsd.prog.mk>
Index: head/gnu/usr.bin/cc/cc_int/Makefile
===================================================================
--- head/gnu/usr.bin/cc/cc_int/Makefile	(revision 60883)
+++ head/gnu/usr.bin/cc/cc_int/Makefile	(revision 60884)
@@ -1,45 +1,45 @@
 # $FreeBSD$
 
 .include "../Makefile.inc"
 
 .PATH: ../cc_tools ${GCCDIR}/config/${GCC_ARCH} ${GCCDIR}
 
 LIB=		cc_int
 NOPROFILE=	YES
 NOPIC=		YES
 
-SRCS=	c-aux-info.c c-common.c c-convert.c c-decl.c c-iterate.c \
+SRCS=	c-aux-info.c c-common.c c-convert.c c-iterate.c \
 	c-pragma.c c-typeck.c \
 	caller-save.c calls.c combine.c convert.c cse.c \
 	dbxout.c dwarfout.c emit-rtl.c explow.c expmed.c expr.c \
 	final.c flow.c fold-const.c function.c getpwd.c global.c graph.c \
 	hash.c insn-attrtab.c insn-emit.c insn-extract.c insn-opinit.c \
 	insn-output.c insn-peep.c insn-recog.c \
 	integrate.c jump.c lcm.c local-alloc.c loop.c optabs.c \
 	print-rtl.c print-tree.c real.c recog.c reg-stack.c regclass.c \
 	reload.c reload1.c reorg.c rtl.c rtlanal.c \
 	sbitmap.c sdbout.c stmt.c stor-layout.c stupid.c \
 	toplev.c tree.c unroll.c varasm.c version.c xcoffout.c \
 	alias.c bitmap.c dwarf2out.c dyn-string.c except.c \
 	gcse.c genrtl.c profile.c regmove.c varray.c \
 	${OUT_FILE}
 .if defined(USE_EGCS_HAIFA) && ${USE_EGCS_HAIFA} == 1
 SRCS+=	haifa-sched.c
 .else
 SRCS+=	sched.c
 .endif
 
 #	shared between the drivers
 SRCS+=	multilib.h choose-temp.c obstack.c prefix.c pexecute.c version.c
 
 #	stuff that makes libiberty now required (2.95) and shouldn't be...
 SRCS+=	obstack.c splay-tree.c
 
 CFLAGS+=	-DTARGET_NAME=\"${target}\" -DIN_GCC
 
 install:
 	@true
 
 ${OUT_OBJ}.o ${OUT_OBJ}.So:	${OUT_FILE}
 
 .include <bsd.lib.mk>