diff --git a/src/backend/libpq/hba.c b/src/backend/libpq/hba.c
index 96f5b54533f683aed18ecf995627fc7bcf1f8de8..9c5f9d4dfabfd34303c93e025a90b75ac95d27e3 100644
--- a/src/backend/libpq/hba.c
+++ b/src/backend/libpq/hba.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/libpq/hba.c,v 1.4 1996/10/31 10:16:08 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/libpq/hba.c,v 1.5 1996/11/03 06:52:13 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -20,13 +20,14 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #if defined(sparc_solaris)
-#include <port/inet_aton.h>
+#include "port/inet_aton.h"
 #endif
 
-#include <miscadmin.h>
-#include <libpq/libpq.h>
-#include <libpq/pqcomm.h>
-#include <libpq/hba.h>
+#include "postgres.h"
+#include "miscadmin.h"
+#include "libpq/libpq.h"
+#include "libpq/pqcomm.h"
+#include "libpq/hba.h"
 
 
 #define CONF_FILE "pg_hba.conf"             
diff --git a/src/backend/libpq/pqsignal.c b/src/backend/libpq/pqsignal.c
index b60a5659ccb6a0d9053e52e044ea0bdae4840e4d..67bbc16fbaa67e391bc758622cfbc4ee39e9c536 100644
--- a/src/backend/libpq/pqsignal.c
+++ b/src/backend/libpq/pqsignal.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/libpq/pqsignal.c,v 1.1.1.1 1996/07/09 06:21:31 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/libpq/pqsignal.c,v 1.2 1996/11/03 06:52:14 scrappy Exp $
  *
  * NOTES
  *	This shouldn't be in libpq, but the monitor and some other
@@ -16,6 +16,8 @@
  *
  *-------------------------------------------------------------------------
  */
+#include "postgres.h"
+
 #include "libpq/pqsignal.h"
 
 pqsigfunc
diff --git a/src/backend/tcop/Makefile b/src/backend/tcop/Makefile
index 12c29caea387aa52c69667d5c0150ee3047e2c48..bc31448ab0fad0b952d2fff9e67ce14f24cf345b 100644
--- a/src/backend/tcop/Makefile
+++ b/src/backend/tcop/Makefile
@@ -4,16 +4,14 @@
 #    Makefile for tcop
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/tcop/Makefile,v 1.2 1996/10/31 05:55:23 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/backend/tcop/Makefile,v 1.3 1996/11/03 06:52:27 scrappy Exp $
 #
 #-------------------------------------------------------------------------
 
 SRCDIR = ../..
 include ../../Makefile.global
 
-INCLUDE_OPT = -I.. \
-              -I../port/$(PORTNAME) \
-              -I../include \
+INCLUDE_OPT = -I../port/$(PORTNAME) \
               -I../../include
 
 CFLAGS+=$(INCLUDE_OPT)
diff --git a/src/backend/tcop/aclchk.c b/src/backend/tcop/aclchk.c
index 75353013c6f8a6469c3b8944bc82ccdd3b313095..f8d43fad005b9a55acd4084dbd4e02cc3dc44254 100644
--- a/src/backend/tcop/aclchk.c
+++ b/src/backend/tcop/aclchk.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/tcop/Attic/aclchk.c,v 1.2 1996/10/31 05:55:24 momjian Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/tcop/Attic/aclchk.c,v 1.3 1996/11/03 06:52:29 scrappy Exp $
  *
  * NOTES
  *    See acl.h.
@@ -15,12 +15,13 @@
  *-------------------------------------------------------------------------
  */
 #include <string.h>
+#include "postgres.h"
+
 #include "utils/acl.h"		/* where declarations for this file goes */
 #include "access/heapam.h"
 #include "access/htup.h"
 #include "access/tupmacs.h"
 #include "utils/builtins.h"
-#include "utils/elog.h"
 #include "utils/palloc.h"
 #include "catalog/indexing.h"
 #include "catalog/catalog.h"
diff --git a/src/backend/tcop/dest.c b/src/backend/tcop/dest.c
index 0e10c1403e050a73497ff8590c7aae52b304e17a..ed95cfb623abf81516baca47f996200f3768be79 100644
--- a/src/backend/tcop/dest.c
+++ b/src/backend/tcop/dest.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/tcop/dest.c,v 1.1.1.1 1996/07/09 06:21:59 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/tcop/dest.c,v 1.2 1996/11/03 06:52:31 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -30,7 +30,6 @@
 #include "libpq/libpq-be.h"
 #include "access/printtup.h"
 #include "utils/portal.h"
