5 files changed, 18 insertions, 12 deletions
diff --git a/src/include/access/visibilitymap.h b/src/include/access/visibilitymap.h
index 3803ac40bcd..fba1dd52237 100644
--- a/src/include/access/visibilitymap.h
+++ b/src/include/access/visibilitymap.h
@@ -7,14 +7,14 @@
  * Portions Copyright (c) 2007, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/access/visibilitymap.h,v 1.1 2008/12/03 13:05:22 heikki Exp $
+ * $PostgreSQL: pgsql/src/include/access/visibilitymap.h,v 1.2 2008/12/12 22:56:00 alvherre Exp $
  *
  *-------------------------------------------------------------------------
  */
 #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 c63c7013747..82206749f09 100644
--- a/src/include/catalog/pg_proc_fn.h
+++ b/src/include/catalog/pg_proc_fn.h
@@ -7,13 +7,15 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/catalog/pg_proc_fn.h,v 1.2 2008/12/04 17:51:27 petere Exp $
+ * $PostgreSQL: pgsql/src/include/catalog/pg_proc_fn.h,v 1.3 2008/12/12 22:56:00 alvherre Exp $
  *
  *-------------------------------------------------------------------------
  */
 #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 c5caa1283f2..2762179d757 100644
--- a/src/include/catalog/storage.h
+++ b/src/include/catalog/storage.h
@@ -7,16 +7,18 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/catalog/storage.h,v 1.1 2008/11/19 10:34:52 heikki Exp $
+ * $PostgreSQL: pgsql/src/include/catalog/storage.h,v 1.2 2008/12/12 22:56:00 alvherre Exp $
  *
  *-------------------------------------------------------------------------
  */
 #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 e9490933dbe..eebc836c3f5 100644
--- a/src/include/storage/freespace.h
+++ b/src/include/storage/freespace.h
@@ -7,16 +7,17 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/storage/freespace.h,v 1.31 2008/11/19 10:34:52 heikki Exp $
+ * $PostgreSQL: pgsql/src/include/storage/freespace.h,v 1.32 2008/12/12 22:56:00 alvherre Exp $
  *
  *-------------------------------------------------------------------------
  */
 #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 d09732f5abe..828aaab45e9 100644
--- a/src/include/storage/indexfsm.h
+++ b/src/include/storage/indexfsm.h
@@ -7,14 +7,15 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/storage/indexfsm.h,v 1.3 2008/11/19 10:34:52 heikki Exp $
+ * $PostgreSQL: pgsql/src/include/storage/indexfsm.h,v 1.4 2008/12/12 22:56:00 alvherre Exp $
  *
  *-------------------------------------------------------------------------
  */
 #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_ */