diff --git a/src/backend/libpq/Makefile b/src/backend/libpq/Makefile
index d7a0e6d09d..0dbf2fb134 100644
--- a/src/backend/libpq/Makefile
+++ b/src/backend/libpq/Makefile
@@ -4,14 +4,15 @@
 #    Makefile for libpq subsystem (backend half of libpq interface)
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/libpq/Makefile,v 1.2 1996/10/31 10:37:47 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/backend/libpq/Makefile,v 1.3 1996/11/06 08:48:21 scrappy Exp $
 #
 #-------------------------------------------------------------------------
 
 SRCDIR = ../..
 include ../../Makefile.global
 
-INCLUDE_OPT = -I../port/$(PORTNAME) \
+INCLUDE_OPT = -I.. \
+              -I../port/$(PORTNAME) \
               -I../../include
 
 CFLAGS+=$(INCLUDE_OPT)
diff --git a/src/backend/libpq/auth.c b/src/backend/libpq/auth.c
index 8970469f90..ba015dd211 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.6 1996/11/06 06:48:06 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/libpq/auth.c,v 1.7 1996/11/06 08:48:23 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -62,13 +62,13 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
-#include "postgres.h"
-#include "miscadmin.h"
+#include <postgres.h>
+#include <miscadmin.h>
 
-#include "libpq/auth.h"
-#include "libpq/libpq.h"
-#include "libpq/libpq-be.h"
-#include "libpq/hba.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
@@ -129,7 +129,7 @@ static n_authsvcs = sizeof(authsvcs) / sizeof(struct authsvc);
  *----------------------------------------------------------------
  */
 
-#include "krb.h"
+#include <krb.h>
 
 #ifdef FRONTEND
 /* moves to src/libpq/fe-auth.c  */
@@ -228,7 +228,7 @@ return(STATUS_ERROR);
  *----------------------------------------------------------------
  */
 
-#include "krb5/krb5.h"
+#include <krb5/krb5.h>
 
 /*
  * pg_an_to_ln -- return the local name corresponding to an authentication
diff --git a/src/backend/libpq/be-dumpdata.c b/src/backend/libpq/be-dumpdata.c
index 9242741992..e595528b56 100644
--- a/src/backend/libpq/be-dumpdata.c
+++ b/src/backend/libpq/be-dumpdata.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/libpq/Attic/be-dumpdata.c,v 1.2 1996/11/06 06:48:10 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/libpq/Attic/be-dumpdata.c,v 1.3 1996/11/06 08:48:24 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -30,25 +30,22 @@
  *
  */
 #include <string.h>
-#include "postgres.h"
 
-#include "lib/dllist.h"
-#include "libpq/libpq-be.h"
+#include <postgres.h>
 
-#include "access/heapam.h"
-#include "access/htup.h"
-#include "storage/buf.h"
-#include "utils/memutils.h"
-#include "utils/palloc.h"
-#include "fmgr.h"
-#include "utils/mcxt.h"
-#include "utils/elog.h"
-#include "utils/exc.h"
-
-#include "utils/syscache.h"
-#include "catalog/pg_type.h"
-#include "catalog/catalog.h"
-#include "access/printtup.h"
+#include <lib/dllist.h>
+#include <libpq/libpq-be.h>
+#include <access/heapam.h>
+#include <access/htup.h>
+#include <storage/buf.h>
+#include <utils/memutils.h>
+#include <fmgr.h>
+#include <utils/mcxt.h>
+#include <utils/exc.h>
+#include <utils/syscache.h>
+#include <catalog/pg_type.h>
+#include <catalog/catalog.h>
+#include <access/printtup.h>
 
 /* ----------------
  *	backend portal stack for recursive PQexec calls
diff --git a/src/backend/libpq/be-fsstubs.c b/src/backend/libpq/be-fsstubs.c
index d44a3b5149..6888494b88 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.3 1996/10/31 10:37:49 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/libpq/be-fsstubs.c,v 1.4 1996/11/06 08:48:25 scrappy Exp $
  *
  * NOTES
  *    This should be moved to a more appropriate place.  It is here
@@ -21,21 +21,23 @@
  *    closed.
  *-------------------------------------------------------------------------
  */
-#include "postgres.h"
-#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"
 
