diff --git a/src/backend/lib/Makefile b/src/backend/lib/Makefile
index 434128ad27f..8127b78e607 100644
--- a/src/backend/lib/Makefile
+++ b/src/backend/lib/Makefile
@@ -4,16 +4,14 @@
 #    Makefile for lib (miscellaneous stuff)
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/lib/Makefile,v 1.1 1996/10/27 09:47:37 bryanh Exp $
+#    $Header: /cvsroot/pgsql/src/backend/lib/Makefile,v 1.2 1996/10/31 10:26:26 scrappy Exp $
 #
 #-------------------------------------------------------------------------
 
 SRCDIR = ../..
 include ../../Makefile.global
 
-INCLUDE_OPT = -I.. \
-              -I../port/$(PORTNAME) \
-              -I../include \
+INCLUDE_OPT = -I../port/$(PORTNAME) \
               -I../../include
 
 CFLAGS+=$(INCLUDE_OPT)
diff --git a/src/backend/lib/bit.c b/src/backend/lib/bit.c
index 9aa12b48502..995d8e3adf3 100644
--- a/src/backend/lib/bit.c
+++ b/src/backend/lib/bit.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/lib/Attic/bit.c,v 1.1.1.1 1996/07/09 06:21:28 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/lib/Attic/bit.c,v 1.2 1996/10/31 10:26:27 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,6 +15,8 @@
 /*
  * utils/memutils.h contains declarations of the functions in this file
  */
+#include "postgres.h"
+
 #include "utils/memutils.h"	
 
 void
diff --git a/src/backend/lib/dllist.c b/src/backend/lib/dllist.c
index 92526632c9f..93329c0f1ef 100644
--- a/src/backend/lib/dllist.c
+++ b/src/backend/lib/dllist.c
@@ -9,12 +9,13 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/lib/dllist.c,v 1.1.1.1 1996/07/09 06:21:28 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/lib/dllist.c,v 1.2 1996/10/31 10:26:30 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 
-#include "c.h"
+#include "postgres.h"
+
 #include "lib/dllist.h"
 
 Dllist*
diff --git a/src/backend/lib/fstack.c b/src/backend/lib/fstack.c
index 541767183d8..7ec61e0d29f 100644
--- a/src/backend/lib/fstack.c
+++ b/src/backend/lib/fstack.c
@@ -7,11 +7,11 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/lib/Attic/fstack.c,v 1.1.1.1 1996/07/09 06:21:28 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/lib/Attic/fstack.c,v 1.2 1996/10/31 10:26:31 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
-#include "c.h"
+#include "postgres.h"
 #include "lib/fstack.h"
 
 /*
diff --git a/src/backend/lib/hasht.c b/src/backend/lib/hasht.c
index 5487bed44bc..8e77c3836cc 100644
--- a/src/backend/lib/hasht.c
+++ b/src/backend/lib/hasht.c
@@ -8,11 +8,11 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/lib/Attic/hasht.c,v 1.1.1.1 1996/07/09 06:21:29 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/lib/Attic/hasht.c,v 1.2 1996/10/31 10:26:32 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
-#include "c.h"
+#include "postgres.h"
 #include "utils/memutils.h"
 #include "utils/elog.h"
 #include "utils/hsearch.h"
diff --git a/src/backend/lib/lispsort.c b/src/backend/lib/lispsort.c
index 0cf49bf0c0b..59635c8d001 100644
--- a/src/backend/lib/lispsort.c
+++ b/src/backend/lib/lispsort.c
@@ -6,11 +6,15 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/lib/Attic/lispsort.c,v 1.1.1.1 1996/07/09 06:21:29 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/lib/Attic/lispsort.c,v 1.2 1996/10/31 10:26:33 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
+
+#include <sys/types.h>
+
 #include "postgres.h"
+
 #include "nodes/pg_list.h"
 #include "nodes/primnodes.h"
 #include "nodes/plannodes.h"