diff --git a/tools/lint/Makefile b/tools/lint/Makefile
index f247815b1b99..aab65871eaf5 100644
--- a/tools/lint/Makefile
+++ b/tools/lint/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2001/10/24 02:32:56 thorpej Exp $
+#	$NetBSD: Makefile,v 1.3 2001/10/25 02:23:21 thorpej Exp $
 
 XLINT_TARGET_PREFIX=${MACHINE_GNU_PLATFORM}-
 
@@ -8,4 +8,8 @@ HOST_CPPFLAGS=	-DPATH_LIBEXEC=\"${TOOLDIR}/libexec\"
 
 .include "${.CURDIR}/../Makefile.host"
 
+HOST_CPPFLAGS+=-DTARGET_PREFIX=\"${XLINT_TARGET_PREFIX}\"
+
+.include "${_CURDIR}/Makefile.inc"
+
 ${TIMESTAMP}: ${SRCS}
diff --git a/tools/lint/Makefile.inc b/tools/lint/Makefile.inc
new file mode 100644
index 000000000000..c7ed9d9eed88
--- /dev/null
+++ b/tools/lint/Makefile.inc
@@ -0,0 +1,15 @@
+#	$NetBSD: Makefile.inc,v 1.1 2001/10/25 02:23:21 thorpej Exp $
+
+HOST_CPPFLAGS+=-I${.CURDIR}/../lint1/arch/${MACHINE_CPU}
+
+.if ${OBJECT_FMT} == "a.out"
+HOST_CPPFLAGS+=-DTARGET_OBJFMT_AOUT
+.elif ${OBJECT_FMT} == "COFF"
+HOST_CPPFLAGS+=-DTARGET_OBJFMT_COFF
+.elif ${OBJECT_FMT} == "ELF"
+HOST_CPPFLAGS+=-DTARGET_OBJFMT_ELF
+.else
+.BEGIN:
+	@echo "Unrecognized OBJECT_FMT ${OBJECT_FMT}"
+	@false
+.endif
diff --git a/tools/lint1/Makefile b/tools/lint1/Makefile
index e182382607d9..43d3c6a6ff5d 100644
--- a/tools/lint1/Makefile
+++ b/tools/lint1/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2001/10/24 02:32:56 thorpej Exp $
+#	$NetBSD: Makefile,v 1.3 2001/10/25 02:23:21 thorpej Exp $
 
 XLINT_TARGET_PREFIX=${MACHINE_GNU_PLATFORM}-
 
@@ -8,4 +8,6 @@ HOST_BINDIR=	${TOOLDIR}/libexec
 
 .include "${.CURDIR}/../Makefile.host"
 
+.include "${_CURDIR}/../lint/Makefile.inc"
+
 ${TIMESTAMP}: ${SRCS}
diff --git a/tools/lint2/Makefile b/tools/lint2/Makefile
index cf7eff4c69f8..0db789bef60b 100644
--- a/tools/lint2/Makefile
+++ b/tools/lint2/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2001/10/24 02:32:57 thorpej Exp $
+#	$NetBSD: Makefile,v 1.3 2001/10/25 02:23:21 thorpej Exp $
 
 XLINT_TARGET_PREFIX=${MACHINE_GNU_PLATFORM}-
 
@@ -8,4 +8,6 @@ HOST_BINDIR=	${TOOLDIR}/libexec
 
 .include "${.CURDIR}/../Makefile.host"
 
+.include "${_CURDIR}/../lint/Makefile.inc"
+
 ${TIMESTAMP}: ${SRCS}