-#include "storage/fd.h"		/* for O_ */
-#include "storage/large_object.h"
+#include <fcntl.h>
+#include <sys/types.h>
+#include <unistd.h>
 
-#include "utils/elog.h"
-#include "libpq/be-fsstubs.h"
+#include <postgres.h>
+
+#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 <storage/fd.h>		/* for O_ */
+#include <storage/large_object.h>
+#include <libpq/be-fsstubs.h>
 
 /*#define FSDB 1*/
 #define MAX_LOBJ_FDS 256
diff --git a/src/backend/libpq/be-pqexec.c b/src/backend/libpq/be-pqexec.c
index 1b1738d4fc..b880ba7100 100644
--- a/src/backend/libpq/be-pqexec.c
+++ b/src/backend/libpq/be-pqexec.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/libpq/Attic/be-pqexec.c,v 1.1.1.1 1996/07/09 06:21:30 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/libpq/Attic/be-pqexec.c,v 1.2 1996/11/06 08:48:26 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -20,19 +20,22 @@
  * NOTES
  *	These routines are compiled into the postgres backend.
  */
-#include "postgres.h"
+#include <postgres.h>
 
-#include "nodes/pg_list.h"
-#include "tcop/dest.h"
-#include "tcop/fastpath.h"
-#include "tcop/tcopprot.h"
-#include "lib/dllist.h"
-#include "libpq/libpq-be.h"
-#include "fmgr.h"
-#include "utils/exc.h"
-#include "utils/builtins.h"
-#include "utils/elog.h"
-#include "utils/palloc.h"
+#include <nodes/pg_list.h>
+#include <tcop/dest.h>
+#include <tcop/fastpath.h>
+#include <tcop/tcopprot.h>
+#include <lib/dllist.h>
+#include <libpq/libpq-be.h>
+#include <fmgr.h>
+#include <utils/exc.h>
+#include <utils/builtins.h>
+#ifndef HAVE_MEMMOVE
+# include <regex/utils.h>
+#else
+# include <string.h>
+#endif
 
 /* ----------------------------------------------------------------
  *			PQ interface routines
diff --git a/src/backend/libpq/hba.c b/src/backend/libpq/hba.c
index b93890231f..7172dd31a0 100644
--- a/src/backend/libpq/hba.c
+++ b/src/backend/libpq/hba.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/libpq/hba.c,v 1.9 1996/11/06 06:48:12 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/libpq/hba.c,v 1.10 1996/11/06 08:48:27 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -21,14 +21,14 @@
 #include <arpa/inet.h>
 #include <unistd.h>
 #if defined(sparc_solaris)
-#include "inet_aton.h" /* after I copied it into port/sparc_solaris */
+#include <inet_aton.h> /* after I copied it into port/sparc_solaris */
 #endif
 
-#include "postgres.h"
-#include "miscadmin.h"
-#include "libpq/libpq.h"
-#include "libpq/pqcomm.h"
-#include "libpq/hba.h"
+#include <postgres.h>
+#include <miscadmin.h>
+#include <libpq/libpq.h>
+#include <libpq/pqcomm.h>
+#include <libpq/hba.h>
 
 
 #define CONF_FILE "pg_hba.conf"             
diff --git a/src/backend/libpq/portal.c b/src/backend/libpq/portal.c
index 1635184a64..e54e18676f 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.3 1996/10/31 10:37:50 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/libpq/Attic/portal.c,v 1.4 1996/11/06 08:48:28 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -58,11 +58,11 @@
 #include <stdio.h>	/* for sprintf() */
 #include <string.h>
 
-#include "postgres.h"
-#include "lib/dllist.h"
-#include "libpq/libpq.h"	/* where the declarations go */
-#include "utils/exc.h"
-#include "utils/palloc.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 98f225d19d..e0390c5ae7 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.2 1996/10/31 10:37:51 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/libpq/Attic/portalbuf.c,v 1.3 1996/11/06 08:48:29 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -47,12 +47,13 @@
  *	see utils/mmgr/portalmem.c for why. -cim 2/22/91
  *
  */
+#include <string.h>
 #include <sys/types.h>
-#include "postgres.h"
 
