4 files changed, 7 insertions, 1 deletions

diff --git a/libexec/ftpd/ftpcmd.y b/libexec/ftpd/ftpcmd.y
index 43718a44191fd..917dd5ef79e8f 100644
--- a/libexec/ftpd/ftpcmd.y
+++ b/libexec/ftpd/ftpcmd.y
@@ -74,6 +74,8 @@ __FBSDID("$FreeBSD$");
 #include "extern.h"
 #include "pathnames.h"
 
+#define	yylex	ftpcmd_yylex
+
 off_t	restart_point;
 
 static	int cmd_type;
diff --git a/usr.bin/localedef/localedef.c b/usr.bin/localedef/localedef.c
index e6fc8044bea59..40b4ee58367f1 100644
--- a/usr.bin/localedef/localedef.c
+++ b/usr.bin/localedef/localedef.c
@@ -273,7 +273,9 @@ main(int argc, char **argv)
 	init_numeric();
 	init_time();
 
+#if YYDEBUG
 	yydebug = 0;
+#endif
 
 	(void) setlocale(LC_ALL, "");
 
diff --git a/usr.bin/localedef/localedef.h b/usr.bin/localedef/localedef.h
index 5b66e3a6e98eb..b8c831f1d38d2 100644
--- a/usr.bin/localedef/localedef.h
+++ b/usr.bin/localedef/localedef.h
@@ -47,7 +47,9 @@ extern int mb_cur_max;
 extern int mb_cur_min;
 extern int last_kw;
 extern int verbose;
+#if YYDEBUG
 extern int yydebug;
+#endif
 extern int lineno;
 extern int undefok;	/* mostly ignore undefined symbols */
 extern int warnok;
diff --git a/usr.sbin/rrenumd/parser.y b/usr.sbin/rrenumd/parser.y
index a7a108de79399..43d08634d4392 100644
--- a/usr.sbin/rrenumd/parser.y
+++ b/usr.sbin/rrenumd/parser.y
@@ -141,7 +141,7 @@ statement:
 debug_statement:
 		DEBUG_CMD flag EOS
 		{
-#ifdef YYDEBUG
+#if YYDEBUG
 			yydebug = $2;
 #endif /* YYDEBUG */
 		}