-#include "utils/elog.h"
 #include "utils/palloc.h"
 
 #include "executor/executor.h"
diff --git a/src/backend/tcop/fastpath.c b/src/backend/tcop/fastpath.c
index 39014fe0db1c051a4f11fdb97133e472e27b5da1..273caa49421da780f119cdda1795551d00f1f180 100644
--- a/src/backend/tcop/fastpath.c
+++ b/src/backend/tcop/fastpath.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/tcop/fastpath.c,v 1.1.1.1 1996/07/09 06:21:59 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/tcop/fastpath.c,v 1.2 1996/11/03 06:52:32 scrappy Exp $
  *
  * NOTES
  *    This cruft is the server side of PQfn.
@@ -63,7 +63,6 @@
 
 #include "utils/palloc.h"
 #include "fmgr.h"
-#include "utils/elog.h"
 #include "utils/builtins.h"	/* for oideq */
 #include "tcop/fastpath.h"
 #include "libpq/libpq.h"
diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c
index 3d5b61e7764c8f50895a2a79de91e47f5a9fcb3e..43d7e6a59bbffb2534a9162800092f0b46480277 100644
--- a/src/backend/tcop/postgres.c
+++ b/src/backend/tcop/postgres.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.12 1996/10/31 10:20:56 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.13 1996/11/03 06:52:33 scrappy Exp $
  *
  * NOTES
  *    this is the "main" module of the postgres backend and
@@ -65,7 +65,6 @@
 
 #include "storage/bufmgr.h"
 #include "fmgr.h"
-#include "utils/elog.h"
 #include "utils/palloc.h"
 #include "utils/rel.h"
 
@@ -1265,7 +1264,7 @@ PostgresMain(int argc, char *argv[])
      */
     if (IsUnderPostmaster == false) {
 	puts("\nPOSTGRES backend interactive interface");
-	puts("$Revision: 1.12 $ $Date: 1996/10/31 10:20:56 $");
+	puts("$Revision: 1.13 $ $Date: 1996/11/03 06:52:33 $");
     }
     
     /* ----------------
diff --git a/src/backend/tcop/pquery.c b/src/backend/tcop/pquery.c
index 4f185f2e683462efba5ab5f773f9248d640a8de7..3cd3197e1e8b1930e402ec238e0d06f8acefcdea 100644
--- a/src/backend/tcop/pquery.c
+++ b/src/backend/tcop/pquery.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/tcop/pquery.c,v 1.2 1996/07/30 07:41:38 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/tcop/pquery.c,v 1.3 1996/11/03 06:52:35 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,8 +15,8 @@
 
 #include "tcop/tcopdebug.h"
 
-#include "utils/elog.h"
 #include "utils/palloc.h"
+#include "nodes/nodes.h"
 #include "utils/mcxt.h"
 #include "miscadmin.h"
 #include "utils/portal.h"
diff --git a/src/backend/tcop/utility.c b/src/backend/tcop/utility.c
index 1cfde29c90e11e9cd3995af1458e3b842f8ae202..8dd10bb59ba2591941fc6717c7c4e519ec0a98e0 100644
--- a/src/backend/tcop/utility.c
+++ b/src/backend/tcop/utility.c
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/tcop/utility.c,v 1.4 1996/11/02 02:03:13 bryanh Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/tcop/utility.c,v 1.5 1996/11/03 06:52:36 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -35,7 +35,6 @@
 
 #include "nodes/parsenodes.h"
 #include "parse.h"
-#include "utils/elog.h"
 #include "utils/builtins.h"
 #include "utils/acl.h"
 #include "utils/palloc.h"
diff --git a/src/backend/tioga/Makefile b/src/backend/tioga/Makefile
index ec46c5abdcd60f046899ab1f62b9402c589bd0d1..b8ca54c0346e917fc9ad60ff989be247f587164b 100644
--- a/src/backend/tioga/Makefile
+++ b/src/backend/tioga/Makefile
@@ -4,16 +4,15 @@
 #    Makefile for tioga
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/tioga/Attic/Makefile,v 1.1 1996/10/27 09:53:00 bryanh Exp $
+#    $Header: /cvsroot/pgsql/src/backend/tioga/Attic/Makefile,v 1.2 1996/11/03 06:52:43 scrappy Exp $
 #
 #-------------------------------------------------------------------------
 
 SRCDIR = ../..
 include ../../Makefile.global
 
-INCLUDE_OPT = -I.. \
+INCLUDE_OPT = 
               -I../port/$(PORTNAME) \
-              -I../include \
               -I../../include
 
 CFLAGS+=$(INCLUDE_OPT)
diff --git a/src/backend/tioga/tgRecipe.c b/src/backend/tioga/tgRecipe.c
index ea52a7151047d1454aee3451b777023d504335e9..e51a61b94d44a4690c5940b4cdcb8af51a0f23e9 100644
--- a/src/backend/tioga/tgRecipe.c
+++ b/src/backend/tioga/tgRecipe.c
@@ -11,12 +11,13 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/tioga/Attic/tgRecipe.c,v 1.1.1.1 1996/07/09 06:22:00 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/tioga/Attic/tgRecipe.c,v 1.2 1996/11/03 06:52:45 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 
 #include <stdlib.h>
+#include "postgres.h"
 #include "tioga/tgRecipe.h"
 
 #include "catalog/catalog.h" /*for newoid() */
