Reduce some rel.h inclusions, and add pg_list.h to pg_proc_fn.h.

diff --git a/src/include/access/visibilitymap.h b/src/include/access/visibilitymap.h
index 82347aa942ee8974a75b0853c1c66e760ee240a8..94d46ef221e6852ab38afde5b7bf7af652ef675f 100644 (file)
--- a/src/include/access/visibilitymap.h
+++ b/src/include/access/visibilitymap.h
@@ -14,7 +14,7 @@
 #ifndef VISIBILITYMAP_H
 #define VISIBILITYMAP_H
 
-#include "utils/rel.h"
+#include "utils/relcache.h"
 #include "storage/buf.h"
 #include "storage/itemptr.h"
 #include "access/xlogdefs.h"

diff --git a/src/include/catalog/pg_proc_fn.h b/src/include/catalog/pg_proc_fn.h
index e9726d4c9b8464eb025561329dcb2399c6eac88f..91d1e7ebcb318f9b5585c2a103776ca22ac9cb23 100644 (file)
--- a/src/include/catalog/pg_proc_fn.h
+++ b/src/include/catalog/pg_proc_fn.h
@@ -14,6 +14,8 @@
 #ifndef PG_PROC_FN_H
 #define PG_PROC_FN_H
 
+#include "nodes/pg_list.h"
+
 extern Oid ProcedureCreate(const char *procedureName,
                                Oid procNamespace,
                                bool replace,

diff --git a/src/include/catalog/storage.h b/src/include/catalog/storage.h
index 8fc5f209e9dd90796b11d3733bfcdeeed3ce613c..98d9c724ad2fc776a3aa3c1408e1440494333684 100644 (file)
--- a/src/include/catalog/storage.h
+++ b/src/include/catalog/storage.h
@@ -14,9 +14,11 @@
 #ifndef STORAGE_H
 #define STORAGE_H
 
+#include "access/xlog.h"
+#include "lib/stringinfo.h"
 #include "storage/block.h"
 #include "storage/relfilenode.h"
-#include "utils/rel.h"
+#include "utils/relcache.h"
 
 extern void RelationCreateStorage(RelFileNode rnode, bool istemp);
 extern void RelationDropStorage(Relation rel);

diff --git a/src/include/storage/freespace.h b/src/include/storage/freespace.h
index b76acd8f60e2d1724644d51e6bf88eabcbf0f9bd..a4c86708d640af2f4fd8c9f48f1fd11b775c600b 100644 (file)
--- a/src/include/storage/freespace.h
+++ b/src/include/storage/freespace.h
@@ -14,9 +14,10 @@
 #ifndef FREESPACE_H_
 #define FREESPACE_H_
 
-#include "utils/rel.h"
+#include "storage/block.h"
 #include "storage/bufpage.h"
-#include "access/xlog.h"
+#include "storage/relfilenode.h"
+#include "utils/relcache.h"
 
 /* prototypes for public functions in freespace.c */
 extern Size GetRecordedFreeSpace(Relation rel, BlockNumber heapBlk);
@@ -33,4 +34,4 @@ extern void XLogRecordPageWithFreeSpace(RelFileNode rnode, BlockNumber heapBlk,
 extern void FreeSpaceMapTruncateRel(Relation rel, BlockNumber nblocks);
 extern void FreeSpaceMapVacuum(Relation rel);
 
-#endif   /* FREESPACE_H */
+#endif   /* FREESPACE_H_ */

diff --git a/src/include/storage/indexfsm.h b/src/include/storage/indexfsm.h
index c5c6170f31b4cc8c139f331f3eb6d7f886fea4a2..326339359ec0dcf7419f77c5a8e07febbefab243 100644 (file)
--- a/src/include/storage/indexfsm.h
+++ b/src/include/storage/indexfsm.h
@@ -14,7 +14,8 @@
 #ifndef INDEXFSM_H_
 #define INDEXFSM_H_
 
-#include "utils/rel.h"
+#include "storage/block.h"
+#include "utils/relcache.h"
 
 extern BlockNumber GetFreeIndexPage(Relation rel);
 extern void RecordFreeIndexPage(Relation rel, BlockNumber page);
@@ -22,4 +23,4 @@ extern void RecordUsedIndexPage(Relation rel, BlockNumber page);
 
 extern void IndexFreeSpaceMapVacuum(Relation rel);
 
-#endif   /* INDEXFSM_H */
+#endif   /* INDEXFSM_H_ */