Cleanup of /include #include's, for 6.6 only.

19 files changed, 35 insertions, 53 deletions

diff --git a/src/include/access/valid.h b/src/include/access/valid.h
index 7728eadc0d..14970ecdb4 100644
--- a/src/include/access/valid.h
+++ b/src/include/access/valid.h
@@ -6,27 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: valid.h,v 1.18 1999/05/26 12:56:15 momjian Exp $
+ * $Id: valid.h,v 1.19 1999/07/14 01:20:08 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef VALID_H
 #define VALID_H
 
-#include <fmgr.h>
-#include <access/heapam.h>
-#include <access/valid.h>
-#include <storage/bufmgr.h>
-#include <storage/bufpage.h>
-#include <utils/rel.h>
-#include <utils/builtins.h>
-#include <utils/tqual.h>
-
-/* ----------------
- *		extern decl's
- * ----------------
- */
-
 /* ----------------
  *		HeapKeyTest
  *
diff --git a/src/include/catalog/pg_type.h b/src/include/catalog/pg_type.h
index d60bc86201..5c43691e24 100644
--- a/src/include/catalog/pg_type.h
+++ b/src/include/catalog/pg_type.h
@@ -7,7 +7,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_type.h,v 1.63 1999/07/09 03:28:52 momjian Exp $
+ * $Id: pg_type.h,v 1.64 1999/07/14 01:20:09 momjian Exp $
  *
  * NOTES
  *	  the genbki.sh script reads this file and generates .bki
@@ -18,8 +18,6 @@
 #ifndef PG_TYPE_H
 #define PG_TYPE_H
 
-#include <utils/rel.h>
-
 /* ----------------
  *		postgres.h contains the system type definitions and the
  *		CATALOG(), BOOTSTRAP and DATA() sugar words so this file
diff --git a/src/include/commands/async.h b/src/include/commands/async.h
index c6cd74aec4..f84464e049 100644
--- a/src/include/commands/async.h
+++ b/src/include/commands/async.h
@@ -5,15 +5,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: async.h,v 1.11 1999/02/13 23:21:17 momjian Exp $
+ * $Id: async.h,v 1.12 1999/07/14 01:20:11 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef ASYNC_H
 #define ASYNC_H
 
-#include <postgres.h>
-
 /* notify-related SQL statements */
 extern void Async_Notify(char *relname);
 extern void Async_Listen(char *relname, int pid);
diff --git a/src/include/commands/dbcommands.h b/src/include/commands/dbcommands.h
index 48cec93bd7..61f40cbff3 100644
--- a/src/include/commands/dbcommands.h
+++ b/src/include/commands/dbcommands.h
@@ -6,13 +6,14 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: dbcommands.h,v 1.8 1999/03/16 03:24:18 momjian Exp $
+ * $Id: dbcommands.h,v 1.9 1999/07/14 01:20:12 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef DBCOMMANDS_H
 #define DBCOMMANDS_H
 
+#include "tcop/dest.h"
 /*
  * Originally from tmp/daemon.h. The functions declared in daemon.h does not
  * exist; hence removed.		-- AY 7/29/94
diff --git a/src/include/commands/user.h b/src/include/commands/user.h
index edf836e5bb..3830c11045 100644
--- a/src/include/commands/user.h
+++ b/src/include/commands/user.h
@@ -10,6 +10,9 @@
 #ifndef USER_H
 #define USER_H
 
+#include "nodes/parsenodes.h"
+#include "tcop/dest.h"
+
 extern void DefineUser(CreateUserStmt *stmt, CommandDest);
 extern void AlterUser(AlterUserStmt *stmt, CommandDest);
 extern void RemoveUser(char *user, CommandDest);
diff --git a/src/include/commands/vacuum.h b/src/include/commands/vacuum.h
index f946188567..b456003f00 100644
--- a/src/include/commands/vacuum.h
+++ b/src/include/commands/vacuum.h
@@ -6,18 +6,20 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: vacuum.h,v 1.20 1999/05/25 22:42:43 momjian Exp $
+ * $Id: vacuum.h,v 1.21 1999/07/14 01:20:15 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef VACUUM_H
 #define VACUUM_H
 
+#include "fmgr.h"
 #include "access/funcindex.h"
 #include "catalog/pg_index.h"
 #include "catalog/pg_attribute.h"
 #include "nodes/pg_list.h"
 #include "storage/block.h"
+#include "storage/itemptr.h"
 #include "storage/off.h"
 
 
diff --git a/src/include/executor/execdebug.h b/src/include/executor/execdebug.h
index 0613a976e6..14aacc8bd3 100644
--- a/src/include/executor/execdebug.h
+++ b/src/include/executor/execdebug.h
@@ -6,15 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: execdebug.h,v 1.8 1999/02/23 07:39:40 thomas Exp $
+ * $Id: execdebug.h,v 1.9 1999/07/14 01:20:16 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef EXECDEBUG_H
 #define EXECDEBUG_H
 
-#include "access/printtup.h"
-
 /* ----------------------------------------------------------------
  *		debugging defines.
  *
@@ -319,8 +317,6 @@ extern int	NIndexTupleInserted;
  */
 #ifdef EXEC_MERGEJOINDEBUG
 