diff --git a/src/backend/utils/adt/Makefile b/src/backend/utils/adt/Makefile
index 954582a0b0d9ddc34994255718a18e33ecbe4b8a..2427f8417c1b994af6a5fef89669eace6a05336e 100644
--- a/src/backend/utils/adt/Makefile
+++ b/src/backend/utils/adt/Makefile
@@ -4,16 +4,14 @@
 #    Makefile for utils/adt
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/utils/adt/Makefile,v 1.1 1996/10/27 09:53:15 bryanh Exp $
+#    $Header: /cvsroot/pgsql/src/backend/utils/adt/Makefile,v 1.2 1996/11/03 06:52:59 scrappy Exp $
 #
 #-------------------------------------------------------------------------
 
 SRCDIR = ../../..
 include ../../../Makefile.global
 
-INCLUDE_OPT = -I../.. \
-              -I../../port/$(PORTNAME) \
-              -I../../include \
+INCLUDE_OPT = -I../../port/$(PORTNAME) \
               -I../../../include
 
 CFLAGS+=$(INCLUDE_OPT)
diff --git a/src/backend/utils/adt/acl.c b/src/backend/utils/adt/acl.c
index 7e625987fe7f553c0a97fb8bab9ed5d4c250d0f3..97f9c6e47f229eb9daef3834e3e39bf177ca7c32 100644
--- a/src/backend/utils/adt/acl.c
+++ b/src/backend/utils/adt/acl.c
@@ -7,23 +7,19 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/utils/adt/acl.c,v 1.2 1996/08/27 07:32:25 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/utils/adt/acl.c,v 1.3 1996/11/03 06:53:01 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
-
-#include "config.h"
-
 #include <ctype.h>
 #include <string.h>
 #include "postgres.h"
-#include "c.h"
 #include "utils/acl.h"
 #include "access/htup.h"
 #include "catalog/pg_user.h"
 #include "utils/syscache.h"
-#include "utils/elog.h"
 #include "utils/palloc.h"
+#include "miscadmin.h"
 
 static char *getid(char *s, char *n);
 static int32 aclitemeq(AclItem *a1, AclItem *a2);
diff --git a/src/backend/utils/adt/bool.c b/src/backend/utils/adt/bool.c
index d0f3d34b52ad306796420c9cb3f6c684a87b9be1..058920a1d7f97aca29ac668b25e3eb02c10fe62b 100644
--- a/src/backend/utils/adt/bool.c
+++ b/src/backend/utils/adt/bool.c
@@ -7,12 +7,14 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/utils/adt/bool.c,v 1.1.1.1 1996/07/09 06:22:03 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/utils/adt/bool.c,v 1.2 1996/11/03 06:53:03 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
+
+#include "postgres.h"
+
 #include "utils/builtins.h"	/* where the declarations go */
