Index: usr.bin/lex/initparse.c
===================================================================
--- usr.bin/lex/initparse.c
+++ usr.bin/lex/initparse.c
@@ -6,7 +6,7 @@
 #define YYBYACC 1
 #define YYMAJOR 1
 #define YYMINOR 9
-#define YYPATCH 20170430
+#define YYPATCH 20200330
 
 #define YYEMPTY        (-1)
 #define yyclearin      (yychar = YYEMPTY)
@@ -19,8 +19,6 @@
 #define YYPURE 0
 
 #line 35 "parse.y"
-/* SPDX-License-Identifier: BSD-2-Clause */
-
 /*  Copyright (c) 1990 The Regents of the University of California. */
 /*  All rights reserved. */
 
@@ -130,6 +128,10 @@
 # define YYLEX yylex()
 #endif
 
+#if !(defined(yylex) || defined(YYSTATE))
+int YYLEX_DECL();
+#endif
+
 /* Parameters sent to yyerror. */
 #ifndef YYERROR_DECL
 #define YYERROR_DECL() yyerror(const char *s)
@@ -488,13 +490,15 @@
 };
 #endif
 
+#if YYDEBUG
 int      yydebug;
-int      yynerrs;
+#endif
 
 int      yyerrflag;
 int      yychar;
 YYSTYPE  yyval;
 YYSTYPE  yylval;
+int      yynerrs;
 
 /* define the initial stack-sizes */
 #ifdef YYSTACKSIZE
@@ -655,7 +659,7 @@
 	{
 		(void)msg;
 	}
-#line 656 "parse.c"
+#line 662 "parse.c"
 
 #if YYDEBUG
 #include <stdio.h>	/* needed for printf */
@@ -1781,7 +1785,7 @@
 #line 946 "parse.y"
 	{ yyval = mkstate( SYM_EPSILON ); }
 break;
-#line 1782 "parse.c"
+#line 1788 "parse.c"
     }
     yystack.s_mark -= yym;
     yystate = *yystack.s_mark;
Index: usr.bin/lex/initskel.c
===================================================================
--- usr.bin/lex/initskel.c
+++ usr.bin/lex/initskel.c
@@ -448,11 +448,7 @@
   "/* First, we deal with  platform-specific or compiler-specific issues. */",
   "",
   "#if defined(__FreeBSD__)",
-  "#ifndef __STDC_LIMIT_MACROS",
-  "#define	__STDC_LIMIT_MACROS",
-  "#endif",
   "#include <sys/cdefs.h>",
-  "#include <stdint.h>",
   "#else",
   "#define	__dead2",
   "#endif",