From b43ebe5f83b28e06a3fd933b989aeccf0df7844a Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Thu, 13 Jul 2006 18:01:02 +0000
Subject: [PATCH] More include file adjustments.

---
 src/include/access/relscan.h    | 3 +--
 src/include/commands/vacuum.h   | 4 +---
 src/include/executor/hashjoin.h | 3 +--
 src/include/tcop/tcopprot.h     | 4 +---
 src/include/utils/catcache.h    | 3 +--
 src/include/utils/guc.h         | 3 +--
 src/include/utils/portal.h      | 4 +---
 src/include/utils/resowner.h    | 4 +---
 src/include/utils/syscache.h    | 3 +--
 9 files changed, 9 insertions(+), 22 deletions(-)

diff --git a/src/include/access/relscan.h b/src/include/access/relscan.h
index 46446f30cf..cbe7b0c244 100644
--- a/src/include/access/relscan.h
+++ b/src/include/access/relscan.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/access/relscan.h,v 1.47 2006/07/13 17:47:01 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/access/relscan.h,v 1.48 2006/07/13 18:01:01 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -16,7 +16,6 @@
 
 #include "access/skey.h"
 #include "storage/bufpage.h"
-#include "utils/rel.h"
 #include "utils/tqual.h"
 
 
diff --git a/src/include/commands/vacuum.h b/src/include/commands/vacuum.h
index ff68d68f83..fed481971d 100644
--- a/src/include/commands/vacuum.h
+++ b/src/include/commands/vacuum.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/commands/vacuum.h,v 1.66 2006/07/13 17:47:01 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/commands/vacuum.h,v 1.67 2006/07/13 18:01:02 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,8 +15,6 @@
 #define VACUUM_H
 
 #include "access/htup.h"
-#include "access/tupdesc.h"
-#include "catalog/pg_attribute.h"
 #include "catalog/pg_statistic.h"
 #include "catalog/pg_type.h"
 #include "nodes/parsenodes.h"
diff --git a/src/include/executor/hashjoin.h b/src/include/executor/hashjoin.h
index a225056a0b..956449e0ab 100644
--- a/src/include/executor/hashjoin.h
+++ b/src/include/executor/hashjoin.h
@@ -7,14 +7,13 @@
  * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/executor/hashjoin.h,v 1.40 2006/07/13 17:47:02 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/executor/hashjoin.h,v 1.41 2006/07/13 18:01:02 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef HASHJOIN_H
 #define HASHJOIN_H
 
-#include "access/htup.h"
 #include "fmgr.h"
 #include "storage/buffile.h"
 
diff --git a/src/include/tcop/tcopprot.h b/src/include/tcop/tcopprot.h
index 4509d8f7f1..fd87d87adb 100644
--- a/src/include/tcop/tcopprot.h
+++ b/src/include/tcop/tcopprot.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/tcop/tcopprot.h,v 1.81 2006/03/14 22:48:23 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/tcop/tcopprot.h,v 1.82 2006/07/13 18:01:02 momjian Exp $
  *
  * OLD COMMENTS
  *	  This file was created so that other c files could get the two
@@ -20,8 +20,6 @@
 #define TCOPPROT_H
 
 #include "executor/execdesc.h"
-#include "nodes/params.h"
-#include "tcop/dest.h"
 #include "utils/guc.h"
 
 
diff --git a/src/include/utils/catcache.h b/src/include/utils/catcache.h
index c8cffa9026..6c1ad164e3 100644
--- a/src/include/utils/catcache.h
+++ b/src/include/utils/catcache.h
@@ -13,7 +13,7 @@
  * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/utils/catcache.h,v 1.60 2006/07/13 17:47:02 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/utils/catcache.h,v 1.61 2006/07/13 18:01:02 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -22,7 +22,6 @@
 
 #include "access/htup.h"
 #include "access/skey.h"
-#include "access/tupdesc.h"
 #include "lib/dllist.h"
 #include "utils/rel.h"
 
diff --git a/src/include/utils/guc.h b/src/include/utils/guc.h
index 182a762cc0..2024a05d18 100644
--- a/src/include/utils/guc.h
+++ b/src/include/utils/guc.h
@@ -7,13 +7,12 @@
  * Copyright (c) 2000-2006, PostgreSQL Global Development Group
  * Written by Peter Eisentraut <peter_e@gmx.net>.
  *
- * $PostgreSQL: pgsql/src/include/utils/guc.h,v 1.68 2006/05/11 19:15:35 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/utils/guc.h,v 1.69 2006/07/13 18:01:02 momjian Exp $
  *--------------------------------------------------------------------
  */
 #ifndef GUC_H
 #define GUC_H
 
-#include "nodes/pg_list.h"
 #include "tcop/dest.h"
 #include "utils/array.h"
 
diff --git a/src/include/utils/portal.h b/src/include/utils/portal.h
index 64079fa9c1..059948f2ae 100644
--- a/src/include/utils/portal.h
+++ b/src/include/utils/portal.h
@@ -39,7 +39,7 @@
  * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/utils/portal.h,v 1.62 2006/07/13 16:49:20 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/utils/portal.h,v 1.63 2006/07/13 18:01:02 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -47,10 +47,8 @@
 #define PORTAL_H
 
 #include "executor/execdesc.h"
-#include "nodes/memnodes.h"
 #include "utils/resowner.h"
 #include "utils/timestamp.h"
-#include "utils/tuplestore.h"
 
 /*
  * We have several execution strategies for Portals, depending on what
diff --git a/src/include/utils/resowner.h b/src/include/utils/resowner.h
index 9c8b91670b..83e17e4184 100644
--- a/src/include/utils/resowner.h
+++ b/src/include/utils/resowner.h
@@ -12,17 +12,15 @@
  * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/utils/resowner.h,v 1.7 2006/06/16 18:42:23 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/utils/resowner.h,v 1.8 2006/07/13 18:01:02 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef RESOWNER_H
 #define RESOWNER_H
 
-#include "access/tupdesc.h"
 #include "storage/buf.h"
 #include "utils/catcache.h"
-#include "utils/rel.h"
 
 
 /*
diff --git a/src/include/utils/syscache.h b/src/include/utils/syscache.h
index 89e049a72b..5c84c7e17c 100644
--- a/src/include/utils/syscache.h
+++ b/src/include/utils/syscache.h
@@ -9,14 +9,13 @@
  * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/utils/syscache.h,v 1.64 2006/07/11 13:54:24 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/utils/syscache.h,v 1.65 2006/07/13 18:01:02 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef SYSCACHE_H
 #define SYSCACHE_H
 
-#include "access/htup.h"
 #include "utils/catcache.h"
 
 /*
-- 
GitLab