-#include "nodes/print.h"
-
 #define MJ_nodeDisplay(l)				nodeDisplay(l)
 #define MJ_printf(s)					printf(s)
 #define MJ1_printf(s, p)				printf(s, p)
diff --git a/src/include/executor/spi_priv.h b/src/include/executor/spi_priv.h
index 2046dd45cb..3e7988aa09 100644
--- a/src/include/executor/spi_priv.h
+++ b/src/include/executor/spi_priv.h
@@ -3,13 +3,14 @@
  * spi.c
  *				Server Programming Interface private declarations
  *
- * $Header: /cvsroot/pgsql/src/include/executor/spi_priv.h,v 1.4 1999/05/25 16:13:57 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/include/executor/spi_priv.h,v 1.5 1999/07/14 01:20:17 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef SPI_PRIV_H
 #define SPI_PRIV_H
 
+#include "executor/spi.h"
 #include "catalog/pg_type.h"
 #include "access/printtup.h"
 
diff --git a/src/include/libpq/hba.h b/src/include/libpq/hba.h
index ea603556c2..b4e03c08e0 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.13 1999/05/10 15:17:17 momjian Exp $
+ * $Id: hba.h,v 1.14 1999/07/14 01:20:17 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -13,8 +13,7 @@
 
 #include <netinet/in.h>
 
-#include "libpq/libpq-be.h"
-
+#include "libpq/pqcomm.h"
 
 #define CONF_FILE "pg_hba.conf"
  /* Name of the config file  */
diff --git a/src/include/mb/pg_wchar.h b/src/include/mb/pg_wchar.h
index c007560f41..a30e985a90 100644
--- a/src/include/mb/pg_wchar.h
+++ b/src/include/mb/pg_wchar.h
@@ -1,11 +1,9 @@
-/* $Id: pg_wchar.h,v 1.9 1999/07/11 22:47:19 ishii Exp $ */
+/* $Id: pg_wchar.h,v 1.10 1999/07/14 01:20:20 momjian Exp $ */
 
 #ifndef PG_WCHAR_H
 #define PG_WCHAR_H
 
 #include <sys/types.h>
-#include "postgres.h"
-#include "miscadmin.h"			/* for getdatabaseencoding() */
 
 #define SQL_ASCII 0				/* SQL/ASCII */
 #define EUC_JP 1				/* EUC for Japanese */
diff --git a/src/include/optimizer/subselect.h b/src/include/optimizer/subselect.h
index 0efab4755f..5e9e16e51d 100644
--- a/src/include/optimizer/subselect.h
+++ b/src/include/optimizer/subselect.h
@@ -7,6 +7,9 @@
 #ifndef SUBSELECT_H
 #define SUBSELECT_H
 
+#include "nodes/pg_list.h"
+#include "nodes/plannodes.h"
+
 extern int	PlannerQueryLevel;	/* level of current query */
 extern List *PlannerInitPlan;	/* init subplans for current query */
 extern List *PlannerParamVar;	/* to get Var from Param->paramid */
diff --git a/src/include/parser/parse_coerce.h b/src/include/parser/parse_coerce.h
index 6b634f13d9..a8ce037d59 100644
--- a/src/include/parser/parse_coerce.h
+++ b/src/include/parser/parse_coerce.h
@@ -6,13 +6,16 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: parse_coerce.h,v 1.12 1999/05/25 22:43:17 momjian Exp $
+ * $Id: parse_coerce.h,v 1.13 1999/07/14 01:20:25 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef PARSE_COERCE_H
 #define PARSE_COERCE_H
 
