diff --git a/src/include/catalog/pg_type.h b/src/include/catalog/pg_type.h
index 25dd764eb4014e409e2dd6a4304ec35d59566bd8..3ba51e6f3bf93e4081f453f1cdbfb3ef2d05f4cd 100644
--- a/src/include/catalog/pg_type.h
+++ b/src/include/catalog/pg_type.h
@@ -7,7 +7,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_type.h,v 1.2 1996/10/19 04:24:57 scrappy Exp $
+ * $Id: pg_type.h,v 1.3 1996/11/04 12:12:42 scrappy Exp $
  *
  * NOTES
  *    the genbki.sh script reads this file and generates .bki
@@ -18,7 +18,7 @@
 #ifndef PG_TYPE_H
 #define PG_TYPE_H
 
-#include "utils/rel.h"
+#include <utils/rel.h>
 
 /* ----------------
  *	postgres.h contains the system type definintions and the
diff --git a/src/include/parser/catalog_utils.h b/src/include/parser/catalog_utils.h
index f6e479ab4f4cb3c0052dc9d6dd154e697b0d9344..5063e102f95cf8f59f077a95ccb0b708be44feaa 100644
--- a/src/include/parser/catalog_utils.h
+++ b/src/include/parser/catalog_utils.h
@@ -6,16 +6,15 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: catalog_utils.h,v 1.3 1996/11/03 12:13:03 scrappy Exp $
+ * $Id: catalog_utils.h,v 1.4 1996/11/04 12:12:47 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef	CATALOG_UTILS_H
 #define	CATALOG_UTILS_H
 
-#include "catalog/pg_proc.h"
-#include "catalog/pg_type.h"
-#include "utils/syscache.h"
+#include <catalog/pg_type.h>
+#include <access/htup.h>
     
 typedef HeapTuple	Type;
 typedef HeapTuple	Operator;
diff --git a/src/include/parser/parse_query.h b/src/include/parser/parse_query.h
index 861e3f1dd358abbec39ab0721749bef4955f0487..a4750ae2aa622f27dd8a450794e81acc24372fa4 100644
--- a/src/include/parser/parse_query.h
+++ b/src/include/parser/parse_query.h
@@ -6,17 +6,16 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: parse_query.h,v 1.4 1996/10/31 18:33:09 momjian Exp $
+ * $Id: parse_query.h,v 1.5 1996/11/04 12:12:50 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef PARSE_QUERY_H
 #define PARSE_QUERY_H
 
-#include "nodes/pg_list.h"
-#include "nodes/parsenodes.h"
-#include "parser/catalog_utils.h"
-#include "parser/parse_state.h"
+#include <parser/catalog_utils.h>
+#include <parser/parse_state.h>
+#include <nodes/parsenodes.h>
 
 typedef struct QueryTreeList {
   int len; /* number of queries */
diff --git a/src/include/parser/parse_state.h b/src/include/parser/parse_state.h
index 4854cecca3f62cbd3757b5bbd5223ee7c60c8b1a..c2f900e81f31bd2660e9b57ce47b6a52994f5a94 100644
--- a/src/include/parser/parse_state.h
+++ b/src/include/parser/parse_state.h
@@ -4,7 +4,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: parse_state.h,v 1.4 1996/10/30 02:02:13 momjian Exp $
+ * $Id: parse_state.h,v 1.5 1996/11/04 12:12:52 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -12,6 +12,9 @@
 #ifndef PARSE_STATE_H
 #define PARSE_STATE_H
 
+#include <nodes/parsenodes.h> 
+#include <utils/rel.h>
+
 /* state information used during parse analysis */
 typedef struct ParseState {
     int 	p_last_resno;