Clean up #include in /include directory. Add scripts for checking includes.

15 files changed, 17 insertions, 46 deletions

diff --git a/src/include/access/gist.h b/src/include/access/gist.h
index 383877e9ad..b1c31b2c66 100644
--- a/src/include/access/gist.h
+++ b/src/include/access/gist.h
@@ -16,12 +16,6 @@
 #include <access/itup.h>
 #include <access/relscan.h>
 #include <access/sdir.h>
-#include <storage/page.h>
-#include <storage/block.h>
-#include <utils/rel.h>
-#include <storage/off.h>
-
-#include <fmgr.h>
 
 /*
 ** You can have as many strategies as you please in GiSTs, as
diff --git a/src/include/access/gistscan.h b/src/include/access/gistscan.h
index 4be3b676ca..d86036e9e1 100644
--- a/src/include/access/gistscan.h
+++ b/src/include/access/gistscan.h
@@ -12,9 +12,6 @@
 #ifndef GISTSCAN_H
 
 #include <access/relscan.h>
-#include <storage/off.h>
-#include <storage/block.h>
-#include <utils/rel.h>
 
 extern IndexScanDesc gistbeginscan(Relation r, bool fromEnd,
 			  uint16 nkeys, ScanKey key);
diff --git a/src/include/access/giststrat.h b/src/include/access/giststrat.h
index 20ad45863f..77fc90b162 100644
--- a/src/include/access/giststrat.h
+++ b/src/include/access/giststrat.h
@@ -12,7 +12,6 @@
 #ifndef GISTSTRAT_H
 #define GISTSTRAT_H
 
-#include <access/strat.h>
 #include <utils/rel.h>
 
 extern StrategyNumber RelationGetGISTStrategy(Relation r,
diff --git a/src/include/access/hash.h b/src/include/access/hash.h
index 685acee3f5..1157bf355a 100644
--- a/src/include/access/hash.h
+++ b/src/include/access/hash.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: hash.h,v 1.24 1999/05/25 22:42:30 momjian Exp $
+ * $Id: hash.h,v 1.25 1999/07/15 15:20:53 momjian Exp $
  *
  * NOTES
  *		modeled after Margo Seltzer's hash implementation for unix.
@@ -18,7 +18,6 @@
 
 #include <access/sdir.h>
 #include <access/funcindex.h>
-#include <storage/bufpage.h>
 #include <access/relscan.h>
 #include <access/itup.h>
 #include <utils/int8.h>
diff --git a/src/include/access/heapam.h b/src/include/access/heapam.h
index 17f5f2aede..1071fa6d9c 100644
--- a/src/include/access/heapam.h
+++ b/src/include/access/heapam.h
@@ -6,20 +6,20 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: heapam.h,v 1.43 1999/07/10 22:06:26 tgl Exp $
+ * $Id: heapam.h,v 1.44 1999/07/15 15:20:53 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef HEAPAM_H
 #define HEAPAM_H
 
+#include <time.h>
 #include "access/tupmacs.h"
 #include "access/htup.h"
 #include "access/relscan.h"
 #include "storage/block.h"
 #include "utils/rel.h"
 #include "utils/tqual.h"
-#include <time.h>
 
 /* ----------------------------------------------------------------
  *				heap access method statistics
diff --git a/src/include/access/hio.h b/src/include/access/hio.h
index bf5164b5e8..d94d959b7a 100644
--- a/src/include/access/hio.h
+++ b/src/include/access/hio.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: hio.h,v 1.11 1999/05/25 16:13:29 momjian Exp $
+ * $Id: hio.h,v 1.12 1999/07/15 15:20:54 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -14,8 +14,6 @@
 #define HIO_H
 
 #include <access/htup.h>
-#include <utils/rel.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 3901e5f10f..507a17907f 100644
--- a/src/include/access/htup.h
+++ b/src/include/access/htup.h
@@ -1,4 +1,4 @@
-/*-------------------------------------------------------------------------
+ /*-------------------------------------------------------------------------
  *
  * htup.h
  *	  POSTGRES heap tuple definitions.
@@ -6,17 +6,14 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: htup.h,v 1.22 1999/07/12 13:32:38 momjian Exp $
+ * $Id: htup.h,v 1.23 1999/07/15 15:20:54 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef HTUP_H
 #define HTUP_H
 
-#include <utils/nabstime.h>
 #include <storage/bufpage.h>
-#include <storage/itemptr.h>
-#include <utils/memutils.h>
 
 #define MinHeapTupleBitmapSize	32		/* 8 * 4 */
 
diff --git a/src/include/access/istrat.h b/src/include/access/istrat.h
index 6f45129158..90ed45926a 100644
--- a/src/include/access/istrat.h
+++ b/src/include/access/istrat.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: istrat.h,v 1.13 1999/05/25 16:13:32 momjian Exp $
+ * $Id: istrat.h,v 1.14 1999/07/15 15:20:54 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -14,7 +14,6 @@
 #define ISTRAT_H
 
 #include <utils/rel.h>
