diff --git a/src/backend/access/common/tupdesc.c b/src/backend/access/common/tupdesc.c
index be75674ead8bd1f94837fa29fdec637bc5afedf4..04622a1362a112f65748820e5554676a8c0c295d 100644
--- a/src/backend/access/common/tupdesc.c
+++ b/src/backend/access/common/tupdesc.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/common/tupdesc.c,v 1.27 1997/10/25 01:08:45 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/common/tupdesc.c,v 1.28 1997/11/24 05:07:42 momjian Exp $
  *
  * NOTES
  *	  some of the executor utility code such as "ExecTypeFromTL" should be
@@ -24,7 +24,6 @@
 #include <nodes/parsenodes.h>
 #include <utils/builtins.h>
 #include <utils/fcache.h>
-#include <utils/tqual.h>
 #include <utils/syscache.h>
 
 #ifndef HAVE_MEMMOVE
diff --git a/src/backend/access/gist/gist.c b/src/backend/access/gist/gist.c
index e9ea3041b753e7c89b92f20bdb86c1ee2675409a..34a5122742ab7a6338012f21879a597d1e8ae5f8 100644
--- a/src/backend/access/gist/gist.c
+++ b/src/backend/access/gist/gist.c
@@ -24,6 +24,7 @@
 #include <storage/bufpage.h>
 #include <storage/lmgr.h>
 #include <utils/syscache.h>
+#include <utils/tqual.h>
 
 #ifndef HAVE_MEMMOVE
 #include <regex/utils.h>
diff --git a/src/backend/bootstrap/bootparse.y b/src/backend/bootstrap/bootparse.y
index 2b341232a7a92d37dd9a19260eebeb1d43df04b9..05bbd682076245ea62d1d7afe6cea57e8225223d 100644
--- a/src/backend/bootstrap/bootparse.y
+++ b/src/backend/bootstrap/bootparse.y
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/bootstrap/bootparse.y,v 1.6 1997/11/21 18:04:03 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/bootstrap/bootparse.y,v 1.7 1997/11/24 05:07:54 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -35,7 +35,6 @@
 #include "storage/off.h"
 #include "storage/itemptr.h"
 #include "access/htup.h"
-#include "utils/tqual.h"
 #include "nodes/parsenodes.h"
 
 #include "access/xact.h"
diff --git a/src/backend/bootstrap/bootscanner.l b/src/backend/bootstrap/bootscanner.l
index 54108fe5b6686833d9f3878caeb48ca175a009ed..e94133c2b0c0845a15a7668e471b2ab447e14b09 100644
--- a/src/backend/bootstrap/bootscanner.l
+++ b/src/backend/bootstrap/bootscanner.l
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/bootstrap/bootscanner.l,v 1.7 1997/09/08 03:19:53 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/bootstrap/bootscanner.l,v 1.8 1997/11/24 05:07:56 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -39,7 +39,6 @@
 #include "nodes/primnodes.h"
 #include "utils/nabstime.h"
 #include "access/htup.h"
-#include "utils/tqual.h"
 #include "nodes/parsenodes.h"
 
 #include "parser/scansup.h"
diff --git a/src/backend/bootstrap/bootstrap.c b/src/backend/bootstrap/bootstrap.c
index 074a85ac2e25f172dbb36724e84d00a37a3f7717..0e0c071db82394255dadadb938c22e8f74eafdf7 100644
--- a/src/backend/bootstrap/bootstrap.c
+++ b/src/backend/bootstrap/bootstrap.c
@@ -7,7 +7,7 @@
  * Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.28 1997/11/20 23:20:33 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.29 1997/11/24 05:08:01 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -40,7 +40,6 @@
 #include "storage/itemptr.h"
 #include "utils/nabstime.h"
 #include "access/htup.h"
-#include "utils/tqual.h"
 #include "storage/buf.h"
 #include "access/relscan.h"
 #include "access/heapam.h"
diff --git a/src/backend/catalog/heap.c b/src/backend/catalog/heap.c
index d0174c6e7a0b028daa3ceded2b0181d9ef129bf0..6a150a01b22a411038eaf09a80c2a8f684c4ad8b 100644
--- a/src/backend/catalog/heap.c
+++ b/src/backend/catalog/heap.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.32 1997/11/21 18:04:11 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.33 1997/11/24 05:08:07 momjian Exp $
  *
  * INTERFACE ROUTINES
  *		heap_creatr()			- Create an uncataloged heap relation
@@ -51,6 +51,7 @@
 #include <utils/builtins.h>
 #include <utils/mcxt.h>
 #include <utils/relcache.h>
+#include <utils/tqual.h>
 #include <nodes/plannodes.h>
 #ifndef HAVE_MEMMOVE
 #include <regex/utils.h>
diff --git a/src/backend/catalog/index.c b/src/backend/catalog/index.c
index e1625343b8bc261d4a12616bd187e8d38aaf80d9..418123a0aa5979e9ad4907b4b6fc056f7b3ced7e 100644
--- a/src/backend/catalog/index.c
+++ b/src/backend/catalog/index.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/catalog/index.c,v 1.28 1997/11/21 19:59:28 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/catalog/index.c,v 1.29 1997/11/24 05:08:11 momjian Exp $
  *
  *
  * INTERFACE ROUTINES
