Final cleanup.

src/backend/libpq/auth.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/libpq/auth.c,v 1.38 1999/07/15 23:03:12 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/libpq/auth.c,v 1.39 1999/07/16 04:58:58 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -31,14 +31,13 @@
 #include <arpa/inet.h>
 
 #include "postgres.h"
-#include "miscadmin.h"
 
 #include "libpq/auth.h"
-#include "libpq/libpq.h"
-#include "libpq/hba.h"
-#include "libpq/password.h"
 #include "libpq/crypt.h"
-
+#include "libpq/hba.h"
+#include "libpq/libpq.h"
+#include "libpq/password.h"
+#include "miscadmin.h"
 
 static void sendAuthRequest(Port *port, AuthRequest areq, PacketDoneProc handler);
 static int	handle_done_auth(void *arg, PacketLen len, void *pkt);

src/backend/libpq/be-dumpdata.c

@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- *	$Id: be-dumpdata.c,v 1.28 1999/07/15 23:03:13 momjian Exp $
+ *	$Id: be-dumpdata.c,v 1.29 1999/07/16 04:58:58 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -31,11 +31,11 @@
 
 #include "postgres.h"
 
+#include "access/heapam.h"
+#include "access/printtup.h"
+#include "catalog/catalog.h"
 #include "lib/dllist.h"
 #include "libpq/libpq.h"
-#include "access/heapam.h"
-#include "catalog/catalog.h"
-#include "access/printtup.h"
 
 /* ----------------
  *		backend portal stack for recursive PQexec calls

src/backend/libpq/be-fsstubs.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/libpq/be-fsstubs.c,v 1.39 1999/07/16 03:12:55 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/libpq/be-fsstubs.c,v 1.40 1999/07/16 04:58:59 momjian Exp $
  *
  * NOTES
  *	  This should be moved to a more appropriate place.  It is here
@@ -37,10 +37,10 @@
 
 #include "postgres.h"
 
-#include "libpq/libpq-fs.h"
 #include "catalog/pg_shadow.h"
-#include "storage/large_object.h"
 #include "libpq/be-fsstubs.h"
+#include "libpq/libpq-fs.h"
+#include "storage/large_object.h"
 
 /* [PA] is Pascal Andr<64> <andre@via.ecp.fr> */
 

src/backend/libpq/be-pqexec.c

@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/libpq/Attic/be-pqexec.c,v 1.22 1999/07/15 23:03:13 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/libpq/Attic/be-pqexec.c,v 1.23 1999/07/16 04:59:00 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -22,11 +22,12 @@
  */
 #include "postgres.h"
 
+#include "libpq/libpq.h"
 #include "tcop/fastpath.h"
 #include "tcop/tcopprot.h"
-#include "libpq/libpq.h"
 #include "utils/builtins.h"
 #ifndef HAVE_MEMMOVE
+#include <regex/utils.h>
 #else
 #include <string.h>
 #endif

src/backend/libpq/crypt.c

@@ -9,7 +9,7 @@
  * Dec 17, 1997 - Todd A. Brandys
  *	Orignal Version Completed.
  *
- * $Id: crypt.c,v 1.21 1999/07/15 22:39:14 momjian Exp $
+ * $Id: crypt.c,v 1.22 1999/07/16 04:59:00 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -20,12 +20,13 @@
 #include <unistd.h>
 
 #include "postgres.h"
-#include "miscadmin.h"
-#include "utils/nabstime.h"
-#include "storage/fd.h"
 #include "libpq/crypt.h"
+#include "miscadmin.h"
+#include "storage/fd.h"
+#include "utils/nabstime.h"
 
 #ifdef HAVE_CRYPT_H
+#include "crypt.h"
 #endif
 
 char	  **pwd_cache = NULL;

src/backend/libpq/hba.c

@@ -5,7 +5,7 @@
  *	  wherein you authenticate a user by seeing what IP address the system
  *	  says he comes from and possibly using ident).
  *
