diff --git a/src/backend/parser/catalog_utils.c b/src/backend/parser/catalog_utils.c
index 43142b27b4..cf3d72e4b3 100644
--- a/src/backend/parser/catalog_utils.c
+++ b/src/backend/parser/catalog_utils.c
@@ -6,7 +6,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/parser/Attic/catalog_utils.c,v 1.3 1996/08/09 19:06:59 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/parser/Attic/catalog_utils.c,v 1.4 1996/08/28 22:50:17 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -25,7 +25,7 @@
 #include "utils/syscache.h"
 #include "catalog/catname.h"
 
-#include "catalog_utils.h"
+#include "parser/catalog_utils.h"
 #include "catalog/pg_inherits.h"
 #include "catalog/pg_type.h"
 #include "catalog/indexing.h"
diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y
index a7989aaa7d..601329ffe9 100644
--- a/src/backend/parser/gram.y
+++ b/src/backend/parser/gram.y
@@ -10,7 +10,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 1.10 1996/08/26 19:59:15 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 1.11 1996/08/28 22:50:21 scrappy Exp $
  *
  * HISTORY
  *    AUTHOR		DATE		MAJOR EVENT
@@ -122,8 +122,8 @@ static Node *makeA_Expr(int op, char *opname, Node *lexpr, Node *rexpr);
 
 %type <list>	queryblock, relation_name_list, OptTableElementList,
 	tableElementList, OptInherit, definition,
-	opt_with_func, def_args, def_name_list, func_argtypes, oper_argtypes,
-	OptStmtList, OptStmtBlock, opt_column_list, columnList,
+	opt_with_func, opt_with, def_args, def_name_list, func_argtypes, 
+	oper_argtypes, OptStmtList, OptStmtBlock, opt_column_list, columnList,
 	exprList, sort_clause, sortby_list, index_params, 
 	name_list, from_clause, from_list, opt_array_bounds, nest_array_bounds,
 	expr_list, attrs, res_target_list, res_target_list2, def_list,
diff --git a/src/backend/parser/parse_query.c b/src/backend/parser/parse_query.c
index 600b7e7878..81480b1d1f 100644
--- a/src/backend/parser/parse_query.c
+++ b/src/backend/parser/parse_query.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/parser/Attic/parse_query.c,v 1.3 1996/08/13 01:29:34 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/parser/Attic/parse_query.c,v 1.4 1996/08/28 22:50:24 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -27,7 +27,7 @@
 
 #include "utils/syscache.h"
 #include "catalog/pg_type.h"
-#include "catalog_utils.h"
+#include "parser/catalog_utils.h"
 #include "parser/parse_query.h"
 /* #include "parser/io.h" */
 #include "utils/lsyscache.h"