diff --git a/src/backend/optimizer/path/allpaths.c b/src/backend/optimizer/path/allpaths.c
index 0ed2139095d3672566f4202d77b98074536f6045..d984765b4d4833f14ea816368f03e178fcc01e0f 100644
--- a/src/backend/optimizer/path/allpaths.c
+++ b/src/backend/optimizer/path/allpaths.c
@@ -7,11 +7,12 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/optimizer/path/allpaths.c,v 1.1.1.1 1996/07/09 06:21:35 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/optimizer/path/allpaths.c,v 1.2 1996/11/06 09:29:03 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include <string.h>
+#include <stdio.h>
 
 #include "postgres.h"
 
diff --git a/src/backend/optimizer/path/costsize.c b/src/backend/optimizer/path/costsize.c
index a1122fa30c63fd0c715b87981ea313f369a213fa..312dd84b59675116eba4b7f5e6890f81d997e146 100644
--- a/src/backend/optimizer/path/costsize.c
+++ b/src/backend/optimizer/path/costsize.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/optimizer/path/costsize.c,v 1.5 1996/10/31 10:17:09 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/optimizer/path/costsize.c,v 1.6 1996/11/06 09:29:04 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -29,6 +29,7 @@
 
 #include "postgres.h"
 
+#include <utils/lsyscache.h>
 #include "nodes/relation.h"
 
 #include "optimizer/cost.h"
diff --git a/src/backend/optimizer/plan/createplan.c b/src/backend/optimizer/plan/createplan.c
index 68c1cd14c3c9a35b54b3c703befa462965604f21..762cdf984be761db2e75d83a2d97ddcc07274e23 100644
--- a/src/backend/optimizer/plan/createplan.c
+++ b/src/backend/optimizer/plan/createplan.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/optimizer/plan/createplan.c,v 1.4 1996/10/31 10:59:09 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/optimizer/plan/createplan.c,v 1.5 1996/11/06 09:29:10 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,6 +15,9 @@
 
 #include "postgres.h"
 
+#include <utils/syscache.h>
+#include <catalog/pg_index.h>
+
 #include "nodes/execnodes.h"
 #include "nodes/plannodes.h"
 #include "nodes/relation.h"
diff --git a/src/backend/optimizer/util/Makefile b/src/backend/optimizer/util/Makefile
index 51d1a9ebaaf29794579ebfddc6e11a69527a4520..a927e4a0199ea8449a3a2b7db135e888dcef4d9b 100644
--- a/src/backend/optimizer/util/Makefile
+++ b/src/backend/optimizer/util/Makefile
@@ -4,14 +4,15 @@
 #    Makefile for optimizer/util
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/optimizer/util/Makefile,v 1.2 1996/10/31 10:59:34 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/backend/optimizer/util/Makefile,v 1.3 1996/11/06 09:29:18 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/optimizer/util/clauses.c b/src/backend/optimizer/util/clauses.c
index 93cb62080f4adc73a6ca885497c1c2999c313b31..563b6130749feae4bfd38f77fca30adcfaeff389 100644
--- a/src/backend/optimizer/util/clauses.c
+++ b/src/backend/optimizer/util/clauses.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/optimizer/util/clauses.c,v 1.3 1996/09/10 06:48:41 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/optimizer/util/clauses.c,v 1.4 1996/11/06 09:29:22 scrappy Exp $
  *
  * HISTORY
  *    AUTHOR		DATE		MAJOR EVENT
@@ -18,7 +18,7 @@
 
 #include "postgres.h"
 
-#include "nodes/pg_list.h"
+#include <catalog/pg_operator.h>
 #include "nodes/primnodes.h"
 #include "nodes/relation.h"
 #include "nodes/parsenodes.h"
@@ -27,7 +27,6 @@
 
 #include "catalog/pg_aggregate.h"
 
-#include "utils/elog.h"
 #include "utils/syscache.h"
 #include "utils/lsyscache.h"
 
diff --git a/src/backend/optimizer/util/plancat.c b/src/backend/optimizer/util/plancat.c
index 2f44c45c7f4eba6f8b6f5948402dd477397cd932..371b121a0f12306d988764544e67b15019f1e377 100644
--- a/src/backend/optimizer/util/plancat.c
+++ b/src/backend/optimizer/util/plancat.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/optimizer/util/plancat.c,v 1.2 1996/07/31 18:47:08 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/optimizer/util/plancat.c,v 1.3 1996/11/06 09:29:24 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -26,17 +26,18 @@
 #include "catalog/pg_inherits.h"
 #include "catalog/pg_version.h"
 
-#include "nodes/pg_list.h"
 #include "parser/parsetree.h"		/* for getrelid() */
 #include "fmgr.h"
 
 #include "optimizer/internal.h"
 #include "optimizer/plancat.h"
 
-#include "utils/tqual.h"
-#include "utils/elog.h"
-#include "utils/palloc.h"
 #include "utils/syscache.h"
+#ifndef HAVE_MEMMOVE
+# include <regex/utils.h>
+#else
+# include <string.h>
+#endif
 
 
 static void IndexSelectivity(Oid indexrelid, Oid indrelid, int32 nIndexKeys,
diff --git a/src/backend/optimizer/util/var.c b/src/backend/optimizer/util/var.c
index d40ff1795984e5f8f1bbb7538e46d02c423fa6d4..3eb0787e3efbb0bdbe515d2950b2437664ffdb6c 100644
--- a/src/backend/optimizer/util/var.c
+++ b/src/backend/optimizer/util/var.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/optimizer/util/var.c,v 1.2 1996/10/31 10:59:42 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/optimizer/util/var.c,v 1.3 1996/11/06 09:29:26 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,6 +15,8 @@
 
 #include "postgres.h"
 
+#include <nodes/relation.h>
+
 #include "nodes/primnodes.h"
 #include "nodes/nodeFuncs.h"