@@ -30,18 +30,19 @@
 #include <fmgr.h>
 #include <access/genam.h>
 #include <access/heapam.h>
-#include <utils/builtins.h>
+#include <storage/lmgr.h>
+#include <miscadmin.h>
 #include <access/xact.h>
 #include <parser/catalog_utils.h>
 #include <storage/smgr.h>
-#include <storage/lmgr.h>
-#include <miscadmin.h>
+#include <utils/builtins.h>
 #include <utils/mcxt.h>
 #include <utils/relcache.h>
+#include <utils/syscache.h>
+#include <utils/tqual.h>
 #include <bootstrap/bootstrap.h>
 #include <catalog/catname.h>
 #include <catalog/catalog.h>
-#include <utils/syscache.h>
 #include <catalog/indexing.h>
 #include <catalog/heap.h>
 #include <catalog/index.h>
diff --git a/src/backend/catalog/pg_operator.c b/src/backend/catalog/pg_operator.c
index 32c2a038c8a43cca88ecfc6c2cc5905bbbd8fa88..a4b4919417e3b689bb5e3b39937fa8d30a6e02b7 100644
--- a/src/backend/catalog/pg_operator.c
+++ b/src/backend/catalog/pg_operator.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/catalog/pg_operator.c,v 1.15 1997/11/20 23:20:49 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/catalog/pg_operator.c,v 1.16 1997/11/24 05:08:15 momjian Exp $
  *
  * NOTES
  *	  these routines moved here from commands/define.c and somewhat cleaned up.
@@ -18,6 +18,7 @@
 
 #include <catalog/pg_proc.h>
 #include <utils/syscache.h>
+#include <utils/tqual.h>
 #include <access/heapam.h>
 #include <parser/catalog_utils.h>
 #include <catalog/catname.h>
diff --git a/src/backend/catalog/pg_type.c b/src/backend/catalog/pg_type.c
index 62f0161ffa2da52a1e57f3aca9da16e498d629b1..2dc80bbbe002ec4da346d07f53e12379caa9d18e 100644
--- a/src/backend/catalog/pg_type.c
+++ b/src/backend/catalog/pg_type.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/catalog/pg_type.c,v 1.12 1997/11/20 23:20:50 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/catalog/pg_type.c,v 1.13 1997/11/24 05:08:17 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -18,6 +18,7 @@
 #include <access/heapam.h>
 #include <access/relscan.h>
 #include <utils/builtins.h>
+#include <utils/tqual.h>
 #include <fmgr.h>
 #include <parser/catalog_utils.h>
 #include <catalog/catname.h>
diff --git a/src/backend/executor/execMain.c b/src/backend/executor/execMain.c
index d99e5abf6335132cccca23110609855498aba764..4eb368978584259c68de623ba4d7cb13cece8322 100644
--- a/src/backend/executor/execMain.c
+++ b/src/backend/executor/execMain.c
@@ -26,7 +26,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.32 1997/11/21 18:10:06 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.33 1997/11/24 05:08:20 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -42,6 +42,7 @@
 #include "utils/palloc.h"
 #include "utils/acl.h"
 #include "utils/syscache.h"
+#include "utils/tqual.h"
 #include "parser/parsetree.h"	/* rt_fetch() */
 #include "storage/bufmgr.h"
 #include "storage/lmgr.h"
diff --git a/src/backend/parser/parse_query.c b/src/backend/parser/parse_query.c
index 1230ecf7e2c4d4714dc0b61a8899d0770dbe8ec7..c47feeaa1145a1ecc7fc7297f24ebb99e5f7b66d 100644
--- a/src/backend/parser/parse_query.c
+++ b/src/backend/parser/parse_query.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/Attic/parse_query.c,v 1.24 1997/11/21 18:10:55 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/Attic/parse_query.c,v 1.25 1997/11/24 05:08:27 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -18,7 +18,6 @@
 
 #include "fmgr.h"
 #include "access/heapam.h"
-#include "utils/tqual.h"
 #include "access/tupmacs.h"
 #include "utils/builtins.h"
 #include "utils/elog.h"
diff --git a/src/backend/rewrite/rewriteRemove.c b/src/backend/rewrite/rewriteRemove.c
index a7c3552582a1fd82460f5cb08d2540c35c1a1b4c..c73dc261c0af57639f8f086e2a810d79933539f6 100644
--- a/src/backend/rewrite/rewriteRemove.c
+++ b/src/backend/rewrite/rewriteRemove.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteRemove.c,v 1.6 1997/11/20 23:22:37 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteRemove.c,v 1.7 1997/11/24 05:08:40 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -20,7 +20,6 @@
 #include "utils/syscache.h"
 #include "utils/elog.h"			/* for elog stuff */
 #include "utils/palloc.h"
-#include "utils/tqual.h"		/* 'NowTimeQual' defined here.. */
 #include "access/heapam.h"		/* heap AM calls defined here */
 #include "fmgr.h"				/* for CHAR_16_EQ */
 
