diff --git a/src/include/access/relscan.h b/src/include/access/relscan.h
index 510e2907c9..60a2be58de 100644
--- a/src/include/access/relscan.h
+++ b/src/include/access/relscan.h
@@ -6,16 +6,16 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: relscan.h,v 1.4 1996/11/03 08:17:22 scrappy Exp $
+ * $Id: relscan.h,v 1.5 1996/11/04 08:52:41 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef	RELSCAN_H
 #define RELSCAN_H
 
-#include "utils/rel.h"
-#include "utils/tqual.h" 
-#include "storage/buf.h" 
+#include <utils/tqual.h>
+#include <storage/buf.h>
+#include <utils/rel.h>
 
 typedef ItemPointerData	MarkData;
 
diff --git a/src/include/executor/hashjoin.h b/src/include/executor/hashjoin.h
index 42096fda8e..6bee61ef76 100644
--- a/src/include/executor/hashjoin.h
+++ b/src/include/executor/hashjoin.h
@@ -6,14 +6,14 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: hashjoin.h,v 1.2 1996/10/19 06:27:33 scrappy Exp $
+ * $Id: hashjoin.h,v 1.3 1996/11/04 08:52:46 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef	HASHJOIN_H
 #define HASHJOIN_H
 
-#include "storage/ipc.h"
+#include <storage/ipc.h>
 
 /* -----------------
  *  have to use relative address as pointers in the hashtable
diff --git a/src/include/executor/tuptable.h b/src/include/executor/tuptable.h
index e9596739e4..4357e1240d 100644
--- a/src/include/executor/tuptable.h
+++ b/src/include/executor/tuptable.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: tuptable.h,v 1.3 1996/11/03 12:12:42 scrappy Exp $
+ * $Id: tuptable.h,v 1.4 1996/11/04 08:52:47 scrappy Exp $
  *
  * NOTES
  *    The tuple table interface is getting pretty ugly.
@@ -17,8 +17,9 @@
 #ifndef TUPTABLE_H
 #define TUPTABLE_H
 
-#include "access/htup.h"
-#include "storage/buf.h"
+#include <storage/buf.h>
+#include <access/tupdesc.h>
+#include <access/htup.h>
 
 /* ----------------
  *	Note:  the executor tuple table is managed and manipulated by special
diff --git a/src/include/nodes/execnodes.h b/src/include/nodes/execnodes.h
index 7cd8593172..3e01132faa 100644
--- a/src/include/nodes/execnodes.h
+++ b/src/include/nodes/execnodes.h
@@ -6,21 +6,21 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: execnodes.h,v 1.5 1996/11/03 12:12:50 scrappy Exp $
+ * $Id: execnodes.h,v 1.6 1996/11/04 08:52:54 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef EXECNODES_H
 #define EXECNODES_H
 
-#include "executor/hashjoin.h"
-#include "nodes/primnodes.h"
-#include "access/funcindex.h"
-#include "access/relscan.h"
-#include "executor/tuptable.h"
-#include "nodes/params.h"
-#include "access/sdir.h"
-#include "nodes/memnodes.h"
+#include <nodes/memnodes.h>
+#include <nodes/primnodes.h>
+#include <executor/hashjoin.h>
+#include <access/relscan.h>
+#include <access/sdir.h>
+#include <nodes/params.h>
+#include <executor/tuptable.h>
+#include <access/funcindex.h>
 
 /* ----------------
  *    IndexInfo information
diff --git a/src/include/nodes/params.h b/src/include/nodes/params.h
index 4440ccc1dd..93e7926812 100644
--- a/src/include/nodes/params.h
+++ b/src/include/nodes/params.h
@@ -6,14 +6,14 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: params.h,v 1.2 1996/10/31 09:49:13 scrappy Exp $
+ * $Id: params.h,v 1.3 1996/11/04 08:52:57 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef PARAMS_H
 #define PARAMS_H
 
-#include "access/attnum.h"
+#include <access/attnum.h>
 
 /* ----------------------------------------------------------------
  *
diff --git a/src/include/utils/fcache2.h b/src/include/utils/fcache2.h
index a7dd535722..7c48406a96 100644
--- a/src/include/utils/fcache2.h
+++ b/src/include/utils/fcache2.h
@@ -6,13 +6,15 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: fcache2.h,v 1.1 1996/08/28 01:58:58 scrappy Exp $
+ * $Id: fcache2.h,v 1.2 1996/11/04 08:53:07 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef FCACHE2_H
 #define FCACHE2_H
 
+#include <nodes/execnodes.h>
+
 extern void
 setFcache(Node *node, Oid foid, List *argList, ExprContext *econtext);