diff --git a/gnu/usr.bin/binutils/as/Makefile.inc0 b/gnu/usr.bin/binutils/as/Makefile.inc0
index 9b3ccb1b3787..2acd1cac1b63 100644
--- a/gnu/usr.bin/binutils/as/Makefile.inc0
+++ b/gnu/usr.bin/binutils/as/Makefile.inc0
@@ -3,9 +3,9 @@
 .include "${.CURDIR}/../../Makefile.inc0"
 
 RELTOP:= ../${RELTOP}
-
 .PATH: ${SRCDIR}/gas ${SRCDIR}/gas/config
 
+PROG=	as
 MAN=	doc/as.1
 SRCS+=	app.c as.c atof-generic.c atof-ieee.c bignum-copy.c \
 	cond.c dwarf2dbg.c ecoff.c expr.c flonum-copy.c flonum-konst.c \
@@ -13,7 +13,7 @@ SRCS+=	app.c as.c atof-generic.c atof-ieee.c bignum-copy.c \
 	input-scrub.c listing.c literal.c macro.c messages.c \
 	output-file.c read.c sb.c stabs.c \
 	subsegs.c symbols.c write.c depend.c ehopt.c
-CFLAGS+= -I${SRCDIR}/gas -I${SRCDIR}/gas/config -I${SRCDIR}
+CFLAGS+= -I${SRCDIR}/gas -I${SRCDIR}/gas/config -I${SRCDIR} -I${.CURDIR}/..
 CFLAGS+= -DVERSION=\"${VERSION}\" -DBFD_VERSION=\"${VERSION}\"
 NOSHARED?=	yes
 DPADD=	${RELTOP}/libbfd/libbfd.a
diff --git a/gnu/usr.bin/binutils/as/alpha-freebsd/Makefile b/gnu/usr.bin/binutils/as/alpha-freebsd/Makefile
index f35fe71088f6..c275d3030a67 100644
--- a/gnu/usr.bin/binutils/as/alpha-freebsd/Makefile
+++ b/gnu/usr.bin/binutils/as/alpha-freebsd/Makefile
@@ -1,14 +1,11 @@
-#
 # $FreeBSD$
-#
 
 .include "${.CURDIR}/../Makefile.inc0"
 
-PROG=		as
-.if	${TARGET_ARCH} != "alpha"
-NOMAN=		1
-BINDIR=		/usr/libexec/cross/alpha-freebsd
+.if ${TARGET_ARCH} != "alpha"
+NOMAN=	true
+BINDIR=	/usr/libexec/cross/alpha-freebsd
 .endif
-SRCS+=		obj-elf.c tc-alpha.c
+SRCS+=	obj-elf.c tc-alpha.c
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/binutils/as/alpha-freebsd/obj-format.h b/gnu/usr.bin/binutils/as/alpha-freebsd/obj-format.h
deleted file mode 100644
index 69c64aac8849..000000000000
--- a/gnu/usr.bin/binutils/as/alpha-freebsd/obj-format.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "obj-elf.h"
diff --git a/gnu/usr.bin/binutils/as/alpha-freebsd/targ-env.h b/gnu/usr.bin/binutils/as/alpha-freebsd/targ-env.h
deleted file mode 100644
index 032e7acdf218..000000000000
--- a/gnu/usr.bin/binutils/as/alpha-freebsd/targ-env.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "te-freebsd.h"
diff --git a/gnu/usr.bin/binutils/as/i386-freebsd/Makefile b/gnu/usr.bin/binutils/as/i386-freebsd/Makefile
index 7437e27ecf97..1cfcb0cfae80 100644
--- a/gnu/usr.bin/binutils/as/i386-freebsd/Makefile
+++ b/gnu/usr.bin/binutils/as/i386-freebsd/Makefile
@@ -1,14 +1,11 @@
-#
 # $FreeBSD$
-#
 
 .include "${.CURDIR}/../Makefile.inc0"
 
