Restructure some header files a bit, in particular heapam.h, by removing some

unnecessary #include lines in it.  Also, move some tuple routine prototypes and
macros to htup.h, which allows removal of heapam.h inclusion from some .c
files.

For this to work, a new header file access/sysattr.h needed to be created,
initially containing attribute numbers of system columns, for pg_dump usage.

While at it, make contrib ltree, intarray and hstore header files more
consistent with our header style.

contrib/hstore/hstore.h

@@ -1,15 +1,10 @@
+/*
+ * $PostgreSQL: pgsql/contrib/hstore/hstore.h,v 1.6 2008/05/12 00:00:42 alvherre Exp $
+ */
 #ifndef __HSTORE_H__
 #define __HSTORE_H__
 
-#include "postgres.h"
-
-#include "funcapi.h"
-#include "access/gist.h"
-#include "access/itup.h"
-#include "utils/elog.h"
-#include "utils/palloc.h"
-#include "utils/builtins.h"
-#include "storage/bufpage.h"
+#include "fmgr.h"
 
 
 typedef struct
@@ -53,4 +48,4 @@ int			uniquePairs(Pairs * a, int4 l, int4 *buflen);
 #define HStoreContainsStrategyNumber	7
 #define HStoreExistsStrategyNumber		9
 
-#endif
+#endif /* __HSTORE_H__ */

contrib/hstore/hstore_gin.c

@@ -1,7 +1,13 @@
-#include "hstore.h"
+/*
+ * $PostgreSQL: pgsql/contrib/hstore/hstore_gin.c,v 1.4 2008/05/12 00:00:42 alvherre Exp $
+ */
+#include "postgres.h"
 
 #include "access/gin.h"
 
+#include "hstore.h"
+
+
 #define KEYFLAG		'K'
 #define VALFLAG		'V'
 #define NULLFLAG	'N'

contrib/hstore/hstore_gist.c

@@ -1,9 +1,15 @@
-#include "hstore.h"
+/*
+ * $PostgreSQL: pgsql/contrib/hstore/hstore_gist.c,v 1.9 2008/05/12 00:00:42 alvherre Exp $
+ */
+#include "postgres.h"
 
 #include "access/gist.h"
 #include "access/itup.h"
+#include "access/skey.h"
 #include "crc32.h"
 
+#include "hstore.h"
+
 /* bigint defines */
 #define BITBYTE 8
 #define SIGLENINT  4			/* >122 => key will toast, so very slow!!! */

contrib/hstore/hstore_io.c

@@ -1,6 +1,12 @@
-#include "hstore.h"
+/*
+ * $PostgreSQL: pgsql/contrib/hstore/hstore_io.c,v 1.8 2008/05/12 00:00:42 alvherre Exp $
+ */
+#include "postgres.h"
+
 #include <ctype.h>
 
+#include "hstore.h"
+
 PG_MODULE_MAGIC;
 
 typedef struct

contrib/hstore/hstore_op.c

@@ -1,9 +1,14 @@
-#include "hstore.h"
-#include "utils/array.h"
+/*
+ * $PostgreSQL
+ */
+#include "postgres.h"
+
 #include "catalog/pg_type.h"
 #include "funcapi.h"
-#include <access/heapam.h>
-#include <fmgr.h>
+#include "utils/array.h"
+#include "utils/builtins.h"
+
+#include "hstore.h"
 
 
 static HEntry *