-#include "libpq/libpq.h"		/* where the declarations go */
-#include "utils/exc.h"
-#include "utils/palloc.h"
+#include <postgres.h>
+
+#include <libpq/libpq.h>		/* where the declarations go */
+#include <utils/exc.h>
 
 PortalEntry** portals = (PortalEntry**) NULL;
 size_t portals_array_size = 0;
diff --git a/src/backend/libpq/pqcomm.c b/src/backend/libpq/pqcomm.c
index f78f418636..ada4d4a30a 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.4 1996/10/31 10:37:52 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/libpq/pqcomm.c,v 1.5 1996/11/06 08:48:30 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -34,23 +34,22 @@
  *	the postgres backend.
  *
  */
-
-#include "postgres.h"
-
-#include "libpq/pqsignal.h"	/* substitute for <signal.h> */
 #include <stdio.h>
 #include <string.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <signal.h>
 #ifndef WIN32
 #include <unistd.h>		/* for ttyname() */
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netdb.h>
 #include <netinet/in.h>
+#include <sys/socket.h>
+#include <arpa/inet.h>
 #else
 #include <winsock.h>
 #endif /* WIN32 */
-#include <errno.h>
-#include <fcntl.h>
 
 #if defined(linux)
 #ifndef SOMAXCONN
@@ -58,9 +57,11 @@
 #endif /* SOMAXCONN */
 #endif /* linux */
 
-#include "libpq/auth.h"
-#include "libpq/libpq.h"	/* where the declarations go */
-#include "libpq/pqcomm.h"
+#include <postgres.h>
+
+#include <libpq/pqsignal.h>	/* substitute for <signal.h> */
+#include <libpq/auth.h>
+#include <libpq/libpq.h>	/* where the declarations go */
 
 /* ----------------
  *	declarations
diff --git a/src/backend/libpq/pqpacket.c b/src/backend/libpq/pqpacket.c
index edf373d1af..5b2ce7e6ad 100644
--- a/src/backend/libpq/pqpacket.c
+++ b/src/backend/libpq/pqpacket.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/libpq/Attic/pqpacket.c,v 1.1.1.1 1996/07/09 06:21:31 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/libpq/Attic/pqpacket.c,v 1.2 1996/11/06 08:48:31 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -48,12 +48,10 @@
 #include <fcntl.h>
 #include <errno.h>
 
-#include "postgres.h"
-#include "miscadmin.h" 
-#include "utils/elog.h"
-#include "storage/ipc.h"
-#include "libpq/pqcomm.h"	/* where the declarations go */
-#include "libpq/libpq.h"
+#include <postgres.h>
+#include <miscadmin.h>
+#include <storage/ipc.h>
+#include <libpq/libpq.h>
 
 /*
  * PacketReceive -- receive a packet on a port.
diff --git a/src/backend/libpq/pqsignal.c b/src/backend/libpq/pqsignal.c
index 67bbc16fba..98519ae7e1 100644
--- a/src/backend/libpq/pqsignal.c
+++ b/src/backend/libpq/pqsignal.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/libpq/pqsignal.c,v 1.2 1996/11/03 06:52:14 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/libpq/pqsignal.c,v 1.3 1996/11/06 08:48:32 scrappy Exp $
  *
  * NOTES
  *	This shouldn't be in libpq, but the monitor and some other
@@ -16,9 +16,9 @@
  *
  *-------------------------------------------------------------------------
  */
-#include "postgres.h"
+#include <postgres.h>
 
-#include "libpq/pqsignal.h"
+#include <libpq/pqsignal.h>
 
 pqsigfunc
 pqsignal(int signo, pqsigfunc func)
diff --git a/src/backend/libpq/util.c b/src/backend/libpq/util.c
index bd7eb47d25..e8ca2e4ccc 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.2 1996/10/31 10:37:53 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/libpq/Attic/util.c,v 1.3 1996/11/06 08:48:33 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -22,11 +22,10 @@
 #include <stdio.h>	/* for sprintf() */
 #include <string.h>
 
-#include "postgres.h"
-#include "lib/dllist.h"
-#include "libpq/libpq.h"	/* where the declarations go */
-#include "utils/exc.h"
-#include "utils/palloc.h"
+#include <postgres.h>
+#include <lib/dllist.h>
+#include <libpq/libpq.h>	/* where the declarations go */
+#include <utils/exc.h>
 
 
 /* ----------------