10 files changed, 11 insertions, 24 deletions
diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c
index e81b2dfb96b..fa3914b61c0 100644
--- a/src/backend/storage/buffer/bufmgr.c
+++ b/src/backend/storage/buffer/bufmgr.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/buffer/bufmgr.c,v 1.56 1999/06/29 04:54:47 vadim Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/buffer/bufmgr.c,v 1.57 1999/07/15 15:19:44 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -64,7 +64,6 @@
 #include "miscadmin.h"
 #include "utils/builtins.h"
 #include "utils/hsearch.h"
-#include "utils/palloc.h"
 #include "utils/memutils.h"
 #include "utils/relcache.h"
 #include "executor/execdebug.h" /* for NDirectFileRead */
diff --git a/src/backend/storage/file/fd.c b/src/backend/storage/file/fd.c
index f39f55918f2..ca2e754ca4d 100644
--- a/src/backend/storage/file/fd.c
+++ b/src/backend/storage/file/fd.c
@@ -6,7 +6,7 @@
  * Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $Id: fd.c,v 1.44 1999/07/14 01:19:53 momjian Exp $
+ *	  $Id: fd.c,v 1.45 1999/07/15 15:19:47 momjian Exp $
  *
  * NOTES:
  *
@@ -49,10 +49,7 @@
 
 #include "postgres.h"
 #include "miscadmin.h"			/* for DataDir */
-#include "utils/palloc.h"
 #include "storage/fd.h"
-#include "utils/elog.h"
-#include "utils/mcxt.h"
 
 /*
  * Problem: Postgres does a system(ld...) to do dynamic loading.
diff --git a/src/backend/storage/ipc/shmem.c b/src/backend/storage/ipc/shmem.c
index e317c0e1adf..8213a84c145 100644
--- a/src/backend/storage/ipc/shmem.c
+++ b/src/backend/storage/ipc/shmem.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/ipc/shmem.c,v 1.42 1999/06/06 20:19:35 vadim Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/ipc/shmem.c,v 1.43 1999/07/15 15:19:48 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -69,6 +69,7 @@
 #include "utils/memutils.h"
 #include "access/xact.h"
 #include "utils/tqual.h"
+#include "access/transam.h"
 
 /* shared memory global variables */
 
diff --git a/src/backend/storage/ipc/sinvaladt.c b/src/backend/storage/ipc/sinvaladt.c
index 2ebda765a88..8a47ecaa42d 100644
--- a/src/backend/storage/ipc/sinvaladt.c
+++ b/src/backend/storage/ipc/sinvaladt.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/ipc/sinvaladt.c,v 1.20 1999/05/28 17:03:28 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/ipc/sinvaladt.c,v 1.21 1999/07/15 15:19:49 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -22,7 +22,6 @@
 #include "storage/sinvaladt.h"
 #include "storage/lmgr.h"
 #include "utils/memutils.h"
-#include "utils/palloc.h"
 #include "utils/trace.h"
 
 /* ----------------
diff --git a/src/backend/storage/lmgr/lmgr.c b/src/backend/storage/lmgr/lmgr.c
index 58ee47fe611..2dce65a108a 100644
--- a/src/backend/storage/lmgr/lmgr.c
+++ b/src/backend/storage/lmgr/lmgr.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lmgr.c,v 1.27 1999/06/10 14:17:11 vadim Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lmgr.c,v 1.28 1999/07/15 15:19:51 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -35,8 +35,6 @@
 #include "storage/multilev.h"
 #include "storage/lmgr.h"
 
-#include "utils/palloc.h"
-#include "utils/mcxt.h"
 #include "utils/rel.h"
 
 #include "catalog/catname.h"
diff --git a/src/backend/storage/lmgr/lock.c b/src/backend/storage/lmgr/lock.c
index 2349e956a89..ba44c44de0d 100644
--- a/src/backend/storage/lmgr/lock.c
+++ b/src/backend/storage/lmgr/lock.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lock.c,v 1.55 1999/05/29 06:14:42 vadim Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lock.c,v 1.56 1999/07/15 15:19:52 momjian Exp $
  *
  * NOTES
  *	  Outside modules can create a lock table and acquire/release
@@ -44,7 +44,6 @@
 #include "storage/lock.h"
 #include "utils/hsearch.h"
 #include "utils/memutils.h"
-#include "utils/palloc.h"
 #include "access/xact.h"
 #include "access/transam.h"
 #include "utils/trace.h"
diff --git a/src/backend/storage/page/bufpage.c b/src/backend/storage/page/bufpage.c
index 204c06302da..d33bd8c4374 100644
--- a/src/backend/storage/page/bufpage.c
+++ b/src/backend/storage/page/bufpage.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/page/bufpage.c,v 1.23 1999/07/03 00:32:48 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/page/bufpage.c,v 1.24 1999/07/15 15:19:53 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -20,7 +20,6 @@
 #include "storage/item.h"
 #include "storage/buf.h"
 #include "storage/bufmgr.h"
-#include "utils/palloc.h"
 #include "utils/memutils.h"
 #include "storage/bufpage.h"
 
diff --git a/src/backend/storage/smgr/md.c b/src/backend/storage/smgr/md.c
index b5d7b86c21d..d94c0ef3f4d 100644
--- a/src/backend/storage/smgr/md.c
+++ b/src/backend/storage/smgr/md.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/smgr/md.c,v 1.46 1999/06/18 16:47:23 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/smgr/md.c,v 1.47 1999/07/15 15:19:54 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -24,7 +24,6 @@
 #include "storage/block.h"
 #include "storage/fd.h"
 #include "storage/smgr.h"		/* where the declarations go */
-#include "utils/mcxt.h"
 #include "utils/rel.h"
 
 #undef DIAGNOSTIC
diff --git a/src/backend/storage/smgr/smgr.c b/src/backend/storage/smgr/smgr.c
index f97a054130e..5ed9e4965be 100644
--- a/src/backend/storage/smgr/smgr.c
+++ b/src/backend/storage/smgr/smgr.c
@@ -10,7 +10,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/smgr/smgr.c,v 1.25 1999/07/14 01:19:54 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/smgr/smgr.c,v 1.26 1999/07/15 15:19:56 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -21,8 +21,6 @@
 #include "storage/block.h"
 #include "storage/smgr.h"
 #include "utils/rel.h"
-#include "utils/palloc.h"
-#include "utils/mcxt.h"
 
 static void smgrshutdown(int dummy);
 
diff --git a/src/backend/storage/smgr/smgrtype.c b/src/backend/storage/smgr/smgrtype.c
index aa5eb729457..496346462c5 100644
--- a/src/backend/storage/smgr/smgrtype.c
+++ b/src/backend/storage/smgr/smgrtype.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/smgr/smgrtype.c,v 1.12 1999/07/14 01:19:55 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/smgr/smgrtype.c,v 1.13 1999/07/15 15:19:56 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,9 +15,7 @@
 #include "postgres.h"
 
 #include "utils/builtins.h"		/* where the declarations go */
-#include "utils/palloc.h"
 #include "storage/smgr.h"
-#include "utils/mcxt.h"
 
 typedef struct smgrid
 {