diff --git a/src/include/utils/builtins.h b/src/include/utils/builtins.h
index 3ebc076f2cd676e6522be069e999ac40433042df..cabfa0177397a39d61d656f251e976d5e3fb62f2 100644
--- a/src/include/utils/builtins.h
+++ b/src/include/utils/builtins.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: builtins.h,v 1.5 1996/11/04 07:46:00 scrappy Exp $
+ * $Id: builtins.h,v 1.6 1996/11/04 11:51:14 scrappy Exp $
  *
  * NOTES
  *    This should normally only be included by fmgr.h.
@@ -19,9 +19,9 @@
 #define BUILTINS_H
 
 #include <storage/itemptr.h>
-#include <utils/rel.h>
-#include <utils/nabstime.h>
 #include <utils/geo-decls.h>
+#include <utils/nabstime.h>
+#include <utils/rel.h>
 
 /*
  *	Defined in adt/
diff --git a/src/include/utils/catcache.h b/src/include/utils/catcache.h
index 3eccd136095c6c4eeb1da061180ff8f9cd0cbc2a..98ad92309914e60a63a8c7c1ef63bc76b12664df 100644
--- a/src/include/utils/catcache.h
+++ b/src/include/utils/catcache.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: catcache.h,v 1.3 1996/11/04 07:59:39 scrappy Exp $
+ * $Id: catcache.h,v 1.4 1996/11/04 11:51:15 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,10 +15,10 @@
 
 /* #define	CACHEDEBUG 	 turns DEBUG elogs on */
 
-#include <utils/rel.h>
-#include <nodes/memnodes.h>
-#include <lib/dllist.h>
 #include <access/htup.h>
+#include <lib/dllist.h>
+#include <nodes/memnodes.h>
+#include <utils/rel.h>
 
 /*
  *	struct catctup:		tuples in the cache.
diff --git a/src/include/utils/excid.h b/src/include/utils/excid.h
index 9d2f69d137b1cb4bb0a5858249f59c4a57869711..be411334142c8b4511905e8f6cb1aca285cc08dd 100644
--- a/src/include/utils/excid.h
+++ b/src/include/utils/excid.h
@@ -6,14 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: excid.h,v 1.2 1996/10/31 09:51:15 scrappy Exp $
+ * $Id: excid.h,v 1.3 1996/11/04 11:51:16 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef	EXCID_H
 #define EXCID_H
 
-#include "utils/exc.h"	/* for Exception */
 
 extern Exception FailedAssertion;
 extern Exception BadState;
diff --git a/src/include/utils/fmgrtab.h b/src/include/utils/fmgrtab.h
index b710fc35892fdd5df389838c57444f0644eed875..ed46c527cd92a37b180408d09cbc8d7fae90805a 100644
--- a/src/include/utils/fmgrtab.h
+++ b/src/include/utils/fmgrtab.h
@@ -6,14 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: fmgrtab.h,v 1.2 1996/10/31 09:51:17 scrappy Exp $
+ * $Id: fmgrtab.h,v 1.3 1996/11/04 11:51:17 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef FMGRTAB_H
 #define FMGRTAB_H
 
