diff --git a/src/include/access/hash.h b/src/include/access/hash.h
index d44e8cc791..e408abd263 100644
--- a/src/include/access/hash.h
+++ b/src/include/access/hash.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: hash.h,v 1.2 1996/10/20 06:35:01 scrappy Exp $
+ * $Id: hash.h,v 1.3 1996/11/05 10:37:02 scrappy Exp $
  *
  * NOTES
  *	modeled after Margo Seltzer's hash implementation for unix. 
@@ -16,13 +16,11 @@
 #ifndef HASH_H
 #define HASH_H
 
-#include "access/htup.h"
-#include "access/itup.h"
-#include "storage/bufpage.h"
-#include "access/sdir.h"
-#include "access/funcindex.h"
-#include "storage/block.h"
-#include "access/relscan.h"
+#include <access/sdir.h>
+#include <access/funcindex.h>
+#include <storage/bufpage.h>
+#include <access/relscan.h>
+#include <access/itup.h>
 
 /* 
  * An overflow page is a spare page allocated for storing data whose 
diff --git a/src/include/access/hio.h b/src/include/access/hio.h
index bc4158224d..27a3bdb181 100644
--- a/src/include/access/hio.h
+++ b/src/include/access/hio.h
@@ -6,17 +6,16 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: hio.h,v 1.2 1996/10/31 09:46:38 scrappy Exp $
+ * $Id: hio.h,v 1.3 1996/11/05 10:37:05 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef	HIO_H
 #define HIO_H
 
+#include <access/htup.h>
+#include <utils/rel.h>
 
-#include "storage/block.h"
-#include "access/htup.h"
-#include "utils/rel.h"
 
 extern void RelationPutHeapTuple(Relation relation, BlockNumber blockIndex,
 				 HeapTuple tuple);
diff --git a/src/include/access/iqual.h b/src/include/access/iqual.h
index f8e4648cce..492c24732f 100644
--- a/src/include/access/iqual.h
+++ b/src/include/access/iqual.h
@@ -6,18 +6,16 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: iqual.h,v 1.3 1996/10/31 09:46:39 scrappy Exp $
+ * $Id: iqual.h,v 1.4 1996/11/05 10:37:03 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef	IQUAL_H
 #define IQUAL_H
 
+#include <access/skey.h>
+#include <access/itup.h>
 
-#include "storage/itemid.h"
-#include "utils/rel.h"
-#include "access/skey.h"
-#include "access/itup.h"
 
 /* ----------------
  *	index tuple qualification support
diff --git a/src/include/access/istrat.h b/src/include/access/istrat.h
index ca1fbc292a..5cae0084ce 100644
--- a/src/include/access/istrat.h
+++ b/src/include/access/istrat.h
@@ -6,13 +6,15 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: istrat.h,v 1.3 1996/11/05 08:18:13 scrappy Exp $
+ * $Id: istrat.h,v 1.4 1996/11/05 10:37:04 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef	ISTRAT_H
 #define ISTRAT_H
 
+#include <utils/rel.h>
+#include <access/strat.h>
 
 /*
  * StrategyNumberIsValid --
diff --git a/src/include/access/nbtree.h b/src/include/access/nbtree.h
index 58ac0b5b13..685546f827 100644
--- a/src/include/access/nbtree.h
+++ b/src/include/access/nbtree.h
@@ -6,27 +6,21 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: nbtree.h,v 1.2 1996/10/23 07:41:29 scrappy Exp $
+ * $Id: nbtree.h,v 1.3 1996/11/05 10:37:08 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef	NBTREE_H
 #define	NBTREE_H
 
-#include "access/attnum.h"
-#include "access/itup.h"
-#include "access/htup.h"
-#include "access/tupdesc.h"
-
-#include "access/istrat.h"
-#include "access/funcindex.h"
-#include "access/relscan.h"
-#include "access/sdir.h"
-#include "nodes/pg_list.h"
-#include "storage/page.h"
-#include "storage/bufpage.h"
-#include "storage/item.h"
-#include "utils/memutils.h"
+#include <access/sdir.h>
+#include <access/relscan.h>
+#include <storage/itemid.h>
+#include <storage/page.h>
+#include <access/funcindex.h>
+#include <access/itup.h>
+#include <storage/buf.h>
+#include <storage/itemptr.h>
 
 /*
  *  BTPageOpaqueData -- At the end of every page, we store a pointer
diff --git a/src/include/access/valid.h b/src/include/access/valid.h
index 865daaece7..4ab525dec9 100644
--- a/src/include/access/valid.h
+++ b/src/include/access/valid.h
@@ -6,19 +6,16 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: valid.h,v 1.2 1996/10/31 09:46:44 scrappy Exp $
+ * $Id: valid.h,v 1.3 1996/11/05 10:37:07 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef	VALID_H
 #define VALID_H
 
-#include "access/skey.h"
-#include "storage/buf.h"
-#include "utils/tqual.h"
-#include "access/tupdesc.h"
-#include "utils/rel.h"
-#include "storage/bufpage.h"
+#include <utils/tqual.h>
+#include <storage/bufpage.h>
+#include <utils/rel.h>
 
 /* ----------------
  *	extern decl's
diff --git a/src/include/catalog/catalog.h b/src/include/catalog/catalog.h
index 44ee99df5e..b183180c60 100644
--- a/src/include/catalog/catalog.h
+++ b/src/include/catalog/catalog.h
@@ -6,14 +6,14 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: catalog.h,v 1.1 1996/08/28 01:56:21 scrappy Exp $
+ * $Id: catalog.h,v 1.2 1996/11/05 10:37:14 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef CATALOG_H
 #define CATALOG_H
 
-#include "access/tupdesc.h"
+#include <access/tupdesc.h>
 
 extern char *relpath(char relname[]);
 extern bool IsSystemRelationName(char *relname);
diff --git a/src/include/catalog/pg_proc.h b/src/include/catalog/pg_proc.h
index 114b334222..4197122e59 100644
--- a/src/include/catalog/pg_proc.h
+++ b/src/include/catalog/pg_proc.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_proc.h,v 1.3 1996/11/03 12:12:32 scrappy Exp $
+ * $Id: pg_proc.h,v 1.4 1996/11/05 10:37:16 scrappy Exp $
  *
  * NOTES
  *    The script catalog/genbki.sh reads this file and generates .bki
@@ -22,14 +22,14 @@
 #ifndef PG_PROC_H
 #define PG_PROC_H
 
+#include <tcop/dest.h>
+
 /* ----------------
  *	postgres.h contains the system type definintions and the
  *	CATALOG(), BOOTSTRAP and DATA() sugar words so this file
  *	can be read by both genbki.sh and the C compiler.
  * ----------------
  */
-#include "nodes/pg_list.h"
-#include "tcop/dest.h"
 
 /* ----------------
  *	pg_proc definition.  cpp turns this into