7 files changed, 12 insertions, 17 deletions
diff --git a/src/backend/tcop/Makefile b/src/backend/tcop/Makefile
index 12c29caea38..bc31448ab0f 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 75353013c6f..f8d43fad005 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 0e10c1403e0..ed95cfb623a 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 39014fe0db1..273caa49421 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 3d5b61e7764..43d7e6a59bb 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 4f185f2e683..3cd3197e1e8 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 1cfde29c90e..8dd10bb59ba 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"