-#include <access/strat.h>
 
 /*
  * StrategyNumberIsValid
diff --git a/src/include/access/itup.h b/src/include/access/itup.h
index 85fc975e71..f89211029c 100644
--- a/src/include/access/itup.h
+++ b/src/include/access/itup.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: itup.h,v 1.17 1999/02/13 23:20:55 momjian Exp $
+ * $Id: itup.h,v 1.18 1999/07/15 15:20:54 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -17,7 +17,6 @@
 #include <access/tupmacs.h>
 #include <access/tupdesc.h>
 #include <storage/itemptr.h>
-#include <utils/memutils.h>
 
 #define MaxIndexAttributeNumber 7
 
diff --git a/src/include/access/nbtree.h b/src/include/access/nbtree.h
index b4993ca3d2..9618e5fb72 100644
--- a/src/include/access/nbtree.h
+++ b/src/include/access/nbtree.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: nbtree.h,v 1.27 1999/05/25 22:04:55 momjian Exp $
+ * $Id: nbtree.h,v 1.28 1999/07/15 15:20:55 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,13 +15,8 @@
 
 #include <access/sdir.h>
 #include <access/relscan.h>
-#include <storage/itemid.h>
-#include <storage/page.h>
 #include <access/funcindex.h>
 #include <access/itup.h>
-#include <storage/bufmgr.h>		/* don't remove, required by
-								 * BT_READ/BT_WRITE */
-#include <storage/itemptr.h>
 
 /*
  *	BTPageOpaqueData -- At the end of every page, we store a pointer
diff --git a/src/include/access/relscan.h b/src/include/access/relscan.h
index 4481c575e6..fe8b03f40c 100644
--- a/src/include/access/relscan.h
+++ b/src/include/access/relscan.h
@@ -6,16 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: relscan.h,v 1.15 1999/05/25 16:13:33 momjian Exp $
+ * $Id: relscan.h,v 1.16 1999/07/15 15:20:55 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef RELSCAN_H
 #define RELSCAN_H
 
-#include <storage/buf.h>
-#include <utils/rel.h>
-#include <access/htup.h>
 #include <utils/tqual.h>
 
 typedef ItemPointerData MarkData;
diff --git a/src/include/access/rtree.h b/src/include/access/rtree.h
index 0cc2381b7d..d5d105ec3f 100644
--- a/src/include/access/rtree.h
+++ b/src/include/access/rtree.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: rtree.h,v 1.14 1999/02/13 23:20:57 momjian Exp $
+ * $Id: rtree.h,v 1.15 1999/07/15 15:20:55 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -17,10 +17,6 @@
 #include <access/itup.h>
 #include <access/relscan.h>
 #include <access/sdir.h>
-#include <access/skey.h>
-#include <access/strat.h>
-#include <storage/block.h>
-#include <storage/off.h>
 
 /* see rtstrat.c for what all this is about */
 #define RTNStrategies					8
diff --git a/src/include/access/rtstrat.h b/src/include/access/rtstrat.h
index 31b77bba2b..fb3e090b6c 100644
--- a/src/include/access/rtstrat.h
+++ b/src/include/access/rtstrat.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: rtstrat.h,v 1.9 1999/02/13 23:20:58 momjian Exp $
+ * $Id: rtstrat.h,v 1.10 1999/07/15 15:20:55 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -14,7 +14,6 @@
 #define RTSTRAT_H
 
 #include <utils/rel.h>
-#include <access/attnum.h>
 
 extern RegProcedure RTMapOperator(Relation r, AttrNumber attnum,
 			  RegProcedure proc);
diff --git a/src/include/access/tupmacs.h b/src/include/access/tupmacs.h
index 3f2d6e8d96..baaf4bd0ac 100644
--- a/src/include/access/tupmacs.h
+++ b/src/include/access/tupmacs.h
@@ -6,13 +6,15 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: tupmacs.h,v 1.10 1999/05/25 16:13:36 momjian Exp $
+ * $Id: tupmacs.h,v 1.11 1999/07/15 15:20:56 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef TUPMACS_H
 #define TUPMACS_H
 
+#include "utils/memutils.h"
+
 /*
  * check to see if the ATT'th bit of an array of 8-bit bytes is set.
  */
diff --git a/src/include/access/xact.h b/src/include/access/xact.h
index a855806c19..9f155200e2 100644
--- a/src/include/access/xact.h
+++ b/src/include/access/xact.h
@@ -6,15 +6,15 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: xact.h,v 1.20 1999/02/13 23:21:00 momjian Exp $
+ * $Id: xact.h,v 1.21 1999/07/15 15:20:56 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef XACT_H
 #define XACT_H
 
-#include <access/transam.h>
 #include <utils/nabstime.h>
+#include <access/transam.h>
 
 /* ----------------
  *		transaction state structure