-PROG=		as
-NOMAN=		1
-.if	${TARGET_ARCH} != "i386"
-BINDIR=		/usr/libexec/cross/i386-freebsd
+NOMAN=	true
+.if ${TARGET_ARCH} != "i386"
+BINDIR=	/usr/libexec/cross/i386-freebsd
 .endif
-SRCS+=		obj-elf.c tc-i386.c
+SRCS+=	obj-elf.c tc-i386.c
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/binutils/as/i386-freebsd/obj-format.h b/gnu/usr.bin/binutils/as/i386-freebsd/obj-format.h
deleted file mode 100644
index 69c64aac8849..000000000000
--- a/gnu/usr.bin/binutils/as/i386-freebsd/obj-format.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "obj-elf.h"
diff --git a/gnu/usr.bin/binutils/as/i386-freebsd/targ-env.h b/gnu/usr.bin/binutils/as/i386-freebsd/targ-env.h
deleted file mode 100644
index 032e7acdf218..000000000000
--- a/gnu/usr.bin/binutils/as/i386-freebsd/targ-env.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "te-freebsd.h"
diff --git a/gnu/usr.bin/binutils/as/i386-winnt/Makefile b/gnu/usr.bin/binutils/as/i386-winnt/Makefile
index a0633aaef384..3305629485a7 100644
--- a/gnu/usr.bin/binutils/as/i386-winnt/Makefile
+++ b/gnu/usr.bin/binutils/as/i386-winnt/Makefile
@@ -1,12 +1,9 @@
-#
 # $FreeBSD$
-#
 
 .include "${.CURDIR}/../Makefile.inc0"
 
-PROG=		as
-NOMAN=		1
-BINDIR=		/usr/libexec/cross/i386-winnt
-SRCS+=		obj-coff.c tc-i386.c
+NOMAN=	true
+BINDIR=	/usr/libexec/cross/i386-winnt
+SRCS+=	obj-coff.c tc-i386.c
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/binutils/as/m68k-freebsd/Makefile b/gnu/usr.bin/binutils/as/m68k-freebsd/Makefile
index c809fffd0097..bd3d276fe84e 100644
--- a/gnu/usr.bin/binutils/as/m68k-freebsd/Makefile
+++ b/gnu/usr.bin/binutils/as/m68k-freebsd/Makefile
@@ -1,12 +1,9 @@
-#
 # $FreeBSD$
-#
 
 .include "${.CURDIR}/../Makefile.inc0"
 
-PROG=		as
-NOMAN=		1
-BINDIR=		/usr/libexec/cross/m68k-freebsd
-SRCS+=		obj-elf.c tc-m68k.c m68k-parse.c
+NOMAN=	true
+BINDIR=	/usr/libexec/cross/m68k-freebsd
+SRCS+=	obj-elf.c tc-m68k.c m68k-parse.c
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/binutils/as/m68k-netbsdaout/Makefile b/gnu/usr.bin/binutils/as/m68k-netbsdaout/Makefile
index 61386e40ad5f..a8c7e57f82f6 100644
--- a/gnu/usr.bin/binutils/as/m68k-netbsdaout/Makefile
+++ b/gnu/usr.bin/binutils/as/m68k-netbsdaout/Makefile
@@ -1,12 +1,9 @@
-#
 # $FreeBSD$
-#
 
 .include "${.CURDIR}/../Makefile.inc0"
 
-PROG=		as
-NOMAN=		1
-BINDIR=		/usr/libexec/cross/m68k-netbsdaout
-SRCS+=		obj-aout.c tc-m68k.c m68k-parse.c
+NOMAN=	true
+BINDIR=	/usr/libexec/cross/m68k-netbsdaout
+SRCS+=	obj-aout.c tc-m68k.c m68k-parse.c
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/binutils/as/powerpc-freebsd/obj-format.h b/gnu/usr.bin/binutils/as/obj-format.h
similarity index 97%
rename from gnu/usr.bin/binutils/as/powerpc-freebsd/obj-format.h
rename to gnu/usr.bin/binutils/as/obj-format.h
index 95f2014d7ea2..02a3030e1ad3 100644
--- a/gnu/usr.bin/binutils/as/powerpc-freebsd/obj-format.h
+++ b/gnu/usr.bin/binutils/as/obj-format.h
@@ -1,2 +1,3 @@
 /* $FreeBSD$ */
