diff --git a/src/interfaces/libpq/Makefile b/src/interfaces/libpq/Makefile
index b6d19caed1..8a88617b73 100644
--- a/src/interfaces/libpq/Makefile
+++ b/src/interfaces/libpq/Makefile
@@ -7,17 +7,14 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/interfaces/libpq/Makefile,v 1.9 1996/11/02 09:54:44 bryanh Exp $
+#    $Header: /cvsroot/pgsql/src/interfaces/libpq/Makefile,v 1.10 1996/11/03 07:14:29 scrappy Exp $
 #
 #-------------------------------------------------------------------------
 
 SRCDIR= ..
 include ../Makefile.global
 
-INCLUDE_OPT= \
-             -I. \
-             -I../include \
-             -I../backend \
+INCLUDE_OPT= -I../include -I.
 
 CFLAGS+= $(INCLUDE_OPT) -DPOSTPORT='"$(POSTPORT)"'
 
diff --git a/src/interfaces/libpq/fe-auth.c b/src/interfaces/libpq/fe-auth.c
index 18a5a6f08f..103e64fdf5 100644
--- a/src/interfaces/libpq/fe-auth.c
+++ b/src/interfaces/libpq/fe-auth.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-auth.c,v 1.5 1996/10/13 04:50:27 momjian Exp $
+ *    $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-auth.c,v 1.6 1996/11/03 07:14:30 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -33,6 +33,9 @@
 #include <unistd.h>
 #include <sys/types.h>
 #include <pwd.h>
+
+#include "postgres.h"
+
 #include "libpq/pqcomm.h"
 
 #include "libpq-fe.h"
diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
index 848bb1c5d8..d0e50cfe34 100644
--- a/src/interfaces/libpq/fe-connect.c
+++ b/src/interfaces/libpq/fe-connect.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.12 1996/10/29 21:53:48 bryanh Exp $
+ *    $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.13 1996/11/03 07:14:31 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -22,8 +22,10 @@
 #include <netdb.h>
 #include <errno.h>
 #include <signal.h>
-#include <libpq/pqcomm.h> /* for decls of MsgType, PacketBuf, StartupInfo */
-#include <fe-auth.h>
+
+#include "postgres.h"
+#include "libpq/pqcomm.h" /* for decls of MsgType, PacketBuf, StartupInfo */
+#include "fe-auth.h"
 #include "libpq-fe.h"
 
 #if defined(PORTNAME_ultrix4) || defined(PORTNAME_next)
@@ -141,7 +143,7 @@ PQsetdb(const char *pghost, const char* pgport, const char* pgoptions, const cha
     } else
       conn->pgoptions = strdup(pgoptions);
 
-    if (tmp = getenv("PGUSER")) {
+    if ((tmp = getenv("PGUSER"))) {
       error = FALSE;
       conn->pguser = strdup(tmp);
     } else {
diff --git a/src/interfaces/libpq/fe-misc.c b/src/interfaces/libpq/fe-misc.c
index ea5b87df7e..852ceefe9e 100644
--- a/src/interfaces/libpq/fe-misc.c
+++ b/src/interfaces/libpq/fe-misc.c
@@ -11,13 +11,16 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-misc.c,v 1.2 1996/08/06 16:16:48 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-misc.c,v 1.3 1996/11/03 07:14:32 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 
 #include <stdlib.h>
 #include <stdio.h>
+
+#include "postgres.h"
+
 #include "libpq-fe.h"
 
 /* pqGetc: