diff --git a/src/pl/plpgsql/src/gram.y b/src/pl/plpgsql/src/gram.y
index a9488eda388d997c85a566e892e4b0dc0fbb5d43..787a0085b5eef5163a061b2a07658d5ca78dd556 100644
--- a/src/pl/plpgsql/src/gram.y
+++ b/src/pl/plpgsql/src/gram.y
@@ -4,7 +4,7 @@
  *			  procedural language
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/pl/plpgsql/src/gram.y,v 1.2 1999/01/28 11:48:30 wieck Exp $
+ *    $Header: /cvsroot/pgsql/src/pl/plpgsql/src/gram.y,v 1.3 1999/03/21 01:07:07 tgl Exp $
  *
  *    This software is copyrighted by Jan Wieck - Hamburg.
  *
@@ -40,8 +40,9 @@
 #include "string.h"
 #include "plpgsql.h"
 
-extern	int	yylineno;
-extern	char	yytext[];
+extern	int	yylineno;			/* not always declared by lexer... */
+
+#include "pl_scan.c"
 
 static	PLpgSQL_expr	*read_sqlstmt(int until, char *s, char *sqlstart);
 static	PLpgSQL_stmt	*make_select_stmt(void);
@@ -1454,7 +1455,3 @@ make_tupret_expr(PLpgSQL_row *row)
     plpgsql_dstring_free(&ds);
     return expr;
 }
-
-
-
-#include "pl_scan.c"