diff --git a/src/backend/storage/lmgr/lmgr.c b/src/backend/storage/lmgr/lmgr.c
index c0367a992aba2c32e7b5342acd95c946735974d1..c54ff59e03b1998dd5b624f5dc35a97468db206c 100644
--- a/src/backend/storage/lmgr/lmgr.c
+++ b/src/backend/storage/lmgr/lmgr.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lmgr.c,v 1.8 1997/09/08 21:47:19 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lmgr.c,v 1.9 1997/11/24 05:08:43 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -26,7 +26,6 @@
 #include "access/htup.h"
 #include "access/relscan.h"
 #include "access/skey.h"
-#include "utils/tqual.h"
 #include "access/xact.h"
 
 #include "storage/block.h"
diff --git a/src/backend/tcop/aclchk.c b/src/backend/tcop/aclchk.c
index f37c38476a31b20e6bd92beb3bdf72a63ec2a4c2..0b8a49f1882aecd85190b1f95ca3002d1ec227d6 100644
--- a/src/backend/tcop/aclchk.c
+++ b/src/backend/tcop/aclchk.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/tcop/Attic/aclchk.c,v 1.18 1997/11/20 23:22:50 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/tcop/Attic/aclchk.c,v 1.19 1997/11/24 05:08:47 momjian Exp $
  *
  * NOTES
  *	  See acl.h.
@@ -33,6 +33,7 @@
 #include "catalog/pg_proc.h"
 #include "catalog/pg_user.h"
 #include "utils/syscache.h"
+#include "utils/tqual.h"
 #include "parser/catalog_utils.h"
 #include "fmgr.h"
 
diff --git a/src/backend/utils/adt/acl.c b/src/backend/utils/adt/acl.c
index 0f7923f2adea57f69ba4b633a6430c23ed2a2be3..05a298e4ea2836fcadb19703673b533c70a59895 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 c16e2e4493714e1ecb5db44bb822b9f35796231a..32d23366b1b44729869398e917292651b753c7eb 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 4340baa2eb5c2f0bc672a5b965e716e4d3e6610c..1076714150c376fa8d3aa86a61e2a9c1bbc89c77 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 535250e69b113a802ab69da0773fad7a3bd3798c..86c15b63016afab5fbd580293360bff39a162559 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 ba109f35008d4005eea2c4773693b487f43052b8..6c56d83e09c1d7522f71df71f42665888069ad75 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 a013ea6440c744d3755aa488dc0dd2b43ea3f8d1..56fcc8171856e3cec7c3f73d18ad480af10cf98f 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 4a490cc059c76cbdd979668f2be237b7ccd94bd7..fe25666ca5e1ef43b5a8bcaa40a82268d68b37d1 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 23a21d4071d1e259388a977f2c9defcb4686d960..9d267562f3a0386a176281c417fdddb89d5eb6ed 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;
diff --git a/src/include/access/relscan.h b/src/include/access/relscan.h
index 78c91dd2508add52c3df62145b2927669a8797b3..f8d0aed604948d17538a5df6ad542e4d2a0703f4 100644
--- a/src/include/access/relscan.h
+++ b/src/include/access/relscan.h
@@ -6,16 +6,16 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: relscan.h,v 1.9 1997/11/20 23:23:33 momjian Exp $
+ * $Id: relscan.h,v 1.10 1997/11/24 05:09:39 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef RELSCAN_H
 #define RELSCAN_H
 
-#include <utils/tqual.h>
 #include <storage/buf.h>
 #include <utils/rel.h>
+#include <access/htup.h>
 
 typedef ItemPointerData MarkData;
 
diff --git a/src/include/access/valid.h b/src/include/access/valid.h
index fec88923dbbab88598e852c9ad34dc5225334fc2..555ef7446b419eda02e16c24b3da9150c3901f43 100644
--- a/src/include/access/valid.h
+++ b/src/include/access/valid.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: valid.h,v 1.10 1997/11/20 23:23:35 momjian Exp $
+ * $Id: valid.h,v 1.11 1997/11/24 05:09:41 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -16,11 +16,11 @@
 #include <fmgr.h>
 #include <access/heapam.h>
 #include <access/valid.h>
-#include <utils/tqual.h>
 #include <storage/bufmgr.h>
 #include <storage/bufpage.h>
 #include <utils/rel.h>
 #include <utils/builtins.h>
+#include <utils/tqual.h>
 
 /* ----------------
  *		extern decl's
diff --git a/src/include/nodes/parsenodes.h b/src/include/nodes/parsenodes.h
index 298f05f3affa9a17b6951eb49d8b7f61f89f800d..c0a77d1ff3a5b7d23a510bb8c53a38e1b8b0ea39 100644
--- a/src/include/nodes/parsenodes.h
+++ b/src/include/nodes/parsenodes.h
@@ -6,14 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: parsenodes.h,v 1.34 1997/11/21 19:59:39 momjian Exp $
+ * $Id: parsenodes.h,v 1.35 1997/11/24 05:09:50 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef PARSENODES_H
 #define PARSENODES_H
 
-#include <utils/tqual.h>
 #include <nodes/primnodes.h>
 
 /*****************************************************************************