8 files changed, 15 insertions, 20 deletions
diff --git a/src/backend/utils/adt/acl.c b/src/backend/utils/adt/acl.c
index 0f7923f2ade..05a298e4ea2 100644
--- a/src/backend/utils/adt/acl.c
+++ b/src/backend/utils/adt/acl.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/acl.c,v 1.19 1997/11/01 05:21:38 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/acl.c,v 1.20 1997/11/24 05:08:54 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -17,8 +17,8 @@
 
 #include <utils/memutils.h>
 #include "utils/acl.h"
-#include "catalog/pg_user.h"
 #include "utils/syscache.h"
+#include "catalog/pg_user.h"
 #include "miscadmin.h"
 
 static char *getid(char *s, char *n);
diff --git a/src/backend/utils/adt/selfuncs.c b/src/backend/utils/adt/selfuncs.c
index c16e2e44937..32d23366b1b 100644
--- a/src/backend/utils/adt/selfuncs.c
+++ b/src/backend/utils/adt/selfuncs.c
@@ -12,7 +12,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/selfuncs.c,v 1.11 1997/11/20 23:23:03 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/selfuncs.c,v 1.12 1997/11/24 05:09:03 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -22,7 +22,6 @@
 #include "postgres.h"
 
 #include "access/heapam.h"
-#include "utils/tqual.h"		/* for NowTimeQual */
 #include "fmgr.h"
 #include "utils/builtins.h"		/* for textout() prototype and where the
 								 * declarations go */
diff --git a/src/backend/utils/adt/sets.c b/src/backend/utils/adt/sets.c
index 4340baa2eb5..1076714150c 100644
--- a/src/backend/utils/adt/sets.c
+++ b/src/backend/utils/adt/sets.c
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/sets.c,v 1.8 1997/11/20 23:23:05 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/sets.c,v 1.9 1997/11/24 05:09:04 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -26,6 +26,7 @@
 #include "catalog/indexing.h"	/* for Num_pg_proc_indices */
 #include "storage/lmgr.h"
 #include "utils/sets.h"			/* for GENERICSETNAME	   */
+#include "utils/tqual.h"
 #include "tcop/dest.h"
 #include "fmgr.h"
 
diff --git a/src/backend/utils/cache/catcache.c b/src/backend/utils/cache/catcache.c
index 535250e69b1..86c15b63016 100644
--- a/src/backend/utils/cache/catcache.c
+++ b/src/backend/utils/cache/catcache.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/cache/catcache.c,v 1.17 1997/11/20 23:23:08 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/cache/catcache.c,v 1.18 1997/11/24 05:09:09 momjian Exp $
  *
  * Notes:
  *		XXX This needs to use exception.h to handle recovery when
@@ -19,18 +19,18 @@
 #include "postgres.h"
 #include "access/heapam.h"
 #include "access/genam.h"
-#include "utils/builtins.h"
 #include "utils/tqual.h"
-#include "storage/bufpage.h"
-#include "access/valid.h"
-#include "miscadmin.h"
+#include "utils/builtins.h"
 #include "utils/portal.h"
 #include "utils/catcache.h"
-#include "fmgr.h"				/* for F_BOOLEQ, etc.  DANGER */
 #include "utils/elog.h"
 #include "utils/palloc.h"
 #include "utils/mcxt.h"
 #include "utils/rel.h"
+#include "storage/bufpage.h"
+#include "access/valid.h"
+#include "miscadmin.h"
+#include "fmgr.h"				/* for F_BOOLEQ, etc.  DANGER */
 #include "catalog/pg_type.h"	/* for OID of int28 type */
 #include "lib/dllist.h"
 
diff --git a/src/backend/utils/init/globals.c b/src/backend/utils/init/globals.c
index ba109f35008..6c56d83e09c 100644
--- a/src/backend/utils/init/globals.c
+++ b/src/backend/utils/init/globals.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/init/globals.c,v 1.16 1997/11/15 20:57:27 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/init/globals.c,v 1.17 1997/11/24 05:09:13 momjian Exp $
  *
  * NOTES
  *	  Globals used all over the place should be declared here and not
@@ -28,7 +28,6 @@
 
 #include <storage/backendid.h>
 #include "access/heapam.h"
-#include "utils/tqual.h"
 #include "storage/sinval.h"
 #include "storage/sinvaladt.h"
 #include "storage/lmgr.h"
diff --git a/src/backend/utils/init/postinit.c b/src/backend/utils/init/postinit.c
index a013ea6440c..56fcc817185 100644
--- a/src/backend/utils/init/postinit.c
+++ b/src/backend/utils/init/postinit.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/init/postinit.c,v 1.19 1997/11/18 07:58:10 vadim Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/init/postinit.c,v 1.20 1997/11/24 05:09:17 momjian Exp $
  *
  * NOTES
  *		InitPostgres() is the function called from PostgresMain
@@ -48,7 +48,6 @@
 #include "access/xact.h"
 #include "storage/bufmgr.h"
 #include "access/transam.h"		/* XXX dependency problem */
-#include "utils/tqual.h"
 #include "utils/syscache.h"
 #include "storage/bufpage.h"	/* for page layout, for InitMyDatabaseInfo() */
 #include "storage/sinval.h"
diff --git a/src/backend/utils/sort/psort.c b/src/backend/utils/sort/psort.c
index 4a490cc059c..fe25666ca5e 100644
--- a/src/backend/utils/sort/psort.c
+++ b/src/backend/utils/sort/psort.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/sort/Attic/psort.c,v 1.27 1997/10/25 01:10:52 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/sort/Attic/psort.c,v 1.28 1997/11/24 05:09:21 momjian Exp $
  *
  * NOTES
  *		Sorts the first relation into the second relation.
@@ -46,8 +46,6 @@
 #include "access/htup.h"
 #include "access/relscan.h"
 #include "access/skey.h"
-#include "utils/tqual.h"		/* for NowTimeQual */
-
 #include "storage/buf.h"
 #include "storage/bufmgr.h"		/* for BLCKSZ */
 #include "utils/portal.h"		/* for {Start,End}PortalAllocMode */
diff --git a/src/backend/utils/time/tqual.c b/src/backend/utils/time/tqual.c
index 23a21d4071d..9d267562f3a 100644
--- a/src/backend/utils/time/tqual.c
+++ b/src/backend/utils/time/tqual.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/time/tqual.c,v 1.10 1997/11/20 23:23:20 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/time/tqual.c,v 1.11 1997/11/24 05:09:24 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -22,7 +22,6 @@
 #include "access/transam.h"
 #include "utils/elog.h"
 #include "utils/palloc.h"
-
 #include "utils/tqual.h"
 
 extern bool PostgresIsInitialized;