-#include "utils/elog.h"
 #include "utils/palloc.h"
 
 /***************************************************************************** 
diff --git a/src/backend/utils/adt/dt.c b/src/backend/utils/adt/dt.c
index bc162427d28e3efdc48951f36a4ffc64aa9160fc..c9a53230cb013d93c4996a99b88955c9931075cc 100644
--- a/src/backend/utils/adt/dt.c
+++ b/src/backend/utils/adt/dt.c
@@ -7,11 +7,11 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/dt.c,v 1.1.1.1 1996/07/09 06:22:04 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/dt.c,v 1.2 1996/11/03 06:53:04 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
-#include "c.h"
+#include "postgres.h"
 #include "utils/palloc.h"
 #include "utils/builtins.h"		/* where function declarations go */
 
diff --git a/src/backend/utils/adt/filename.c b/src/backend/utils/adt/filename.c
index 6f7da084bd17c7838024fe4dbae23f1e05df9833..c569041dd39f1aa6812ba2dda719f09ed0bc306b 100644
--- a/src/backend/utils/adt/filename.c
+++ b/src/backend/utils/adt/filename.c
@@ -7,13 +7,11 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/filename.c,v 1.2 1996/08/27 07:32:32 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/filename.c,v 1.3 1996/11/03 06:53:05 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 
-#include "config.h"
-
 #include <string.h>
 #include <stdio.h>
 #ifndef WIN32
@@ -21,7 +19,8 @@
 #endif /* WIN32 */
 
 #include <sys/param.h>
-#include "utils/elog.h"
+
+#include "postgres.h"
 #include "utils/palloc.h"
 #include "utils/builtins.h"	/* where function declarations go */
 
diff --git a/src/backend/utils/adt/geo-ops.c b/src/backend/utils/adt/geo-ops.c
index d47eda81afa352f5f344e2c05a288dc2a96500f3..c41654b44615448839672eafe3cf109a943bcc3e 100644
--- a/src/backend/utils/adt/geo-ops.c
+++ b/src/backend/utils/adt/geo-ops.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/geo-ops.c,v 1.2 1996/07/22 21:56:01 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/geo-ops.c,v 1.3 1996/11/03 06:53:06 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -16,8 +16,9 @@
 #include <stdio.h>	/* for sprintf proto, etc. */
 #include <string.h>
 
+#include "postgres.h"
+
 #include "utils/geo-decls.h"
-#include "utils/elog.h"
 #include "utils/palloc.h"
 
 #define LDELIM		'('
diff --git a/src/backend/utils/adt/selfuncs.c b/src/backend/utils/adt/selfuncs.c
index 5807808fcdde852f0c2f11d6a2da7415bc3a2df8..c8d7bf49ec57aff69c8525c0008a5d18fa68532e 100644
--- a/src/backend/utils/adt/selfuncs.c
+++ b/src/backend/utils/adt/selfuncs.c
@@ -12,19 +12,20 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/utils/adt/selfuncs.c,v 1.3 1996/08/26 06:32:06 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/utils/adt/selfuncs.c,v 1.4 1996/11/03 06:53:08 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include <stdio.h>
 #include <string.h>
 
+#include "postgres.h"
+
 #include "access/heapam.h"
 #include "utils/tqual.h"	/* for NowTimeQual */
 #include "fmgr.h"
 #include "utils/builtins.h"	/* for textout() prototype 
 				  and where the declarations go */
-#include "utils/elog.h"
 #include "utils/palloc.h"
 
 #include "catalog/catname.h"
diff --git a/src/backend/utils/cache/Makefile b/src/backend/utils/cache/Makefile
index c944479c58cada0dcebe2db5319d15cc63235bf4..e6dfb24841f516f97a80da4e4d7ecbf50c9d125b 100644
--- a/src/backend/utils/cache/Makefile
+++ b/src/backend/utils/cache/Makefile
@@ -4,16 +4,14 @@
 #    Makefile for utils/cache
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/utils/cache/Makefile,v 1.1 1996/10/27 09:53:26 bryanh Exp $
+#    $Header: /cvsroot/pgsql/src/backend/utils/cache/Makefile,v 1.2 1996/11/03 06:53:14 scrappy Exp $
 #
 #-------------------------------------------------------------------------
 
 SRCDIR = ../../..
 include ../../../Makefile.global
 
-INCLUDE_OPT = -I../.. \
-              -I../../port/$(PORTNAME) \
-              -I../../include \
+INCLUDE_OPT = -I../../port/$(PORTNAME) \
               -I../../../include
 
 CFLAGS+=$(INCLUDE_OPT)
