diff --git a/usr.bin/tn3270/api/astosc.c b/usr.bin/tn3270/api/astosc.c
index 47f1eee3ea7f..fb707f9cd252 100644
--- a/usr.bin/tn3270/api/astosc.c
+++ b/usr.bin/tn3270/api/astosc.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: astosc.c,v 1.7 2003/08/07 11:16:25 agc Exp $	*/
+/*	$NetBSD: astosc.c,v 1.8 2006/03/20 01:34:49 gdamore Exp $	*/
 
 /*-
  * Copyright (c) 1988 The Regents of the University of California.
@@ -29,14 +29,16 @@
  * SUCH DAMAGE.
  */
 
+#ifndef HOST_TOOL
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
 #if 0
 static char sccsid[] = "@(#)astosc.c	4.2 (Berkeley) 4/26/91";
 #else
-__RCSID("$NetBSD: astosc.c,v 1.7 2003/08/07 11:16:25 agc Exp $");
+__RCSID("$NetBSD: astosc.c,v 1.8 2006/03/20 01:34:49 gdamore Exp $");
 #endif
 #endif /* not lint */
+#endif
 
 #include <ctype.h>
 
diff --git a/usr.bin/tn3270/ctlr/function.c b/usr.bin/tn3270/ctlr/function.c
index 1b5359be4ea9..6854ac69a519 100644
--- a/usr.bin/tn3270/ctlr/function.c
+++ b/usr.bin/tn3270/ctlr/function.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: function.c,v 1.5 2003/08/07 11:16:30 agc Exp $	*/
+/*	$NetBSD: function.c,v 1.6 2006/03/20 01:34:49 gdamore Exp $	*/
 
 /*-
  * Copyright (c) 1988 The Regents of the University of California.
@@ -29,14 +29,16 @@
  * SUCH DAMAGE.
  */
 
+#ifndef HOST_TOOL
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)function.c	4.2 (Berkeley) 4/26/91";
 #else
-__RCSID("$NetBSD: function.c,v 1.5 2003/08/07 11:16:30 agc Exp $");
+__RCSID("$NetBSD: function.c,v 1.6 2006/03/20 01:34:49 gdamore Exp $");
 #endif
 #endif /* not lint */
+#endif
 
 /*
  * This file, which never produces a function.o, is used solely to
diff --git a/usr.bin/tn3270/tools/mkdctype/ectype.c b/usr.bin/tn3270/tools/mkdctype/ectype.c
index db1d4cae07b7..6a1bd3facac1 100644
--- a/usr.bin/tn3270/tools/mkdctype/ectype.c
+++ b/usr.bin/tn3270/tools/mkdctype/ectype.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ectype.c,v 1.6 2003/08/07 11:16:40 agc Exp $	*/
+/*	$NetBSD: ectype.c,v 1.7 2006/03/20 01:34:49 gdamore Exp $	*/
 
 /*-
  * Copyright (c) 1988 The Regents of the University of California.
@@ -29,14 +29,16 @@
  * SUCH DAMAGE.
  */
 
+#ifndef HOST_TOOL
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
 #if 0
 static char sccsid[] = "from: @(#)ectype.c	4.2 (Berkeley) 4/26/91";*/
 #else
-__RCSID("$NetBSD: ectype.c,v 1.6 2003/08/07 11:16:40 agc Exp $");
+__RCSID("$NetBSD: ectype.c,v 1.7 2006/03/20 01:34:49 gdamore Exp $");
 #endif
 #endif /* not lint */
+#endif
 
 #include "ectype.h"
 
