Final cleanup.

5 files changed, 31 insertions, 51 deletions

diff --git a/src/backend/tcop/dest.c b/src/backend/tcop/dest.c
index b82da2f350b..2e76d7862ed 100644
--- a/src/backend/tcop/dest.c
+++ b/src/backend/tcop/dest.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/tcop/dest.c,v 1.34 1999/07/16 03:13:49 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/tcop/dest.c,v 1.35 1999/07/16 04:59:51 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -37,12 +37,9 @@
 
 #include "postgres.h"
 
+#include "access/printtup.h"
 #include "libpq/libpq.h"
 #include "libpq/pqformat.h"
-#include "access/printtup.h"
-
-
-
 
 
 static char CommandInfo[32] = {0};
diff --git a/src/backend/tcop/fastpath.c b/src/backend/tcop/fastpath.c
index 8461711fc95..fa7045a9d97 100644
--- a/src/backend/tcop/fastpath.c
+++ b/src/backend/tcop/fastpath.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/tcop/fastpath.c,v 1.27 1999/07/16 03:13:50 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/tcop/fastpath.c,v 1.28 1999/07/16 04:59:53 momjian Exp $
  *
  * NOTES
  *	  This cruft is the server side of PQfn.
@@ -61,17 +61,14 @@
 
 #include "postgres.h"
 
-
-#include "utils/builtins.h"
-#include "tcop/fastpath.h"
-#include "libpq/libpq.h"
-#include "libpq/pqformat.h"
-
 #include "access/xact.h"
-
-#include "utils/syscache.h"
 #include "catalog/pg_proc.h"
 #include "catalog/pg_type.h"
+#include "libpq/libpq.h"
+#include "libpq/pqformat.h"
+#include "tcop/fastpath.h"
+#include "utils/builtins.h"
+#include "utils/syscache.h"
 
 
 /* ----------------
diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c
index 5cbc2ce2777..73f7c943e58 100644
--- a/src/backend/tcop/postgres.c
+++ b/src/backend/tcop/postgres.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.122 1999/07/16 03:13:50 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.123 1999/07/16 04:59:53 momjian Exp $
  *
  * NOTES
  *	  this is the "main" module of the postgres backend and
@@ -25,6 +25,9 @@
 #include <sys/types.h>
 #include <fcntl.h>
 #include <sys/param.h>
+
+#include "postgres.h"
+
 #ifndef MAXHOSTNAMELEN
 #include <netdb.h>
 #endif
@@ -41,13 +44,11 @@
 #ifdef __CYGWIN32__
 #endif
 
-#include "postgres.h"
-#include "miscadmin.h"
-
 #include "commands/async.h"
 #include "libpq/libpq.h"
 #include "libpq/pqformat.h"
 #include "libpq/pqsignal.h"
+#include "miscadmin.h"
 #include "nodes/print.h"
 #include "optimizer/cost.h"
 #include "optimizer/planner.h"
@@ -59,20 +60,12 @@
 #include "tcop/utility.h"
 #include "utils/ps_status.h"
 #include "utils/temprel.h"
-#include "../backend/parser/parse.h"
-
-#ifdef NOT_USED
-#endif
-
-#ifdef NOT_USED
-#endif
-
-#ifdef NOT_USED
-#endif
-
 #include "utils/trace.h"
 
+#include "../backend/parser/parse.h"
+
 #ifdef MULTIBYTE
+#include "mb/pg_wchar.h"
 #endif
 
 /*
@@ -1502,7 +1495,7 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[])
 	if (!IsUnderPostmaster)
 	{
 		puts("\nPOSTGRES backend interactive interface ");
-		puts("$Revision: 1.122 $ $Date: 1999/07/16 03:13:50 $\n");
+		puts("$Revision: 1.123 $ $Date: 1999/07/16 04:59:53 $\n");
 	}
 
 	/* ----------------
diff --git a/src/backend/tcop/pquery.c b/src/backend/tcop/pquery.c
index 57d897d3dea..6e08ed82fe6 100644
--- a/src/backend/tcop/pquery.c
+++ b/src/backend/tcop/pquery.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/tcop/pquery.c,v 1.25 1999/07/15 22:39:57 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/tcop/pquery.c,v 1.26 1999/07/16 04:59:55 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,10 +15,6 @@
 
 #include "postgres.h"
 
-
-
-
-
 #include "executor/execdefs.h"
 #include "executor/executor.h"
 #include "tcop/pquery.h"
diff --git a/src/backend/tcop/utility.c b/src/backend/tcop/utility.c
index e690148de9e..8c1ac556149 100644
--- a/src/backend/tcop/utility.c
+++ b/src/backend/tcop/utility.c
@@ -9,43 +9,40 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/tcop/utility.c,v 1.63 1999/07/15 22:39:57 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/tcop/utility.c,v 1.64 1999/07/16 04:59:55 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include "postgres.h"
+
 #include "access/heapam.h"
 #include "catalog/catalog.h"
 #include "catalog/pg_type.h"
-
 #include "commands/async.h"
 #include "commands/cluster.h"
 #include "commands/command.h"
 #include "commands/copy.h"
 #include "commands/creatinh.h"
 #include "commands/dbcommands.h"
-#include "commands/sequence.h"
 #include "commands/defrem.h"
-#include "commands/rename.h"
-#include "commands/view.h"
-#include "commands/vacuum.h"
 #include "commands/explain.h"
-#include "commands/trigger.h"
 #include "commands/proclang.h"
+#include "commands/rename.h"
+#include "commands/sequence.h"
+#include "commands/trigger.h"
+#include "commands/vacuum.h"
 #include "commands/variable.h"
-
-#include "../backend/parser/parse.h"
-#include "utils/acl.h"
-#include "rewrite/rewriteRemove.h"
+#include "commands/view.h"
+#include "miscadmin.h"
 #include "rewrite/rewriteDefine.h"
+#include "rewrite/rewriteRemove.h"
 #include "tcop/utility.h"
-#include "utils/ps_status.h"
-
-#ifndef NO_SECURITY
-#include "miscadmin.h"
 #include "utils/acl.h"
+#include "utils/acl.h"
+#include "utils/ps_status.h"
 #include "utils/syscache.h"
-#endif
+
+#include "../backend/parser/parse.h"
 
 void		DefineUser(CreateUserStmt *stmt, CommandDest);
 void		AlterUser(AlterUserStmt *stmt, CommandDest);