diff --git a/src/backend/utils/cache/fcache.c b/src/backend/utils/cache/fcache.c
index 070f457c280a198aecb6fa639b7cd45a3b2ba50b..2f2b76bf27604ba5d1aacd8529edba764cf45653 100644
--- a/src/backend/utils/cache/fcache.c
+++ b/src/backend/utils/cache/fcache.c
@@ -7,11 +7,11 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/utils/cache/Attic/fcache.c,v 1.1.1.1 1996/07/09 06:22:06 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/utils/cache/Attic/fcache.c,v 1.2 1996/11/03 06:53:17 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
-#include "c.h"
+#include "postgres.h"
 #include "access/htup.h"
 #include "utils/catcache.h"
 #include "utils/syscache.h"
@@ -22,7 +22,6 @@
 #include "parser/parsetree.h"		/* for getrelname() */
 #include "utils/builtins.h"
 #include "utils/fcache.h"
-#include "utils/elog.h"
 #include "utils/palloc.h"
 #include "nodes/primnodes.h"
 #include "nodes/execnodes.h"
diff --git a/src/backend/utils/cache/syscache.c b/src/backend/utils/cache/syscache.c
index 8c90db09d0d3249f0a39edcc5adabd5355f1425e..c4dc5ac8eb9e8e1dcebfe34cde5a3e56c8d8defd 100644
--- a/src/backend/utils/cache/syscache.c
+++ b/src/backend/utils/cache/syscache.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/utils/cache/syscache.c,v 1.2 1996/08/15 07:42:52 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/utils/cache/syscache.c,v 1.3 1996/11/03 06:53:19 scrappy Exp $
  *
  * NOTES
  *    These routines allow the parser/planner/executor to perform
@@ -17,13 +17,12 @@
  *
  *-------------------------------------------------------------------------
  */
-#include "c.h"
+#include "postgres.h"
  
 #include "access/heapam.h"
 #include "access/htup.h"
 #include "catalog/catname.h"
 #include "utils/catcache.h"
-#include "utils/elog.h"
 #include "utils/palloc.h"
 #include "nodes/pg_list.h"
  
diff --git a/src/backend/utils/error/exc.c b/src/backend/utils/error/exc.c
index 61714bf970c25c0b6d707c9ad5cea01cd290e6ee..59ec7b00866e5aebd23cf588866aef253f493822 100644
--- a/src/backend/utils/error/exc.c
+++ b/src/backend/utils/error/exc.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/utils/error/Attic/exc.c,v 1.4 1996/10/31 10:23:28 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/utils/error/Attic/exc.c,v 1.5 1996/11/03 06:53:26 scrappy Exp $
  *
  * NOTE
  *    XXX this code needs improvement--check for state violations and
@@ -17,6 +17,9 @@
  */
 #include <stdio.h>	/* XXX use own I/O routines */
 #include <errno.h>
+
+#include "postgres.h"
+
 #include "utils/exc.h"
 #include "storage/ipc.h"
 
diff --git a/src/backend/utils/error/excabort.c b/src/backend/utils/error/excabort.c
index d1b14361ea5c809b65b46299861cf9c9f402e219..29fd64ab7d5fb6300c94e7fb1eabfb3c9adb3b31 100644
--- a/src/backend/utils/error/excabort.c
+++ b/src/backend/utils/error/excabort.c
@@ -7,10 +7,13 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/utils/error/Attic/excabort.c,v 1.1.1.1 1996/07/09 06:22:07 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/utils/error/Attic/excabort.c,v 1.2 1996/11/03 06:53:32 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
+
+#include "postgres.h"
+
 #include "utils/exc.h"		/* where function declarations go */
 
 void
diff --git a/src/backend/utils/error/excid.c b/src/backend/utils/error/excid.c
index 4d87c16344f1024f2071dc189a94b8a9a34c9461..410d7a56c88efa054af738afa135f56cf9c390d8 100644
--- a/src/backend/utils/error/excid.c
+++ b/src/backend/utils/error/excid.c
@@ -7,10 +7,13 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/utils/error/Attic/excid.c,v 1.1.1.1 1996/07/09 06:22:07 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/utils/error/Attic/excid.c,v 1.2 1996/11/03 06:53:35 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
+
+#include "postgres.h"
+
 #include "utils/excid.h"
 
 /*****************************************************************************
diff --git a/src/backend/utils/hash/dynahash.c b/src/backend/utils/hash/dynahash.c
index 66477f55675a3f1779b5711ae5f90e1ca6c7ae17..83efc5ea5c21f800af177fbd7164a9b8d1ad0938 100644
--- a/src/backend/utils/hash/dynahash.c
+++ b/src/backend/utils/hash/dynahash.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/utils/hash/dynahash.c,v 1.1.1.1 1996/07/09 06:22:08 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/utils/hash/dynahash.c,v 1.2 1996/11/03 06:54:13 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -45,11 +45,9 @@
 # include	"postgres.h"
 # include	"utils/hsearch.h"
 #ifndef FRONTEND
-# include	"nodes/memnodes.h"
 # include	"utils/mcxt.h"
 #endif /* !FRONTEND */
 # include	"utils/palloc.h"
