Clean up #include's.

20 files changed, 24 insertions, 52 deletions

diff --git a/src/include/access/ibit.h b/src/include/access/ibit.h
index 50d688d512..3a8099e778 100644
--- a/src/include/access/ibit.h
+++ b/src/include/access/ibit.h
@@ -7,15 +7,13 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: ibit.h,v 1.13 2000/04/12 17:16:26 momjian Exp $
+ * $Id: ibit.h,v 1.14 2000/06/15 03:32:31 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef IBIT_H
 #define IBIT_H
 
-#include "catalog/pg_index.h"
-
 typedef struct IndexAttributeBitMapData
 {
 	bits8		bits[(INDEX_MAX_KEYS + 8 - 1) / 8];
diff --git a/src/include/access/nbtree.h b/src/include/access/nbtree.h
index 8dc3a162a3..49d9dd07dc 100644
--- a/src/include/access/nbtree.h
+++ b/src/include/access/nbtree.h
@@ -7,14 +7,13 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: nbtree.h,v 1.37 2000/06/13 07:35:17 tgl Exp $
+ * $Id: nbtree.h,v 1.38 2000/06/15 03:32:31 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef NBTREE_H
 #define NBTREE_H
 
-#include "access/funcindex.h"
 #include "access/itup.h"
 #include "access/relscan.h"
 #include "access/sdir.h"
diff --git a/src/include/access/rtree.h b/src/include/access/rtree.h
index c5e0967f57..70ab1526dc 100644
--- a/src/include/access/rtree.h
+++ b/src/include/access/rtree.h
@@ -7,17 +7,17 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: rtree.h,v 1.18 2000/06/13 07:35:17 tgl Exp $
+ * $Id: rtree.h,v 1.19 2000/06/15 03:32:31 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef RTREE_H
 #define RTREE_H
 
-#include "access/funcindex.h"
 #include "access/itup.h"
-#include "access/relscan.h"
 #include "access/sdir.h"
+#include "access/skey.h"
+#include "utils/rel.h"
 
 /* see rtstrat.c for what all this is about */
 #define RTNStrategies					8
diff --git a/src/include/commands/sequence.h b/src/include/commands/sequence.h
index d695caa2df..4d1f846fa9 100644
--- a/src/include/commands/sequence.h
+++ b/src/include/commands/sequence.h
@@ -9,7 +9,6 @@
 #ifndef SEQUENCE_H
 #define SEQUENCE_H
 
-#include "fmgr.h"
 #include "nodes/parsenodes.h"
 
 /*
diff --git a/src/include/commands/user.h b/src/include/commands/user.h
index d985d72d02..489fd98c85 100644
--- a/src/include/commands/user.h
+++ b/src/include/commands/user.h
@@ -3,7 +3,7 @@
  * user.h
  *
  *
- * $Id: user.h,v 1.12 2000/05/29 01:59:11 tgl Exp $
+ * $Id: user.h,v 1.13 2000/06/15 03:32:35 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -11,7 +11,6 @@
 #define USER_H
 
 #include "nodes/parsenodes.h"
-#include "access/htup.h"
 
 extern void CreateUser(CreateUserStmt *stmt);
 extern void AlterUser(AlterUserStmt *stmt);
diff --git a/src/include/executor/nodeHashjoin.h b/src/include/executor/nodeHashjoin.h
index 7fed1b1f69..33936b2d41 100644
--- a/src/include/executor/nodeHashjoin.h
+++ b/src/include/executor/nodeHashjoin.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: nodeHashjoin.h,v 1.17 2000/01/26 05:58:05 momjian Exp $
+ * $Id: nodeHashjoin.h,v 1.18 2000/06/15 03:32:36 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,7 +15,6 @@
 #define NODEHASHJOIN_H
 
 #include "nodes/plannodes.h"
-#include "storage/buffile.h"
 
 extern TupleTableSlot *ExecHashJoin(HashJoin *node);
 extern bool ExecInitHashJoin(HashJoin *node, EState *estate, Plan *parent);
diff --git a/src/include/libpq/hba.h b/src/include/libpq/hba.h
index 1a5021ad26..58c2233113 100644
--- a/src/include/libpq/hba.h
+++ b/src/include/libpq/hba.h
@@ -4,7 +4,7 @@
  *	  Interface to hba.c
  *
  *
- * $Id: hba.h,v 1.17 2000/04/12 17:16:35 momjian Exp $
+ * $Id: hba.h,v 1.18 2000/06/15 03:32:42 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -13,8 +13,6 @@
 
 #include <netinet/in.h>
 
-#include "libpq/pqcomm.h"
-
 #define CONF_FILE "pg_hba.conf"
  /* Name of the config file  */
 
@@ -42,7 +40,7 @@ typedef enum UserAuth
 
 typedef struct Port hbaPort;
 
-int			hba_getauthmethod(hbaPort *port);
+int	hba_getauthmethod(hbaPort *port);
 int authident(struct sockaddr_in * raddr, struct sockaddr_in * laddr,
 		  const char *postgres_username, const char *auth_arg);
 
diff --git a/src/include/libpq/libpq-be.h b/src/include/libpq/libpq-be.h
index 76403d495e..3d5b2b0885 100644
--- a/src/include/libpq/libpq-be.h
+++ b/src/include/libpq/libpq-be.h
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: libpq-be.h,v 1.19 2000/04/12 17:16:36 momjian Exp $
+ * $Id: libpq-be.h,v 1.20 2000/06/15 03:32:42 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -18,6 +18,7 @@
 #include <sys/types.h>
 
 #include "libpq/hba.h"
+#include "libpq/pqcomm.h"
 
 #ifdef USE_SSL
 #include <openssl/ssl.h>
diff --git a/src/include/optimizer/internal.h b/src/include/optimizer/internal.h
index d7ef5f7ac5..e9b0c8e4bc 100644
--- a/src/include/optimizer/internal.h
+++ b/src/include/optimizer/internal.h
@@ -7,15 +7,13 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: internal.h,v 1.26 2000/01/26 05:58:20 momjian Exp $
+ * $Id: internal.h,v 1.27 2000/06/15 03:32:51 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef INTERNAL_H
 #define INTERNAL_H
 
-#include "catalog/pg_index.h"
-
 /*
  *		---------- SHARED MACROS
  *
diff --git a/src/include/parser/parse_expr.h b/src/include/parser/parse_expr.h
index 7c76001e4e..7f1b5d5122 100644
--- a/src/include/parser/parse_expr.h
+++ b/src/include/parser/parse_expr.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: parse_expr.h,v 1.18 2000/03/17 05:29:07 tgl Exp $
+ * $Id: parse_expr.h,v 1.19 2000/06/15 03:32:55 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,7 +15,6 @@
 #define PARSE_EXPR_H
 
 #include "parser/parse_node.h"
-#include "parser/parse_type.h"
 
 #define EXPR_COLUMN_FIRST	1
 #define EXPR_RELATION_FIRST 2
diff --git a/src/include/regex/regex2.h b/src/include/regex/regex2.h
index 25d7853c42..d6cb23a5d3 100644
--- a/src/include/regex/regex2.h
+++ b/src/include/regex/regex2.h
@@ -39,6 +39,8 @@
 
 #include "postgres.h"
 
+#include "limits.h"
+
 /*
  * First, the stuff that ends up in the outside-world include file
 */
diff --git a/src/include/regex/utils.h b/src/include/regex/utils.h
index b2e2307e1d..461e7ad6b0 100644
--- a/src/include/regex/utils.h
+++ b/src/include/regex/utils.h
@@ -39,6 +39,8 @@
 
 #include "postgres.h"
 
+#include "limits.h"
+
 /* utility definitions */
 #define DUPMAX			100000000		/* xxx is this right? */
 #define INFINITY		(DUPMAX + 1)
diff --git a/src/include/storage/buffile.h b/src/include/storage/buffile.h
index 078abebae5..a6f6312a7b 100644
--- a/src/include/storage/buffile.h
+++ b/src/include/storage/buffile.h
@@ -18,7 +18,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: buffile.h,v 1.5 2000/06/08 22:37:54 momjian Exp $
+ * $Id: buffile.h,v 1.6 2000/06/15 03:32:59 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -26,8 +26,6 @@
 #ifndef BUFFILE_H
 #define BUFFILE_H
 
-#include "storage/fd.h"
-
 /* BufFile is an opaque type whose details are not known outside buffile.c. */
 
 typedef struct BufFile BufFile;
diff --git a/src/include/storage/bufmgr.h b/src/include/storage/bufmgr.h
index 38db4807c0..a72b06f389 100644
--- a/src/include/storage/bufmgr.h
+++ b/src/include/storage/bufmgr.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: bufmgr.h,v 1.38 2000/05/19 03:22:26 tgl Exp $
+ * $Id: bufmgr.h,v 1.39 2000/06/15 03:33:00 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,11 +15,7 @@
 #define BUFMGR_H
 
 
-#include "storage/ipc.h"
-#include "storage/block.h"
-#include "storage/buf.h"
 #include "storage/buf_internals.h"
-#include "utils/rel.h"
 
 /*
  * the maximum size of a disk block for any possible installation.
diff --git a/src/include/storage/sinvaladt.h b/src/include/storage/sinvaladt.h
index 1d49eb8c62..30fe1e06da 100644
--- a/src/include/storage/sinvaladt.h
+++ b/src/include/storage/sinvaladt.h
@@ -7,14 +7,13 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: sinvaladt.h,v 1.21 2000/04/12 17:16:52 momjian Exp $
+ * $Id: sinvaladt.h,v 1.22 2000/06/15 03:33:00 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef SINVALADT_H
 #define SINVALADT_H
 
-#include "storage/ipc.h"
 #include "storage/itemptr.h"
 #include "storage/shmem.h"
 
diff --git a/src/include/tcop/tcopprot.h b/src/include/tcop/tcopprot.h
index a19e75a085..6f7bdd6e4e 100644
--- a/src/include/tcop/tcopprot.h
+++ b/src/include/tcop/tcopprot.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: tcopprot.h,v 1.29 2000/06/08 22:37:56 momjian Exp $
+ * $Id: tcopprot.h,v 1.30 2000/06/15 03:33:04 momjian Exp $
  *
  * OLD COMMENTS
  *	  This file was created so that other c files could get the two
@@ -21,7 +21,6 @@
 
 #include <setjmp.h>
 #include "executor/execdesc.h"
-#include "parser/parse_node.h"
 
 extern DLLIMPORT sigjmp_buf Warn_restart;
 extern bool Warn_restart_ready;
diff --git a/src/include/utils/builtins.h b/src/include/utils/builtins.h
index 6c4071fd5d..785c5a15bd 100644
--- a/src/include/utils/builtins.h
+++ b/src/include/utils/builtins.h
@@ -7,27 +7,19 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: builtins.h,v 1.116 2000/06/13 07:35:30 tgl Exp $
+ * $Id: builtins.h,v 1.117 2000/06/15 03:33:10 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef BUILTINS_H
 #define BUILTINS_H
 
-#include "fmgr.h"
 #include "nodes/relation.h"		/* for amcostestimate parameters */
 #include "storage/itemptr.h"
-#include "utils/array.h"
 #include "utils/inet.h"
-#include "utils/int8.h"
 #include "utils/geo_decls.h"
 #include "utils/numeric.h"
-#include "utils/datetime.h"
-#include "utils/timestamp.h"
-#include "utils/nabstime.h"
-#include "utils/date.h"
 #include "utils/lztext.h"
-#include "utils/varbit.h"
 
 /*
  *		Defined in adt/
diff --git a/src/include/utils/catcache.h b/src/include/utils/catcache.h
index 31ec660b9a..e2f92df147 100644
--- a/src/include/utils/catcache.h
+++ b/src/include/utils/catcache.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: catcache.h,v 1.22 2000/06/05 07:29:07 tgl Exp $
+ * $Id: catcache.h,v 1.23 2000/06/15 03:33:10 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -17,7 +17,6 @@
 /* #define		CACHEDEBUG		 turns DEBUG elogs on */
 
 #include "access/htup.h"
-#include "fmgr.h"
 #include "lib/dllist.h"
 
 /*
diff --git a/src/include/utils/ps_status.h b/src/include/utils/ps_status.h
index 90f088ea2d..a981fc398b 100644
--- a/src/include/utils/ps_status.h
+++ b/src/include/utils/ps_status.h
@@ -10,8 +10,6 @@
 #ifndef PS_STATUS_H
 #define PS_STATUS_H
 
-#include "libpq/libpq-be.h"
-
 void
 init_ps_display(int argc, char *argv[],
 				const char * username, const char * dbname,
diff --git a/src/include/utils/tuplesort.h b/src/include/utils/tuplesort.h
index 6b54eb9f0b..ffffe15f1b 100644
--- a/src/include/utils/tuplesort.h
+++ b/src/include/utils/tuplesort.h
@@ -13,7 +13,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: tuplesort.h,v 1.4 2000/04/12 17:16:56 momjian Exp $
+ * $Id: tuplesort.h,v 1.5 2000/06/15 03:33:11 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -22,9 +22,6 @@
 
 #include "access/htup.h"
 #include "access/itup.h"
-#include "access/skey.h"
-#include "access/tupdesc.h"
-#include "utils/rel.h"
 
 /* Tuplesortstate is an opaque type whose details are not known outside tuplesort.c. */