7 files changed, 24 insertions, 19 deletions
diff --git a/src/backend/libpq/Makefile b/src/backend/libpq/Makefile
index e019f636a15..d7a0e6d09db 100644
--- a/src/backend/libpq/Makefile
+++ b/src/backend/libpq/Makefile
@@ -4,16 +4,14 @@
 #    Makefile for libpq subsystem (backend half of libpq interface)
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/libpq/Makefile,v 1.1 1996/10/27 09:47:47 bryanh Exp $
+#    $Header: /cvsroot/pgsql/src/backend/libpq/Makefile,v 1.2 1996/10/31 10:37:47 scrappy Exp $
 #
 #-------------------------------------------------------------------------
 
 SRCDIR = ../..
 include ../../Makefile.global
 
-INCLUDE_OPT = -I.. \
-              -I../port/$(PORTNAME) \
-              -I../include \
+INCLUDE_OPT = -I../port/$(PORTNAME) \
               -I../../include
 
 CFLAGS+=$(INCLUDE_OPT)
diff --git a/src/backend/libpq/auth.c b/src/backend/libpq/auth.c
index 3a42c236e03..bda22d19ab7 100644
--- a/src/backend/libpq/auth.c
+++ b/src/backend/libpq/auth.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/libpq/auth.c,v 1.4 1996/10/13 04:49:32 momjian Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/libpq/auth.c,v 1.5 1996/10/31 10:37:48 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -61,10 +61,13 @@
 
 #include <netinet/in.h>
 #include <arpa/inet.h>
-#include <libpq/auth.h>
-#include <libpq/libpq.h>
-#include <libpq/libpq-be.h>
-#include <libpq/hba.h>
+
+#include "postgres.h"
+
+#include "libpq/auth.h"
+#include "libpq/libpq.h"
+#include "libpq/libpq-be.h"
+#include "libpq/hba.h"
 
 /*----------------------------------------------------------------
  * common definitions for generic fe/be routines
diff --git a/src/backend/libpq/be-fsstubs.c b/src/backend/libpq/be-fsstubs.c
index 334f4790466..d44a3b5149a 100644
--- a/src/backend/libpq/be-fsstubs.c
+++ b/src/backend/libpq/be-fsstubs.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/libpq/be-fsstubs.c,v 1.2 1996/09/23 08:29:52 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/libpq/be-fsstubs.c,v 1.3 1996/10/31 10:37:49 scrappy Exp $
  *
  * NOTES
  *    This should be moved to a more appropriate place.  It is here
@@ -25,6 +25,9 @@
 #include "lib/dllist.h"
 #include "libpq/libpq.h"
 #include "libpq/libpq-fs.h"
+#include "nodes/nodes.h"
+#include "utils/memutils.h"
+#include "lib/fstack.h"
 #include "utils/mcxt.h"
 #include "utils/palloc.h"
 
diff --git a/src/backend/libpq/portal.c b/src/backend/libpq/portal.c
index 80c3468582f..1635184a64d 100644
--- a/src/backend/libpq/portal.c
+++ b/src/backend/libpq/portal.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/libpq/Attic/portal.c,v 1.2 1996/10/11 09:47:13 bryanh Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/libpq/Attic/portal.c,v 1.3 1996/10/31 10:37:50 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -58,7 +58,7 @@
 #include <stdio.h>	/* for sprintf() */
 #include <string.h>
 
-#include "c.h"
+#include "postgres.h"
 #include "lib/dllist.h"
 #include "libpq/libpq.h"	/* where the declarations go */
 #include "utils/exc.h"
diff --git a/src/backend/libpq/portalbuf.c b/src/backend/libpq/portalbuf.c
index f927e268edf..98f225d19d9 100644
--- a/src/backend/libpq/portalbuf.c
+++ b/src/backend/libpq/portalbuf.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/libpq/Attic/portalbuf.c,v 1.1.1.1 1996/07/09 06:21:30 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/libpq/Attic/portalbuf.c,v 1.2 1996/10/31 10:37:51 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -48,7 +48,7 @@
  *
  */
 #include <sys/types.h>
-#include "c.h"
+#include "postgres.h"
 
 #include "libpq/libpq.h"		/* where the declarations go */
 #include "utils/exc.h"
diff --git a/src/backend/libpq/pqcomm.c b/src/backend/libpq/pqcomm.c
index 01b5588507f..f78f4186364 100644
--- a/src/backend/libpq/pqcomm.c
+++ b/src/backend/libpq/pqcomm.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/libpq/pqcomm.c,v 1.3 1996/10/31 10:16:09 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/libpq/pqcomm.c,v 1.4 1996/10/31 10:37:52 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -34,6 +34,9 @@
  *	the postgres backend.
  *
  */
+
+#include "postgres.h"
+
 #include "libpq/pqsignal.h"	/* substitute for <signal.h> */
 #include <stdio.h>
 #include <string.h>
@@ -55,11 +58,9 @@
 #endif /* SOMAXCONN */
 #endif /* linux */
 
-#include "c.h"
 #include "libpq/auth.h"
 #include "libpq/libpq.h"	/* where the declarations go */
 #include "libpq/pqcomm.h"
-#include "utils/elog.h"
 
 /* ----------------
  *	declarations
diff --git a/src/backend/libpq/util.c b/src/backend/libpq/util.c
index 3330280753e..bd7eb47d258 100644
--- a/src/backend/libpq/util.c
+++ b/src/backend/libpq/util.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/libpq/Attic/util.c,v 1.1 1996/10/11 09:47:14 bryanh Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/libpq/Attic/util.c,v 1.2 1996/10/31 10:37:53 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -22,7 +22,7 @@
 #include <stdio.h>	/* for sprintf() */
 #include <string.h>
 
-#include "c.h"
+#include "postgres.h"
 #include "lib/dllist.h"
 #include "libpq/libpq.h"	/* where the declarations go */
 #include "utils/exc.h"