More cleans of the inter-dependencies in the #include files

3 files changed, 7 insertions, 9 deletions

diff --git a/src/include/access/genam.h b/src/include/access/genam.h
index b23533cbe3..ea81219993 100644
--- a/src/include/access/genam.h
+++ b/src/include/access/genam.h
@@ -6,20 +6,15 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: genam.h,v 1.2 1996/10/31 09:46:37 scrappy Exp $
+ * $Id: genam.h,v 1.3 1996/11/03 12:12:22 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef	GENAM_H
 #define GENAM_H
 
-
-#include "access/attnum.h"
-#include "access/htup.h"
-#include "access/istrat.h"
 #include "access/itup.h"
 #include "access/relscan.h"
-#include "access/skey.h"
 #include "access/sdir.h"
 #include "access/funcindex.h"
 
diff --git a/src/include/access/gist.h b/src/include/access/gist.h
index 4befdd8ae9..38ef591d46 100644
--- a/src/include/access/gist.h
+++ b/src/include/access/gist.h
@@ -12,11 +12,10 @@
 #ifndef GIST_H
 #define GIST_H
 
-#include "utils/rel.h"
 #include "storage/off.h"
+#include "utils/rel.h"
 #include "storage/block.h"
-#include "storage/bufpage.h"
-#include "access/skey.h"
+#include "storage/page.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 5fa7abbcc4..3eb1eba625 100644
--- a/src/include/access/gistscan.h
+++ b/src/include/access/gistscan.h
@@ -11,6 +11,10 @@
  */
 #ifndef GISTSCAN_H
 
+#include "utils/rel.h"
+#include "storage/block.h"
+#include "storage/off.h"
+
 void gistadjscans(Relation r, int op, BlockNumber blkno, OffsetNumber offnum);
 
 #endif /* GISTSCAN_H */