- *	$Id: hba.c,v 1.45 1999/07/15 23:03:13 momjian Exp $
+ *	$Id: hba.c,v 1.46 1999/07/16 04:59:01 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -21,8 +21,8 @@
 #include <unistd.h>
 
 #include "postgres.h"
-#include "miscadmin.h"
 #include "libpq/libpq.h"
+#include "miscadmin.h"
 
 /* Some standard C libraries, including GNU, have an isblank() function.
    Others, including Solaris, do not.  So we have our own.

src/backend/libpq/password.c

@@ -1,19 +1,21 @@
 /*
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: password.c,v 1.23 1999/07/15 23:03:14 momjian Exp $
+ * $Id: password.c,v 1.24 1999/07/16 04:59:01 momjian Exp $
  *
  */
 
-#include "postgres.h"
-#include "miscadmin.h"
-#include "libpq/password.h"
-#include "libpq/libpq.h"
 #include <string.h>
 #include <unistd.h>
+#include "postgres.h"
 #ifdef HAVE_CRYPT_H
+#include "crypt.h"
 #endif
 
+#include "libpq/libpq.h"
+#include "libpq/password.h"
+#include "miscadmin.h"
+
 int
 verify_password(char *auth_arg, char *user, char *password)
 {

src/backend/libpq/portal.c

@@ -5,7 +5,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- *	$Id: portal.c,v 1.25 1999/07/16 03:12:56 momjian Exp $
+ *	$Id: portal.c,v 1.26 1999/07/16 04:59:02 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */

src/backend/libpq/portalbuf.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/libpq/Attic/portalbuf.c,v 1.19 1999/07/16 03:12:56 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/libpq/Attic/portalbuf.c,v 1.20 1999/07/16 04:59:03 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */

src/backend/libpq/pqcomm.c

@@ -28,7 +28,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- *	$Id: pqcomm.c,v 1.75 1999/07/16 03:12:57 momjian Exp $
+ *	$Id: pqcomm.c,v 1.76 1999/07/16 04:59:03 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -58,14 +58,7 @@
  *
  *------------------------
  */
-#include "postgres.h"
-
 #include <stdio.h>
-#if defined(HAVE_STRING_H)
-#include <string.h>
-#else
-#include <strings.h>
-#endif
 #include <signal.h>
 #include <errno.h>
 #include <fcntl.h>
@@ -79,6 +72,14 @@
 #include <arpa/inet.h>
 #include <sys/file.h>
 
+#include "postgres.h"
+
+#if defined(HAVE_STRING_H)
+#include <string.h>
+#else
+#include <strings.h>
+#endif
+
 #include "libpq/libpq.h"
 #include "miscadmin.h"
 

src/backend/libpq/pqformat.c

@@ -15,7 +15,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- *	$Id: pqformat.c,v 1.5 1999/07/15 22:39:15 momjian Exp $
+ *	$Id: pqformat.c,v 1.6 1999/07/16 04:59:04 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -45,9 +45,11 @@
  */
 #include "postgres.h"
 
-#include "libpq/pqformat.h"
 #include "libpq/libpq.h"
+#include "libpq/pqformat.h"
+
 #ifdef MULTIBYTE
+#include "mb/pg_wchar.h"
 #endif
 #include <string.h>
 #ifdef HAVE_ENDIAN_H

src/backend/libpq/pqsignal.c

@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/libpq/pqsignal.c,v 1.12 1999/07/15 23:03:14 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/libpq/pqsignal.c,v 1.13 1999/07/16 04:59:04 momjian Exp $
  *
  * NOTES
  *		This shouldn't be in libpq, but the monitor and some other
@@ -37,10 +37,10 @@
  *	is to do signal-handler reinstallation, which doesn't work well
  *	at all.
  * ------------------------------------------------------------------------*/
-#include "postgres.h"
-
 #include <signal.h>
 
+#include "postgres.h"
+
 #include "libpq/pqsignal.h"
 
 pqsigfunc