-#include "fmgr.h"		/* genearated by Gen_fmgrtab.sh */
 
 typedef struct {
     Oid		proid;
diff --git a/src/include/utils/inval.h b/src/include/utils/inval.h
index ac74012a75c9a23bedbbd9e43f9b9428dd5a623c..d54d8c5ab667ece36c49594004b4d67ea0f69aa5 100644
--- a/src/include/utils/inval.h
+++ b/src/include/utils/inval.h
@@ -6,15 +6,15 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: inval.h,v 1.2 1996/10/31 09:51:21 scrappy Exp $
+ * $Id: inval.h,v 1.3 1996/11/04 11:51:18 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef	INVAL_H
 #define INVAL_H
 
-#include "access/htup.h"
-#include "utils/rel.h"
+#include <access/htup.h>
+#include <utils/rel.h>
 
 extern void DiscardInvalid(void);
 
diff --git a/src/include/utils/lselect.h b/src/include/utils/lselect.h
index 126a50cb0505603979c2da47fd39f7590c88dd55..7cb5f8d185ecdfe31817a89d90d65c56832ccc09 100644
--- a/src/include/utils/lselect.h
+++ b/src/include/utils/lselect.h
@@ -6,14 +6,15 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: lselect.h,v 1.2 1996/10/31 09:51:23 scrappy Exp $
+ * $Id: lselect.h,v 1.3 1996/11/04 11:51:19 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef	LSELECT_H
 #define	LSELECT_H
 
-#include "access/htup.h"
+#include <stdio.h>
+#include <access/htup.h>
 
 struct	leftist {
     short	lt_dist; 	/* distance to leaf/empty node */
diff --git a/src/include/utils/lsyscache.h b/src/include/utils/lsyscache.h
index 2eb66f0bf515b12ab201705bad5adff9b10da032..7e1bf907b8b6301b5b742800bdcbb7936ba2113c 100644
--- a/src/include/utils/lsyscache.h
+++ b/src/include/utils/lsyscache.h
@@ -6,14 +6,15 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: lsyscache.h,v 1.1 1996/08/28 01:59:08 scrappy Exp $
+ * $Id: lsyscache.h,v 1.2 1996/11/04 11:51:20 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef	LSYSCACHE_H
 #define	LSYSCACHE_H
 
-#include "access/htup.h"
+#include <access/attnum.h>
+#include <access/htup.h>
 
 extern bool op_class(Oid opid, int32 opclass, Oid amopid);
 extern char *get_attname(Oid relid, AttrNumber attnum);
diff --git a/src/include/utils/mcxt.h b/src/include/utils/mcxt.h
index bc405cd93644a1f806838e5e739f840a264d4ca4..21d405bc88f11104ea3fe638e53dc6530b89b18f 100644
--- a/src/include/utils/mcxt.h
+++ b/src/include/utils/mcxt.h
@@ -6,14 +6,14 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: mcxt.h,v 1.3 1996/11/03 08:17:34 scrappy Exp $
+ * $Id: mcxt.h,v 1.4 1996/11/04 11:51:21 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef	MCXT_H
 #define MCXT_H
 
-#include "nodes/memnodes.h"
+#include <nodes/memnodes.h>
 
 extern MemoryContext	CurrentMemoryContext;
 extern MemoryContext	TopMemoryContext;
diff --git a/src/include/utils/portal.h b/src/include/utils/portal.h
index 6fc281fb01d759eb8ddb56dc8f6e81f989c0ec3b..b385097f1975748aac1c16cf3e3ce4be1570d51c 100644
--- a/src/include/utils/portal.h
+++ b/src/include/utils/portal.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: portal.h,v 1.2 1996/10/31 09:51:29 scrappy Exp $
+ * $Id: portal.h,v 1.3 1996/11/04 11:51:22 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -25,13 +25,10 @@
 #ifndef	PORTAL_H
 #define PORTAL_H
 
-
-#include "nodes/execnodes.h"		/* for EState */
-#include "nodes/memnodes.h"
-#include "nodes/nodes.h"
-#include "nodes/pg_list.h"
-#include "nodes/plannodes.h"		/* for Plan */
-#include "executor/execdesc.h"
+#include <executor/execdesc.h>
+#include <lib/fstack.h>
+#include <nodes/memnodes.h>
+#include <utils/memutils.h>
 
 typedef struct PortalBlockData {
     AllocSetData	setData;
diff --git a/src/include/utils/psort.h b/src/include/utils/psort.h
index 45d52319811f8fdb6654e15b055a07540941a827..a20d2cb7599b07c878a1e95134256a9c7fd13da9 100644
--- a/src/include/utils/psort.h
+++ b/src/include/utils/psort.h
@@ -6,13 +6,16 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: psort.h,v 1.1 1996/08/28 01:59:20 scrappy Exp $
+ * $Id: psort.h,v 1.2 1996/11/04 11:51:23 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef	PSORT_H
 #define	PSORT_H
 
+#include <stdio.h>
+#include <access/relscan.h>
+
 #define	SORTMEM		(1 << 18)		/* 1/4 M - any static memory */
 #define	MAXTAPES	7			/* 7--See Fig. 70, p273 */
 #define	TAPEEXT		"pg_psort.XXXXXX"	/* TEMPDIR/TAPEEXT */
@@ -39,10 +42,6 @@ extern	Relation	SortRdesc;
 extern	struct leftist	*Tuples;
 
 #ifdef	EBUG
-#include <stdio.h>
-#include "utils/elog.h"
-#include "storage/buf.h"
-#include "storage/bufmgr.h"
 
 #define	PDEBUG(PROC, S1)\
 elog(DEBUG, "%s:%d>> PROC: %s.", __FILE__, __LINE__, S1)
diff --git a/src/include/utils/rel.h b/src/include/utils/rel.h
index 8ea8ed4b7560444239be8d5918dfe5006a8d113c..7ca56bb759160afec2809462ee78bddf20dad56d 100644
--- a/src/include/utils/rel.h
+++ b/src/include/utils/rel.h
@@ -6,18 +6,18 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: rel.h,v 1.6 1996/11/04 07:46:06 scrappy Exp $
+ * $Id: rel.h,v 1.7 1996/11/04 11:51:24 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef	REL_H
 #define REL_H
 
+#include <catalog/pg_am.h>
+#include <catalog/pg_class.h>
 #include <access/strat.h>
-#include <rewrite/prs2lock.h>
 #include <access/tupdesc.h>
-#include <catalog/pg_class.h>
-#include <catalog/pg_am.h>
+#include <rewrite/prs2lock.h>
 #include <storage/fd.h>
 
 typedef struct RelationData {
diff --git a/src/include/utils/rel2.h b/src/include/utils/rel2.h
index 8f2742457c358ddd2401d04567126eff039109d2..bee0c78b8fbf2817f908912ce83e0ccdb5eb9da5 100644
--- a/src/include/utils/rel2.h
+++ b/src/include/utils/rel2.h
@@ -6,14 +6,14 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: rel2.h,v 1.1 1996/08/28 01:59:22 scrappy Exp $
+ * $Id: rel2.h,v 1.2 1996/11/04 11:51:25 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef	TMP_REL2_H
 #define	TMP_REL2_H
 
-#include "access/istrat.h"
+#include <utils/rel.h>
 
 extern IndexStrategy RelationGetIndexStrategy(Relation relation);
 
diff --git a/src/include/utils/relcache.h b/src/include/utils/relcache.h
index b23269861be93ef253eedfa2745d034d235f0a99..0389578f04d717d11b3096e18caa45607c5b2ecb 100644
--- a/src/include/utils/relcache.h
+++ b/src/include/utils/relcache.h
@@ -6,16 +6,14 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: relcache.h,v 1.2 1996/10/31 09:51:30 scrappy Exp $
+ * $Id: relcache.h,v 1.3 1996/11/04 11:51:26 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef	RELCACHE_H
 #define RELCACHE_H
 
-#include <sys/types.h>
-
-#include "utils/rel.h"
+#include <utils/rel.h>
 
 /*
  * relation lookup routines
diff --git a/src/include/utils/syscache.h b/src/include/utils/syscache.h
index efd223cdeb7fcfacd81faf622b9efb274a2afc3a..9de2b9d40a38d5ad37d971f86497c36f1246408f 100644
--- a/src/include/utils/syscache.h
+++ b/src/include/utils/syscache.h
@@ -6,15 +6,15 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: syscache.h,v 1.3 1996/10/31 05:58:01 momjian Exp $
+ * $Id: syscache.h,v 1.4 1996/11/04 11:51:27 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef	SYSCACHE_H
 #define SYSCACHE_H
 
-#include "access/attnum.h"
-#include "access/htup.h"
+#include <access/attnum.h>
+#include <access/htup.h>
 
 /*#define CACHEDEBUG*/ 	/* turns DEBUG elogs on */