diff --git a/src/backend/catalog/heap.c b/src/backend/catalog/heap.c
index 678b752190f8d16a50663d5ec52a3a728f6d9c9f..45ad0408598ff2752a14aa067c5271a1f9c16184 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.3 1996/11/03 23:27:01 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.4 1996/11/05 11:57:50 scrappy Exp $
  *
  * INTERFACE ROUTINES
  *	heap_creatr()		- Create an uncataloged heap relation
@@ -30,6 +30,9 @@
 
 #include "postgres.h"
 
+#include <catalog/heap.h>
+#include <catalog/pg_proc.h>
+
 #include "parser/catalog_utils.h"
 
 #include "access/heapam.h"
diff --git a/src/backend/catalog/index.c b/src/backend/catalog/index.c
index 51223accc4996bac40d4bb4d00d32d46c6b3b08e..a027b8928abbb137df26b54b6347505762bf053b 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.5 1996/11/03 23:27:02 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/catalog/index.c,v 1.6 1996/11/05 11:57:52 scrappy Exp $
  *
  *
  * INTERFACE ROUTINES
@@ -25,6 +25,10 @@
  */
 #include "postgres.h"
 
+#include <catalog/pg_proc.h>
+#include <storage/bufmgr.h>
+#include <fmgr.h>
+
 #include "access/genam.h"
 #include "access/heapam.h"
 #include "utils/builtins.h"
@@ -60,6 +64,11 @@
 #include "optimizer/prep.h"
 
 #include "access/istrat.h"
+#ifndef HAVE_MEMMOVE
+# include <regex/utils.h>
+#else
+# include <string.h>
+#endif
 
 /*
  * macros used in guessing how many tuples are on a page.
@@ -1469,9 +1478,11 @@ DefaultBuild(Relation heapRelation,
     Datum		*datum;
     char		*nullv;
     long		reltuples, indtuples;
+#ifndef OMIT_PARTIAL_INDEX
     ExprContext		*econtext;
     TupleTable		tupleTable;
     TupleTableSlot	*slot;
+#endif
     Node		*predicate;
     Node		*oldPred;
     
diff --git a/src/backend/catalog/pg_operator.c b/src/backend/catalog/pg_operator.c
index 4fadf3fd7fc322b96777cdd090df52288b842a72..b980da799b0a6e181e5044b29f8531af4f0d3d72 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.3 1996/11/03 23:27:06 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/catalog/pg_operator.c,v 1.4 1996/11/05 11:57:53 scrappy Exp $
  *
  * NOTES
  *    these routines moved here from commands/define.c and somewhat cleaned up.
@@ -17,6 +17,9 @@
 #include <string.h>
 #include "postgres.h"
 
+#include <catalog/pg_proc.h>
+#include <utils/syscache.h>
+
 #include "access/heapam.h"
 #include "access/skey.h"
 #include "access/htup.h"
diff --git a/src/backend/catalog/pg_proc.c b/src/backend/catalog/pg_proc.c
index ddf12be6c060b00071d4f9b36bc16bdc9ecf4a5f..c6c01186eb5434fdde12d779a23c879decabda61 100644
--- a/src/backend/catalog/pg_proc.c
+++ b/src/backend/catalog/pg_proc.c
@@ -7,12 +7,14 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/catalog/pg_proc.c,v 1.2 1996/11/03 23:27:07 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/catalog/pg_proc.c,v 1.3 1996/11/05 11:57:54 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include <string.h>
 #include "postgres.h"
+#include <utils/syscache.h>
+#include <catalog/pg_proc.h>
 
 #include "access/heapam.h"
 #include "access/relscan.h"
diff --git a/src/backend/catalog/pg_type.c b/src/backend/catalog/pg_type.c
index c7e7ea8e5bf612908917c665a7be2d1e64804e41..6fbca03cb09ff7ef83b528813fd45295edee87d2 100644
--- a/src/backend/catalog/pg_type.c
+++ b/src/backend/catalog/pg_type.c
@@ -7,12 +7,15 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/catalog/pg_type.c,v 1.2 1996/11/03 23:27:08 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/catalog/pg_type.c,v 1.3 1996/11/05 11:57:55 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include <string.h>
 #include "postgres.h"
+#include <utils/syscache.h>
+#include <catalog/pg_proc.h>
+
 
 #include "access/heapam.h"
 #include "access/relscan.h"