+#include "nodes/pg_list.h"
+#include "parser/parse_node.h"
+
 typedef enum CATEGORY
 {
 	INVALID_TYPE,
diff --git a/src/include/utils/catcache.h b/src/include/utils/catcache.h
index 240deeb65f..5f583aded3 100644
--- a/src/include/utils/catcache.h
+++ b/src/include/utils/catcache.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: catcache.h,v 1.15 1999/06/04 02:19:44 tgl Exp $
+ * $Id: catcache.h,v 1.16 1999/07/14 01:20:26 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -19,6 +19,7 @@
 #include <lib/dllist.h>
 #include <nodes/memnodes.h>
 #include <utils/rel.h>
+#include <utils/mcxt.h>
 
 /*
  *		struct catctup:			tuples in the cache.
diff --git a/src/include/utils/datetime.h b/src/include/utils/datetime.h
index a291c2eee6..fd87896b52 100644
--- a/src/include/utils/datetime.h
+++ b/src/include/utils/datetime.h
@@ -6,15 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: datetime.h,v 1.7 1999/02/13 23:22:16 momjian Exp $
+ * $Id: datetime.h,v 1.8 1999/07/14 01:20:29 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef DATETIME_H
 #define DATETIME_H
 
-#include "utils/dt.h"
-
 typedef int32 DateADT;
 
 typedef float8 TimeADT;
diff --git a/src/include/utils/memutils.h b/src/include/utils/memutils.h
index 20294073f1..754d023d2e 100644
--- a/src/include/utils/memutils.h
+++ b/src/include/utils/memutils.h
@@ -15,7 +15,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: memutils.h,v 1.28 1999/06/17 15:15:59 momjian Exp $
+ * $Id: memutils.h,v 1.29 1999/07/14 01:20:29 momjian Exp $
  *
  * NOTES
  *	  some of the information in this file will be moved to
@@ -26,6 +26,11 @@
 #ifndef MEMUTILS_H
 #define MEMUTILS_H
 
+/*
+ *	This is not needed by this include file, but by almost every file
+ *	that includes this file.
+ */
+#include "utils/mcxt.h"
 
 /* ----------------
  * Alignment macros: align a length or address appropriately for a given type.
diff --git a/src/include/utils/numeric.h b/src/include/utils/numeric.h
index 2cbf5f0c72..42daf5e4a5 100644
--- a/src/include/utils/numeric.h
+++ b/src/include/utils/numeric.h
@@ -5,7 +5,7 @@
  *
  *	1998 Jan Wieck
  *
- * $Header: /cvsroot/pgsql/src/include/utils/numeric.h,v 1.6 1999/05/25 22:43:37 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/include/utils/numeric.h,v 1.7 1999/07/14 01:20:30 momjian Exp $
  *
  * ----------
  */
@@ -13,9 +13,6 @@
 #ifndef _PG_NUMERIC_H_
 #define _PG_NUMERIC_H_
 
-#include "postgres.h"
-
-
 /* ----------
  * The hardcoded limits and defaults of the numeric data type
  * ----------
diff --git a/src/include/utils/palloc.h b/src/include/utils/palloc.h
index 69ad079bb2..5ea3d9bb84 100644
--- a/src/include/utils/palloc.h
+++ b/src/include/utils/palloc.h
@@ -6,15 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: palloc.h,v 1.9 1999/05/25 16:14:56 momjian Exp $
+ * $Id: palloc.h,v 1.10 1999/07/14 01:20:30 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef PALLOC_H
 #define PALLOC_H
 
-#include "c.h"
-
 #ifdef PALLOC_IS_MALLOC
 
 #define palloc(s)	  malloc(s)
@@ -27,8 +25,6 @@
  * In the case we use memory contexts, use macro's for palloc() etc.
  * ----------
  */
-#include "utils/mcxt.h"
-
 #define palloc(s)	  ((void *)MemoryContextAlloc(CurrentMemoryContext,(Size)(s)))
 #define pfree(p)	  MemoryContextFree(CurrentMemoryContext,(Pointer)(p))
 #define repalloc(p,s) ((void *)MemoryContextRealloc(CurrentMemoryContext,(Pointer)(p),(Size)(s)))
diff --git a/src/include/utils/ps_status.h b/src/include/utils/ps_status.h
index c68020ac08..43941fd648 100644
--- a/src/include/utils/ps_status.h
+++ b/src/include/utils/ps_status.h
@@ -15,7 +15,6 @@
 
 #include <stdio.h>
 #include <string.h>
-#include "utils/trace.h"
 
 extern char *ps_status_buffer;
 
diff --git a/src/include/utils/trace.h b/src/include/utils/trace.h
index 3174026ca5..dcfaf16e95 100644
--- a/src/include/utils/trace.h
+++ b/src/include/utils/trace.h
@@ -17,8 +17,6 @@
 #include <time.h>
 #include <stdarg.h>
 
-#include "postgres.h"
-
 #ifdef ELOG_TIMESTAMPS
 char	   *tprintf_timestamp(void);