From b844dd3f9e0c2e569ce4465515d4c8cf3b6acd9b Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Thu, 13 Jul 2006 17:47:02 +0000
Subject: [PATCH] More include file adjustments.

---
 src/backend/nodes/tidbitmap.c         | 4 ++--
 src/backend/optimizer/path/indxpath.c | 3 ++-
 src/backend/utils/time/tqual.c        | 3 ++-
 src/include/access/genam.h            | 3 +--
 src/include/access/hio.h              | 4 +++-
 src/include/access/htup.h             | 3 +--
 src/include/access/relscan.h          | 3 ++-
 src/include/access/tuptoaster.h       | 4 ++--
 src/include/catalog/indexing.h        | 4 ++--
 src/include/commands/vacuum.h         | 5 ++++-
 src/include/executor/hashjoin.h       | 3 ++-
 src/include/executor/tuptable.h       | 5 +++--
 src/include/utils/catcache.h          | 4 +++-
 src/include/utils/inval.h             | 3 ++-
 src/include/utils/lsyscache.h         | 4 +++-
 15 files changed, 34 insertions(+), 21 deletions(-)

diff --git a/src/backend/nodes/tidbitmap.c b/src/backend/nodes/tidbitmap.c
index cb67099df9..0e01ab71ef 100644
--- a/src/backend/nodes/tidbitmap.c
+++ b/src/backend/nodes/tidbitmap.c
@@ -23,7 +23,7 @@
  * Copyright (c) 2003-2006, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/nodes/tidbitmap.c,v 1.9 2006/03/05 15:58:28 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/nodes/tidbitmap.c,v 1.10 2006/07/13 17:47:01 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -33,9 +33,9 @@
 
 #include "access/htup.h"
 #include "nodes/tidbitmap.h"
+#include "storage/bufpage.h"
 #include "utils/hsearch.h"
 
-
 /*
  * The maximum number of tuples per page is not large (typically 256 with
  * 8K pages, or 1024 with 32K pages).  So there's not much point in making
diff --git a/src/backend/optimizer/path/indxpath.c b/src/backend/optimizer/path/indxpath.c
index 6e6f4ac3a7..69676b6a08 100644
--- a/src/backend/optimizer/path/indxpath.c
+++ b/src/backend/optimizer/path/indxpath.c
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/optimizer/path/indxpath.c,v 1.209 2006/07/01 18:38:32 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/optimizer/path/indxpath.c,v 1.210 2006/07/13 17:47:01 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -18,6 +18,7 @@
 #include <math.h>
 
 #include "access/skey.h"
+#include "catalog/pg_am.h"
 #include "catalog/pg_opclass.h"
 #include "catalog/pg_operator.h"
 #include "catalog/pg_type.h"
diff --git a/src/backend/utils/time/tqual.c b/src/backend/utils/time/tqual.c
index 6536d04646..37d5980631 100644
--- a/src/backend/utils/time/tqual.c
+++ b/src/backend/utils/time/tqual.c
@@ -32,7 +32,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/time/tqual.c,v 1.94 2006/07/13 16:49:18 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/time/tqual.c,v 1.95 2006/07/13 17:47:01 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -43,6 +43,7 @@
 #include "access/subtrans.h"
 #include "access/transam.h"
 #include "access/xact.h"
+#include "storage/bufmgr.h"
 #include "storage/procarray.h"
 #include "utils/tqual.h"
 
diff --git a/src/include/access/genam.h b/src/include/access/genam.h
index 1afe18dd31..9cd9162c26 100644
--- a/src/include/access/genam.h
+++ b/src/include/access/genam.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/access/genam.h,v 1.63 2006/07/13 16:49:18 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/access/genam.h,v 1.64 2006/07/13 17:47:01 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -18,7 +18,6 @@
 #include "access/sdir.h"
 #include "nodes/primnodes.h"
 
-
 /*
  * Struct for statistics returned by ambuild
  */
diff --git a/src/include/access/hio.h b/src/include/access/hio.h
index ab03fd4a64..8cb8f8925f 100644
--- a/src/include/access/hio.h
+++ b/src/include/access/hio.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/access/hio.h,v 1.31 2006/07/02 02:23:22 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/access/hio.h,v 1.32 2006/07/13 17:47:01 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,6 +15,8 @@
 #define HIO_H
 
 #include "access/htup.h"
+#include "utils/rel.h"
+#include "storage/buf.h"
 
 extern void RelationPutHeapTuple(Relation relation, Buffer buffer,
 					 HeapTuple tuple);
diff --git a/src/include/access/htup.h b/src/include/access/htup.h
index 7a14fa35c2..caac3229f3 100644
--- a/src/include/access/htup.h
+++ b/src/include/access/htup.h
@@ -7,14 +7,13 @@
  * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/access/htup.h,v 1.84 2006/07/13 16:49:19 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/access/htup.h,v 1.85 2006/07/13 17:47:01 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef HTUP_H
 #define HTUP_H
 
-#include "storage/bufpage.h"
 #include "storage/itemptr.h"
 #include "storage/relfilenode.h"
 
diff --git a/src/include/access/relscan.h b/src/include/access/relscan.h
index b85e373d87..46446f30cf 100644
--- a/src/include/access/relscan.h
+++ b/src/include/access/relscan.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/access/relscan.h,v 1.46 2006/07/13 16:49:19 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/access/relscan.h,v 1.47 2006/07/13 17:47:01 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,6 +15,7 @@
 #define RELSCAN_H
 
 #include "access/skey.h"