+
 #include "obj-elf.h"
diff --git a/gnu/usr.bin/binutils/as/powerpc-freebsd/Makefile b/gnu/usr.bin/binutils/as/powerpc-freebsd/Makefile
index d216189c427f..98ef3dd9e3de 100644
--- a/gnu/usr.bin/binutils/as/powerpc-freebsd/Makefile
+++ b/gnu/usr.bin/binutils/as/powerpc-freebsd/Makefile
@@ -2,15 +2,14 @@
 
 .include "${.CURDIR}/../Makefile.inc0"
 
-PROG=		as
-.if	${TARGET_ARCH} != "powerpc"
-NOMAN=		1
-BINDIR=		/usr/libexec/cross/powerpc-freebsd
+.if ${TARGET_ARCH} != "powerpc"
+NOMAN=	true
+BINDIR=	/usr/libexec/cross/powerpc-freebsd
 # If we aren't doing cross-assembling, some operations can be optimized, since
 # byte orders and value sizes don't need to be adjusted.
-CFLAGS+=	-DCROSS_COMPILE=1
+CFLAGS+= -DCROSS_COMPILE=1
 .endif
-SRCS+=		obj-elf.c tc-ppc.c
+SRCS+=	obj-elf.c tc-ppc.c
 
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/binutils/as/powerpc-freebsd/targ-env.h b/gnu/usr.bin/binutils/as/powerpc-freebsd/targ-env.h
deleted file mode 100644
index f8f050edc681..000000000000
--- a/gnu/usr.bin/binutils/as/powerpc-freebsd/targ-env.h
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "te-freebsd.h"
diff --git a/gnu/usr.bin/binutils/as/sparc64-freebsd/Makefile b/gnu/usr.bin/binutils/as/sparc64-freebsd/Makefile
index 85abe7d2ee71..258808b2bba4 100644
--- a/gnu/usr.bin/binutils/as/sparc64-freebsd/Makefile
+++ b/gnu/usr.bin/binutils/as/sparc64-freebsd/Makefile
@@ -1,17 +1,14 @@
-#
 # $FreeBSD$
-#
 
 .include "${.CURDIR}/../Makefile.inc0"
 
-PROG=		as
-.if	${TARGET_ARCH} != "sparc64"
-NOMAN=		1
-BINDIR=		/usr/libexec/cross/sparc64-freebsd
+.if ${TARGET_ARCH} != "sparc64"
+NOMAN=	true
+BINDIR=	/usr/libexec/cross/sparc64-freebsd
 # If we aren't doing cross-assembling, some operations can be optimized, since
 # byte orders and value sizes don't need to be adjusted.
-CFLAGS+=	-DCROSS_COMPILE=1
+CFLAGS+= -DCROSS_COMPILE=1
 .endif
-SRCS+=		obj-elf.c tc-sparc.c
+SRCS+=	obj-elf.c tc-sparc.c
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/binutils/as/sparc64-freebsd/obj-format.h b/gnu/usr.bin/binutils/as/sparc64-freebsd/obj-format.h
deleted file mode 100644
index 95f2014d7ea2..000000000000
--- a/gnu/usr.bin/binutils/as/sparc64-freebsd/obj-format.h
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "obj-elf.h"
diff --git a/gnu/usr.bin/binutils/as/sparc64-freebsd/targ-env.h b/gnu/usr.bin/binutils/as/targ-env.h
similarity index 97%
rename from gnu/usr.bin/binutils/as/sparc64-freebsd/targ-env.h
rename to gnu/usr.bin/binutils/as/targ-env.h
index f8f050edc681..8e14d63ff12d 100644
--- a/gnu/usr.bin/binutils/as/sparc64-freebsd/targ-env.h
+++ b/gnu/usr.bin/binutils/as/targ-env.h
@@ -1,2 +1,3 @@
 /* $FreeBSD$ */
+
 #include "te-freebsd.h"