diff --git a/usr.bin/tn3270/tools/mkdctype/mkdctype.c b/usr.bin/tn3270/tools/mkdctype/mkdctype.c
index c9d51d8f25b5..22275a9e371d 100644
--- a/usr.bin/tn3270/tools/mkdctype/mkdctype.c
+++ b/usr.bin/tn3270/tools/mkdctype/mkdctype.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mkdctype.c,v 1.7 2003/08/07 11:16:41 agc Exp $	*/
+/*	$NetBSD: mkdctype.c,v 1.8 2006/03/20 01:34:49 gdamore Exp $	*/
 
 /*-
  * Copyright (c) 1988 The Regents of the University of California.
@@ -29,7 +29,8 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
+#include <stdio.h>
+
 #if defined(__COPYRIGHT) && !defined(lint)
 __COPYRIGHT(
 "@(#) Copyright (c) 1988 The Regents of the University of California.\n\
@@ -40,7 +41,7 @@ __COPYRIGHT(
 #if 0
 static char sccsid[] = "@(#)mkdctype.c	4.2 (Berkeley) 4/26/91";
 #else
-__RCSID("$NetBSD: mkdctype.c,v 1.7 2003/08/07 11:16:41 agc Exp $");
+__RCSID("$NetBSD: mkdctype.c,v 1.8 2006/03/20 01:34:49 gdamore Exp $");
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/tn3270/tools/mkmake/Makefile b/usr.bin/tn3270/tools/mkmake/Makefile
index 50ec4e2ca80d..b3e1b915b9b4 100644
--- a/usr.bin/tn3270/tools/mkmake/Makefile
+++ b/usr.bin/tn3270/tools/mkmake/Makefile
@@ -1,6 +1,7 @@
-#	$NetBSD: Makefile,v 1.3 1999/07/14 21:36:38 wrstuden Exp $
+#	$NetBSD: Makefile,v 1.4 2006/03/20 01:34:49 gdamore Exp $
 
 HOSTPROG=	mkmake
+HOST_CPPFLAGS+= -DHOST_TOOL
 SRCS=	mkmake.y
 
 .include <bsd.hostprog.mk>
diff --git a/usr.bin/tn3270/tools/mkmake/mkmake.y b/usr.bin/tn3270/tools/mkmake/mkmake.y
index bc4ce45aec46..ce324eabaf0b 100644
--- a/usr.bin/tn3270/tools/mkmake/mkmake.y
+++ b/usr.bin/tn3270/tools/mkmake/mkmake.y
@@ -1,5 +1,5 @@
 %{
-/*	$NetBSD: mkmake.y,v 1.12 2004/11/19 14:19:45 peter Exp $	*/
+/*	$NetBSD: mkmake.y,v 1.13 2006/03/20 01:34:49 gdamore Exp $	*/
 /*-
  * Copyright (c) 1988 The Regents of the University of California.
  * All rights reserved.
@@ -29,14 +29,16 @@
  * SUCH DAMAGE.
  */
 
+#ifndef HOST_TOOL
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
 #if 0
 static char sccsid[] = "@(#)mkmake.y	4.2 (Berkeley) 4/26/91";
 #else
-__RCSID("$NetBSD: mkmake.y,v 1.12 2004/11/19 14:19:45 peter Exp $");
+__RCSID("$NetBSD: mkmake.y,v 1.13 2006/03/20 01:34:49 gdamore Exp $");
 #endif
 #endif /* not lint */
+#endif
 
 typedef struct string {
     int
diff --git a/usr.bin/tn3270/tools/prt3270/Makefile b/usr.bin/tn3270/tools/prt3270/Makefile
index 0b5e3ee7c65a..6a679c2cc18a 100644
--- a/usr.bin/tn3270/tools/prt3270/Makefile
+++ b/usr.bin/tn3270/tools/prt3270/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.10 2005/09/17 16:52:02 chs Exp $
+#	$NetBSD: Makefile,v 1.11 2006/03/20 01:34:49 gdamore Exp $
 
 NOMAN=		# defined
 
@@ -7,7 +7,7 @@ NOMAN=		# defined
 HOSTPROG=	prt3270
 SRCS=	prt3270.c asc_ebc.c ebc_disp.c astosc.c
 DPSRCS=	kbd.out astosc.out
-HOST_CPPFLAGS+=-I.
+HOST_CPPFLAGS+=-I. -DHOST_TOOL
 
 MKHITSDIR!=cd $(.CURDIR)/../mkhits && ${PRINTOBJDIR}
 MKHITS=${MKHITSDIR}/mkhits
diff --git a/usr.bin/tn3270/tools/prt3270/prt3270.c b/usr.bin/tn3270/tools/prt3270/prt3270.c
index 64463b07aafe..d2433c74f4df 100644
--- a/usr.bin/tn3270/tools/prt3270/prt3270.c
+++ b/usr.bin/tn3270/tools/prt3270/prt3270.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: prt3270.c,v 1.8 2003/08/07 11:16:44 agc Exp $	*/
+/*	$NetBSD: prt3270.c,v 1.9 2006/03/20 01:34:49 gdamore Exp $	*/
 
 /*-
  * Copyright (c) 1988 The Regents of the University of California.
@@ -29,18 +29,20 @@
  * SUCH DAMAGE.
  */
 
+#ifndef HOST_TOOL
 #include <sys/cdefs.h>
 #if defined(__COPYRIGHT) && !defined(lint)
 __COPYRIGHT(
 "@(#) Copyright (c) 1988 The Regents of the University of California.\n\
  All rights reserved.\n");
 #endif /* not lint */
+#endif
 
 #if defined(__RCSID) && !defined(lint)
 #if 0
 static char sccsid[] = "@(#)prt3270.c	4.2 (Berkeley) 4/26/91";
 #else
-__RCSID("$NetBSD: prt3270.c,v 1.8 2003/08/07 11:16:44 agc Exp $");
+__RCSID("$NetBSD: prt3270.c,v 1.9 2006/03/20 01:34:49 gdamore Exp $");
 #endif
 #endif /* not lint */