+#include "storage/bufpage.h"
 #include "utils/rel.h"
 #include "utils/tqual.h"
 
diff --git a/src/include/access/tuptoaster.h b/src/include/access/tuptoaster.h
index dea48ed24c..53f6f90268 100644
--- a/src/include/access/tuptoaster.h
+++ b/src/include/access/tuptoaster.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 2000-2006, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/include/access/tuptoaster.h,v 1.27 2006/07/13 16:49:19 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/access/tuptoaster.h,v 1.28 2006/07/13 17:47:01 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -14,7 +14,7 @@
 #define TUPTOASTER_H
 
 #include "access/htup.h"
-
+#include "storage/bufpage.h"
 
 /*
  * This enables de-toasting of index entries.  Needed until VACUUM is
diff --git a/src/include/catalog/indexing.h b/src/include/catalog/indexing.h
index a00e4a04ea..6587b34db7 100644
--- a/src/include/catalog/indexing.h
+++ b/src/include/catalog/indexing.h
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/catalog/indexing.h,v 1.94 2006/03/05 15:58:54 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/catalog/indexing.h,v 1.95 2006/07/13 17:47:01 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -16,7 +16,7 @@
 #define INDEXING_H
 
 #include "access/htup.h"
-
+#include "utils/rel.h"
 
 /*
  * The state object used by CatalogOpenIndexes and friends is actually the
diff --git a/src/include/commands/vacuum.h b/src/include/commands/vacuum.h
index f7164f21ef..ff68d68f83 100644
--- a/src/include/commands/vacuum.h
+++ b/src/include/commands/vacuum.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/commands/vacuum.h,v 1.65 2006/07/13 16:49:19 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/commands/vacuum.h,v 1.66 2006/07/13 17:47:01 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,10 +15,13 @@
 #define VACUUM_H
 
 #include "access/htup.h"
+#include "access/tupdesc.h"
+#include "catalog/pg_attribute.h"
 #include "catalog/pg_statistic.h"
 #include "catalog/pg_type.h"
 #include "nodes/parsenodes.h"
 #include "storage/lock.h"
+#include "utils/rel.h"
 
 /*----------
  * ANALYZE builds one of these structs for each attribute (column) that is
diff --git a/src/include/executor/hashjoin.h b/src/include/executor/hashjoin.h
index c4e6e460fe..a225056a0b 100644
--- a/src/include/executor/hashjoin.h
+++ b/src/include/executor/hashjoin.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/executor/hashjoin.h,v 1.39 2006/06/27 21:31:20 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/executor/hashjoin.h,v 1.40 2006/07/13 17:47:02 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,6 +15,7 @@
 #define HASHJOIN_H
 
 #include "access/htup.h"
+#include "fmgr.h"
 #include "storage/buffile.h"
 
 /* ----------------------------------------------------------------
diff --git a/src/include/executor/tuptable.h b/src/include/executor/tuptable.h
index 5e5f9b4c85..32f34e6fb7 100644
--- a/src/include/executor/tuptable.h
+++ b/src/include/executor/tuptable.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/executor/tuptable.h,v 1.34 2006/07/13 16:49:19 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/executor/tuptable.h,v 1.35 2006/07/13 17:47:02 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,7 +15,8 @@
 #define TUPTABLE_H
 
 #include "access/htup.h"
-
+#include "access/tupdesc.h"
+#include "storage/buf.h"
 
 /*----------
  * The executor stores tuples in a "tuple table" which is composed of
diff --git a/src/include/utils/catcache.h b/src/include/utils/catcache.h
index 65d286c7b3..c8cffa9026 100644
--- a/src/include/utils/catcache.h
+++ b/src/include/utils/catcache.h
@@ -13,7 +13,7 @@
  * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/utils/catcache.h,v 1.59 2006/06/15 02:08:09 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/utils/catcache.h,v 1.60 2006/07/13 17:47:02 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -22,7 +22,9 @@
 
 #include "access/htup.h"
 #include "access/skey.h"
+#include "access/tupdesc.h"
 #include "lib/dllist.h"
+#include "utils/rel.h"
 
 /*
  *		struct catctup:			individual tuple in the cache.
diff --git a/src/include/utils/inval.h b/src/include/utils/inval.h
index 558162d5ce..01b70457d2 100644
--- a/src/include/utils/inval.h
+++ b/src/include/utils/inval.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/utils/inval.h,v 1.38 2006/03/05 15:59:07 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/utils/inval.h,v 1.39 2006/07/13 17:47:02 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,6 +15,7 @@
 #define INVAL_H
 
 #include "access/htup.h"
+#include "utils/rel.h"
 
 
 typedef void (*CacheCallbackFunction) (Datum arg, Oid relid);
diff --git a/src/include/utils/lsyscache.h b/src/include/utils/lsyscache.h
index 9a33fc3602..ad2d9e30a6 100644
--- a/src/include/utils/lsyscache.h
+++ b/src/include/utils/lsyscache.h
@@ -6,14 +6,16 @@
  * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/utils/lsyscache.h,v 1.104 2006/04/05 22:11:57 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/utils/lsyscache.h,v 1.105 2006/07/13 17:47:02 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef LSYSCACHE_H
 #define LSYSCACHE_H
 
+#include "access/attnum.h"
 #include "access/htup.h"
+#include "nodes/pg_list.h"
 
 /* I/O function selector for get_type_io_data */
 typedef enum IOFuncSelector