Another run through.

This gets us a clean compile of 'common' and 'gist' with *clean* #include
files

6 files changed, 21 insertions, 18 deletions

diff --git a/src/include/access/genam.h b/src/include/access/genam.h
index ea81219993..7c7c3e1023 100644
--- a/src/include/access/genam.h
+++ b/src/include/access/genam.h
@@ -6,17 +6,17 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: genam.h,v 1.3 1996/11/03 12:12:22 scrappy Exp $
+ * $Id: genam.h,v 1.4 1996/11/05 08:18:09 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef	GENAM_H
 #define GENAM_H
 
-#include "access/itup.h"
-#include "access/relscan.h"
-#include "access/sdir.h"
-#include "access/funcindex.h"
+#include <access/sdir.h>
+#include <access/funcindex.h>
+#include <access/relscan.h>
+#include <access/itup.h>
 
 /* ----------------
  *	generalized index_ interface routines
diff --git a/src/include/access/gist.h b/src/include/access/gist.h
index 38ef591d46..cfafacbc50 100644
--- a/src/include/access/gist.h
+++ b/src/include/access/gist.h
@@ -12,10 +12,10 @@
 #ifndef GIST_H
 #define GIST_H
 
-#include "storage/off.h"
-#include "utils/rel.h"
-#include "storage/block.h"
-#include "storage/page.h"
+#include <storage/page.h>
+#include <storage/block.h>
+#include <utils/rel.h>
+#include <storage/off.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 3eb1eba625..0a4fe7f554 100644
--- a/src/include/access/gistscan.h
+++ b/src/include/access/gistscan.h
@@ -11,9 +11,9 @@
  */
 #ifndef GISTSCAN_H
 
-#include "utils/rel.h"
-#include "storage/block.h"
-#include "storage/off.h"
+#include <storage/off.h>
+#include <storage/block.h>
+#include <utils/rel.h>
 
 void gistadjscans(Relation r, int op, BlockNumber blkno, OffsetNumber offnum);
 
diff --git a/src/include/access/giststrat.h b/src/include/access/giststrat.h
index 82d8c761e0..d189f685b6 100644
--- a/src/include/access/giststrat.h
+++ b/src/include/access/giststrat.h
@@ -12,6 +12,9 @@
 #ifndef GISTSTRAT_H
 #define GISTSTRAT_H
 
+#include <access/strat.h>
+#include <utils/rel.h>
+
 StrategyNumber
 RelationGetGISTStrategy(Relation r, AttrNumber attnum, RegProcedure proc);
 
diff --git a/src/include/access/istrat.h b/src/include/access/istrat.h
index 0133333c9f..ca1fbc292a 100644
--- a/src/include/access/istrat.h
+++ b/src/include/access/istrat.h
@@ -6,17 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: istrat.h,v 1.2 1996/10/31 09:46:41 scrappy Exp $
+ * $Id: istrat.h,v 1.3 1996/11/05 08:18:13 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef	ISTRAT_H
 #define ISTRAT_H
 
-#include "access/attnum.h"
-#include "access/skey.h"
-#include "access/strat.h"
-#include "utils/rel.h"		/* for Relation */
 
 /*
  * StrategyNumberIsValid --
diff --git a/src/include/access/rtree.h b/src/include/access/rtree.h
index 6835b9004a..a421a79f8a 100644
--- a/src/include/access/rtree.h
+++ b/src/include/access/rtree.h
@@ -6,13 +6,17 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: rtree.h,v 1.1 1996/08/27 21:50:21 scrappy Exp $
+ * $Id: rtree.h,v 1.2 1996/11/05 08:18:14 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef RTREE_H
 #define RTREE_H
 
+#include <access/skey.h>
+#include <storage/block.h>
+#include <storage/off.h>
+
 /* see rtstrat.c for what all this is about */
 #define RTNStrategies			8
 #define RTLeftStrategyNumber		1