More include file adjustments.

15 files changed, 19 insertions, 6 deletions

diff --git a/src/backend/nodes/tidbitmap.c b/src/backend/nodes/tidbitmap.c
index dc122fbf35..a3a02e2f31 100644
--- a/src/backend/nodes/tidbitmap.c
+++ b/src/backend/nodes/tidbitmap.c
@@ -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 8a6cf2755a..53ebe8c177 100644
--- a/src/backend/optimizer/path/indxpath.c
+++ b/src/backend/optimizer/path/indxpath.c
@@ -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 fa920d9e48..502a785d33 100644
--- a/src/backend/utils/time/tqual.c
+++ b/src/backend/utils/time/tqual.c
@@ -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 ed407f30cd..5d6cbab369 100644
--- a/src/include/access/genam.h
+++ b/src/include/access/genam.h
@@ -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 676f50ec8f..be218d636c 100644
--- a/src/include/access/hio.h
+++ b/src/include/access/hio.h
@@ -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 37f702a8b0..8c9cc93b9c 100644
--- a/src/include/access/htup.h
+++ b/src/include/access/htup.h
@@ -14,7 +14,6 @@
 #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 4c00252bde..b0f07066fe 100644
--- a/src/include/access/relscan.h
+++ b/src/include/access/relscan.h
@@ -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 5e72055eca..1afecd4542 100644
--- a/src/include/access/tuptoaster.h
+++ b/src/include/access/tuptoaster.h
@@ -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 9532908e90..b8ac775bf9 100644
--- a/src/include/catalog/indexing.h
+++ b/src/include/catalog/indexing.h
@@ -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 b5cbaaa434..b46bad13b8 100644
--- a/src/include/commands/vacuum.h
+++ b/src/include/commands/vacuum.h
@@ -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 173e50bba8..08578ab654 100644
--- a/src/include/executor/hashjoin.h
+++ b/src/include/executor/hashjoin.h
@@ -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 5596ffcdb0..96acd2706e 100644
--- a/src/include/executor/tuptable.h
+++ b/src/include/executor/tuptable.h
@@ -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 71b9916e05..376b2e3dc9 100644
--- a/src/include/utils/catcache.h
+++ b/src/include/utils/catcache.h
@@ -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 ecb80e5b26..fac5499a2a 100644
--- a/src/include/utils/inval.h
+++ b/src/include/utils/inval.h
@@ -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 de707de929..4cabfecc2c 100644
--- a/src/include/utils/lsyscache.h
+++ b/src/include/utils/lsyscache.h
@@ -13,7 +13,9 @@
 #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