-# include	"utils/elog.h"
 
 /*
  * Fast arithmetic, relying on powers of 2,
diff --git a/src/backend/utils/hash/hashfn.c b/src/backend/utils/hash/hashfn.c
index 2a25b8a59e1dbb3da272801edffe6f91b7c808f2..7c11724ded87efaf52785006eae81b64ec083635 100644
--- a/src/backend/utils/hash/hashfn.c
+++ b/src/backend/utils/hash/hashfn.c
@@ -7,11 +7,13 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/utils/hash/hashfn.c,v 1.1.1.1 1996/07/09 06:22:08 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/utils/hash/hashfn.c,v 1.2 1996/11/03 06:54:16 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include <string.h>
+#include "postgres.h"
+
 #include "utils/hsearch.h"
 
 /*
diff --git a/src/backend/utils/mmgr/portalmem.c b/src/backend/utils/mmgr/portalmem.c
index b43e85a079320f1fdbc40043935e6d7e70842e31..9dd621e32257a389307089a8e5cc38c59a036fb0 100644
--- a/src/backend/utils/mmgr/portalmem.c
+++ b/src/backend/utils/mmgr/portalmem.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/utils/mmgr/portalmem.c,v 1.1.1.1 1996/07/09 06:22:09 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/utils/mmgr/portalmem.c,v 1.2 1996/11/03 06:54:25 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -76,12 +76,11 @@
 #include <stdio.h>		/* for sprintf() */
 #include <string.h>	/* for strlen, strncpy */
 
-#include "c.h"
+#include "postgres.h"
 
 #include "lib/hasht.h"
 #include "utils/module.h"
 #include "utils/excid.h"	/* for Unimplemented */
-#include "utils/elog.h"
 #include "utils/mcxt.h"
 #include "utils/hsearch.h"
 
diff --git a/src/backend/utils/sort/lselect.c b/src/backend/utils/sort/lselect.c
index 1f92e48d838d687813ccafd0eaa797afe2d27271..635dbd771cd9041480e99fdf4f10d24d5682f14d 100644
--- a/src/backend/utils/sort/lselect.c
+++ b/src/backend/utils/sort/lselect.c
@@ -8,14 +8,14 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/utils/sort/Attic/lselect.c,v 1.1.1.1 1996/07/09 06:22:10 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/utils/sort/Attic/lselect.c,v 1.2 1996/11/03 06:54:35 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include <string.h>
 #include <stdio.h>
 
-#include "c.h"
+#include "postgres.h"
 
 #include "storage/buf.h"
 #include "access/skey.h"
diff --git a/src/backend/utils/sort/psort.c b/src/backend/utils/sort/psort.c
index 8e7187b434f74f70f41d3b61394999c1c742fd3d..a85e5bc8d38ccb9470991afcea014095311357e3 100644
--- a/src/backend/utils/sort/psort.c
+++ b/src/backend/utils/sort/psort.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/utils/sort/Attic/psort.c,v 1.1.1.1 1996/07/09 06:22:10 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/utils/sort/Attic/psort.c,v 1.2 1996/11/03 06:54:38 scrappy Exp $
  *
  * NOTES
  *	Sorts the first relation into the second relation.  The sort may
@@ -22,7 +22,7 @@
 #include <stdio.h>
 #include <math.h>
 
-#include "c.h"
+#include "postgres.h"
 
 #include "executor/execdebug.h"
 #include "access/heapam.h"
@@ -34,7 +34,6 @@
 #include "storage/buf.h"
 #include "storage/bufmgr.h"	/* for BLCKSZ */
 #include "utils/portal.h"	/* for {Start,End}PortalAllocMode */
-#include "utils/elog.h"
 #include "utils/rel.h"
 
 #include "utils/psort.h"