Revert part of recent include patch not ready for application.

8 files changed, 19 insertions, 8 deletions

diff --git a/src/interfaces/libpq/fe-auth.c b/src/interfaces/libpq/fe-auth.c
index a3eebd8c93e..3c9f5548785 100644
--- a/src/interfaces/libpq/fe-auth.c
+++ b/src/interfaces/libpq/fe-auth.c
@@ -10,7 +10,7 @@
  * exceed INITIAL_EXPBUFFER_SIZE (currently 256 bytes).
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/interfaces/libpq/fe-auth.c,v 1.117 2006/07/14 04:44:46 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/interfaces/libpq/fe-auth.c,v 1.118 2006/07/14 04:59:30 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -48,6 +48,7 @@
 #endif
 
 #include "libpq-fe.h"
+#include "libpq-int.h"
 #include "fe-auth.h"
 #include "libpq/md5.h"
 
@@ -57,6 +58,7 @@
  * MIT Kerberos authentication system - protocol version 5
  */
 
+#include <krb5.h>
 /* Some old versions of Kerberos do not include <com_err.h> in <krb5.h> */
 #if !defined(__COM_ERR_H) && !defined(__COM_ERR_H__)
 #include <com_err.h>
diff --git a/src/interfaces/libpq/fe-print.c b/src/interfaces/libpq/fe-print.c
index 846b759809d..8519c2deaaa 100644
--- a/src/interfaces/libpq/fe-print.c
+++ b/src/interfaces/libpq/fe-print.c
@@ -10,7 +10,7 @@
  * didn't really belong there.
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/interfaces/libpq/fe-print.c,v 1.69 2006/07/14 04:44:46 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/interfaces/libpq/fe-print.c,v 1.70 2006/07/14 04:59:30 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -35,6 +35,7 @@
 
 #include "libpq-fe.h"
 #include "libpq-int.h"
+#include "pqsignal.h"
 
 
 static void do_field(const PQprintOpt *po, const PGresult *res,
diff --git a/src/interfaces/libpq/fe-protocol2.c b/src/interfaces/libpq/fe-protocol2.c
index 43df7423d8b..3cd5be70c9a 100644
--- a/src/interfaces/libpq/fe-protocol2.c
+++ b/src/interfaces/libpq/fe-protocol2.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/interfaces/libpq/fe-protocol2.c,v 1.23 2006/07/14 04:44:46 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/interfaces/libpq/fe-protocol2.c,v 1.24 2006/07/14 04:59:30 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -21,6 +21,7 @@
 #include "libpq-fe.h"
 #include "libpq-int.h"
 
+#include "mb/pg_wchar.h"
 
 #ifdef WIN32
 #include "win32.h"
diff --git a/src/interfaces/libpq/fe-secure.c b/src/interfaces/libpq/fe-secure.c
index 0f39bc344c3..72708df9051 100644
--- a/src/interfaces/libpq/fe-secure.c
+++ b/src/interfaces/libpq/fe-secure.c
@@ -11,7 +11,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/interfaces/libpq/fe-secure.c,v 1.82 2006/07/14 04:44:46 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/interfaces/libpq/fe-secure.c,v 1.83 2006/07/14 04:59:30 momjian Exp $
  *
  * NOTES
  *	  [ Most of these notes are wrong/obsolete, but perhaps not all ]
@@ -84,7 +84,9 @@
 #include <ctype.h>
 
 #include "libpq-fe.h"
+#include "libpq-int.h"
 #include "fe-auth.h"
+#include "pqsignal.h"
 
 #ifdef WIN32
 #include "win32.h"
diff --git a/src/port/strdup.c b/src/port/strdup.c
index 00c0b1375ec..75c6321709c 100644
--- a/src/port/strdup.c
+++ b/src/port/strdup.c
@@ -8,13 +8,14 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/port/strdup.c,v 1.10 2006/07/14 04:44:46 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/port/strdup.c,v 1.11 2006/07/14 04:59:30 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 
 #include "c.h"
 
+#include "strdup.h"
 
 
 char *
diff --git a/src/timezone/pgtz.c b/src/timezone/pgtz.c
index c4203abd2a9..65de3c0dfce 100644
--- a/src/timezone/pgtz.c
+++ b/src/timezone/pgtz.c
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/timezone/pgtz.c,v 1.41 2006/07/14 04:44:46 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/timezone/pgtz.c,v 1.42 2006/07/14 04:59:30 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -19,10 +19,12 @@
 #include <time.h>
 
 #include "miscadmin.h"
+#include "pgtime.h"
 #include "pgtz.h"
 #include "storage/fd.h"
 #include "tzfile.h"
 #include "utils/datetime.h"
+#include "utils/elog.h"
 #include "utils/guc.h"
 #include "utils/hsearch.h"
 
diff --git a/src/timezone/strftime.c b/src/timezone/strftime.c
index 91f035635d8..0de592ed60c 100644
--- a/src/timezone/strftime.c
+++ b/src/timezone/strftime.c
@@ -15,7 +15,7 @@
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/timezone/strftime.c,v 1.9 2006/07/14 04:44:46 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/timezone/strftime.c,v 1.10 2006/07/14 04:59:30 momjian Exp $
  */
 
 #include "postgres.h"
@@ -24,6 +24,7 @@
 #include <locale.h>
 
 #include "private.h"
+#include "pgtz.h"
 #include "tzfile.h"
 
 
diff --git a/src/tutorial/funcs_new.c b/src/tutorial/funcs_new.c
index 378adade2e5..eb42ba79d52 100644
--- a/src/tutorial/funcs_new.c
+++ b/src/tutorial/funcs_new.c
@@ -1,4 +1,4 @@
-/* $PostgreSQL: pgsql/src/tutorial/funcs_new.c,v 1.9 2006/07/14 04:44:46 momjian Exp $ */
+/* $PostgreSQL: pgsql/src/tutorial/funcs_new.c,v 1.10 2006/07/14 04:59:30 momjian Exp $ */
 
 /******************************************************************************
   These are user-defined functions that can be bound to a Postgres backend
@@ -13,6 +13,7 @@
 
 #include "postgres.h"			/* general Postgres declarations */
 
+#include "fmgr.h"				/* for argument/result macros */
 #include "executor/executor.h"	/* for GetAttributeByName() */
 #include "utils/geo_decls.h"	/* for point type */