diff --git a/src/backend/access/common/printtup.c b/src/backend/access/common/printtup.c
index f536d8c751eeb56e22af9f76da17a20be6805660..b5736d1e7af3fd8cae369bdba6beb094824e193e 100644
--- a/src/backend/access/common/printtup.c
+++ b/src/backend/access/common/printtup.c
@@ -8,11 +8,12 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/common/printtup.c,v 1.12 1996/11/10 02:57:00 momjian Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/common/printtup.c,v 1.13 1997/01/10 20:16:22 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 
+#include <string.h>
 #include <postgres.h>
 
 #include <fmgr.h> 
diff --git a/src/backend/bootstrap/bootscanner.l b/src/backend/bootstrap/bootscanner.l
index 67d95b43b6b600a02458679e240c5c20d346b031..f6cb8468724960d3460d4ad22ce73adcdc942467 100644
--- a/src/backend/bootstrap/bootscanner.l
+++ b/src/backend/bootstrap/bootscanner.l
@@ -8,11 +8,12 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/bootstrap/bootscanner.l,v 1.5 1996/11/15 18:37:37 momjian Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/bootstrap/bootscanner.l,v 1.6 1997/01/10 20:16:26 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include <time.h>
+#include <string.h>
 
 #include "postgres.h"
 
diff --git a/src/backend/catalog/catalog.c b/src/backend/catalog/catalog.c
index b13a1d01f58e0efff6e840e1f0b639df6079ab79..bf04012d2ecfbe17d45ff6eee1a8c207830ca75f 100644
--- a/src/backend/catalog/catalog.c
+++ b/src/backend/catalog/catalog.c
@@ -7,10 +7,12 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/catalog/catalog.c,v 1.5 1996/11/10 02:59:21 momjian Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/catalog/catalog.c,v 1.6 1997/01/10 20:16:34 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
+#include <string.h>
+
 #include <postgres.h>
 
 #include <miscadmin.h>  /* for DataDir */
diff --git a/src/backend/catalog/indexing.c b/src/backend/catalog/indexing.c
index 111da8cbc952b3c870a3f767eb7e47d8416f02a3..aa798f85c636d722f3a7cfac518277ba4d76b864 100644
--- a/src/backend/catalog/indexing.c
+++ b/src/backend/catalog/indexing.c
@@ -8,10 +8,12 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/catalog/indexing.c,v 1.8 1997/01/10 09:51:40 vadim Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/catalog/indexing.c,v 1.9 1997/01/10 20:16:47 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
+#include <string.h>
+
 #include <postgres.h>
 
 #include <utils/builtins.h>
diff --git a/src/backend/commands/cluster.c b/src/backend/commands/cluster.c
index 3e8dcd549d273378ff6b217183302ec68a2de717..42e0211afd0bd4647a388f2beec541128995f280 100644
--- a/src/backend/commands/cluster.c
+++ b/src/backend/commands/cluster.c
@@ -14,10 +14,12 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/commands/cluster.c,v 1.9 1996/11/13 20:48:12 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/commands/cluster.c,v 1.10 1997/01/10 20:17:05 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
+#include <string.h>
+
 #include <postgres.h>
 
 #include <catalog/pg_index.h>
diff --git a/src/backend/commands/creatinh.c b/src/backend/commands/creatinh.c
index d98d8deceac476cc64fa1567703b4902786ba2db..88140241d1544f86d8beaca1ea3acdc95ec29868 100644
--- a/src/backend/commands/creatinh.c
+++ b/src/backend/commands/creatinh.c
@@ -7,11 +7,12 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/commands/Attic/creatinh.c,v 1.4 1996/11/06 08:21:32 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/commands/Attic/creatinh.c,v 1.5 1997/01/10 20:17:11 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include <stdio.h>
+#include <string.h>
 
 #include <postgres.h>
 
diff --git a/src/backend/commands/purge.c b/src/backend/commands/purge.c
index df43e601bac8380235d29c274edd416d50457ea8..d493d5d9c2654bc91fc3de05aaa315654cb3fb99 100644
--- a/src/backend/commands/purge.c
+++ b/src/backend/commands/purge.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/commands/Attic/purge.c,v 1.3 1996/11/06 08:21:36 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/commands/Attic/purge.c,v 1.4 1997/01/10 20:17:17 momjian Exp $
  *
  * Note:
  *	XXX There are many instances of int32 instead of ...Time.  These
@@ -15,6 +15,8 @@
  *
  *-------------------------------------------------------------------------
  */
+#include <string.h>
+
 #include <postgres.h>
 
 #include <access/heapam.h>
diff --git a/src/backend/commands/view.c b/src/backend/commands/view.c
index 1d36f9a30133e3277f6a148eb64481003e461c00..6bbd80cc19c19e6d48e5f07ef43c8a772e73264c 100644
--- a/src/backend/commands/view.c
+++ b/src/backend/commands/view.c
@@ -7,11 +7,12 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/commands/view.c,v 1.6 1996/12/11 03:17:17 bryanh Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/commands/view.c,v 1.7 1997/01/10 20:17:20 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include <stdio.h>	/* for sprintf() */
+#include <string.h>
 
 #include <postgres.h>
 
diff --git a/src/backend/executor/execJunk.c b/src/backend/executor/execJunk.c
index 79e0e0278f9dc98db936510a396f4a567c337592..8495702dc296df67d9c5997765a66828580c5f0b 100644
--- a/src/backend/executor/execJunk.c
+++ b/src/backend/executor/execJunk.c
@@ -7,11 +7,13 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/executor/execJunk.c,v 1.3 1996/11/08 05:55:55 momjian Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/executor/execJunk.c,v 1.4 1997/01/10 20:17:25 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 
+#include <string.h>
+
 #include "postgres.h"
 
 #include "utils/palloc.h"
diff --git a/src/backend/executor/execQual.c b/src/backend/executor/execQual.c
index f18cb4ed9367303eaf82c223fee6d3e361f1b3ae..7e9d6f0bace535b0c6f7154c4ee1351bfcfbf7da 100644
--- a/src/backend/executor/execQual.c
+++ b/src/backend/executor/execQual.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/executor/execQual.c,v 1.9 1996/11/06 06:47:34 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/executor/execQual.c,v 1.10 1997/01/10 20:17:31 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -29,6 +29,8 @@
  *	instead of doing needless copying.  -cim 5/31/91
  *
  */
+#include <string.h>
+
 #include "postgres.h"
 #include "fmgr.h"
 
diff --git a/src/backend/executor/nodeGroup.c b/src/backend/executor/nodeGroup.c
index 79616ea8a9754608e0e1cf5c7d49e2d22018ffa9..0637a8dd2826516d75f818c95720a99809225a01 100644
--- a/src/backend/executor/nodeGroup.c
+++ b/src/backend/executor/nodeGroup.c
@@ -13,10 +13,12 @@
  *    columns. (ie. tuples from the same group are consecutive)
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/executor/nodeGroup.c,v 1.4 1996/11/08 20:45:20 momjian Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/executor/nodeGroup.c,v 1.5 1997/01/10 20:17:35 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
+#include <string.h>
+
 #include "postgres.h"
 #include "fmgr.h"
 
diff --git a/src/backend/executor/nodeUnique.c b/src/backend/executor/nodeUnique.c
index 11790093e19a4d10416a1620d390233a2cf956b9..f0bbc13c3ca19e124c0d0c4939b5f2368831b690 100644
--- a/src/backend/executor/nodeUnique.c
+++ b/src/backend/executor/nodeUnique.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/executor/nodeUnique.c,v 1.5 1996/11/08 20:45:23 momjian Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/executor/nodeUnique.c,v 1.6 1997/01/10 20:17:38 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -22,6 +22,8 @@
  *	sorted order.
  *
  */
+#include <string.h>
+
 #include "postgres.h"
 #include "fmgr.h"
 
diff --git a/src/backend/nodes/equalfuncs.c b/src/backend/nodes/equalfuncs.c
index 06be41dea582cea6199cb21ce018bce83feadcb9..68903faae6d98fd133b8e6fc3b782e1ea786b03f 100644
--- a/src/backend/nodes/equalfuncs.c
+++ b/src/backend/nodes/equalfuncs.c
@@ -7,10 +7,12 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/nodes/equalfuncs.c,v 1.4 1996/11/10 03:00:34 momjian Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/nodes/equalfuncs.c,v 1.5 1997/01/10 20:17:43 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
+#include <string.h>
+
 #include "postgres.h"
 
 #include "nodes/nodes.h"
diff --git a/src/backend/optimizer/plan/createplan.c b/src/backend/optimizer/plan/createplan.c
index 2c576a964773c9998e4a4884d0ed2d0781fce8ce..7d131d7371bbec39b84a963da5e240bc308e7a11 100644
--- a/src/backend/optimizer/plan/createplan.c
+++ b/src/backend/optimizer/plan/createplan.c
@@ -7,10 +7,11 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/optimizer/plan/createplan.c,v 1.6 1996/11/08 05:57:08 momjian Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/optimizer/plan/createplan.c,v 1.7 1997/01/10 20:17:56 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
+#include <string.h>
 #include <sys/types.h>
 
 #include "postgres.h"
diff --git a/src/backend/optimizer/prep/prepunion.c b/src/backend/optimizer/prep/prepunion.c
index 1dd331031070a4fa7c3acae32d668ecd3c129ea0..3142f37c07a0f84282c8f79e6830f82a0aed160e 100644
--- a/src/backend/optimizer/prep/prepunion.c
+++ b/src/backend/optimizer/prep/prepunion.c
@@ -7,10 +7,11 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/optimizer/prep/prepunion.c,v 1.2 1996/10/31 10:59:30 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/optimizer/prep/prepunion.c,v 1.3 1997/01/10 20:18:12 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
+#include <string.h>
 #include <sys/types.h>
 
 #include "postgres.h"
diff --git a/src/backend/parser/dbcommands.c b/src/backend/parser/dbcommands.c
index 029491c293c81defb38bb7cfb7786cfece04892f..b5f617a58e243ff798ef0c71ce5b867de97844aa 100644
--- a/src/backend/parser/dbcommands.c
+++ b/src/backend/parser/dbcommands.c
@@ -7,11 +7,12 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/parser/Attic/dbcommands.c,v 1.2 1996/11/08 05:57:31 momjian Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/parser/Attic/dbcommands.c,v 1.3 1997/01/10 20:18:20 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include <stdio.h>
+#include <string.h>
 #include <signal.h>
 
 #include "postgres.h"
diff --git a/src/backend/storage/ipc/spin.c b/src/backend/storage/ipc/spin.c
index 8d60aae81b5e4bad712e113713fadad85cf9383d..6331f899e648b1d386815726d0b2d2e8cc6b1983 100644
--- a/src/backend/storage/ipc/spin.c
+++ b/src/backend/storage/ipc/spin.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/storage/ipc/Attic/spin.c,v 1.2 1996/11/03 05:07:02 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/storage/ipc/Attic/spin.c,v 1.3 1997/01/10 20:18:35 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -26,6 +26,9 @@
  */
 #include <errno.h>
 #include "postgres.h"
+#ifndef HAS_TEST_AND_SET
+#include <sys/sem.h>
+#endif
 #include "storage/ipc.h"
 #include "storage/shmem.h"
 #include "storage/spin.h"
diff --git a/src/backend/storage/lmgr/lmgr.c b/src/backend/storage/lmgr/lmgr.c
index a7120d7255a1cf119748fd18bfa356472621fd6d..fa3fc9ee4422587af5d82c5af8269c0a69f99073 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.3 1996/11/08 05:58:47 momjian Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lmgr.c,v 1.4 1997/01/10 20:18:47 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -18,6 +18,8 @@
 #define LOCKDEBUG	1
 #endif /*  LOCKDEBUGALL */
 
+#include <string.h>
+
 #include "postgres.h"
 
 #include "access/heapam.h"
diff --git a/src/backend/tcop/dest.c b/src/backend/tcop/dest.c
index 78142fcb3b9f4327b4f261733eee953ab19ceadc..832e509104dad205352f20419f89986fccd14837 100644
--- a/src/backend/tcop/dest.c
+++ b/src/backend/tcop/dest.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/tcop/dest.c,v 1.4 1997/01/08 08:36:31 bryanh Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/tcop/dest.c,v 1.5 1997/01/10 20:19:00 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -24,6 +24,8 @@
  *
  */
 #include <stdio.h>		/* for sprintf() */
+#include <string.h>
+
 #include "postgres.h"
 
 #include "access/htup.h"
diff --git a/src/backend/utils/Gen_fmgrtab.sh b/src/backend/utils/Gen_fmgrtab.sh
index 74e3342adddb71cb2c9b03178b9b5fc08653e16e..58eee405e55b1a0dd5be21044e112d2fafcb4b5d 100644
--- a/src/backend/utils/Gen_fmgrtab.sh
+++ b/src/backend/utils/Gen_fmgrtab.sh
@@ -8,7 +8,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/utils/Attic/Gen_fmgrtab.sh,v 1.9 1997/01/09 03:38:14 vadim Exp $
+#    $Header: /cvsroot/pgsql/src/backend/utils/Attic/Gen_fmgrtab.sh,v 1.10 1997/01/10 20:19:12 momjian Exp $
 #
 # NOTES
 #    Passes any -D options on to cpp prior to generating the list
@@ -81,7 +81,7 @@ cat > $HFILE <<FuNkYfMgRsTuFf
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: Gen_fmgrtab.sh,v 1.9 1997/01/09 03:38:14 vadim Exp $
+ * $Id: Gen_fmgrtab.sh,v 1.10 1997/01/10 20:19:12 momjian Exp $
  *
  * NOTES
  *	******************************
@@ -173,7 +173,7 @@ cat > $TABCFILE <<FuNkYfMgRtAbStUfF
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/utils/Attic/Gen_fmgrtab.sh,v 1.9 1997/01/09 03:38:14 vadim Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/utils/Attic/Gen_fmgrtab.sh,v 1.10 1997/01/10 20:19:12 momjian Exp $
  *
  * NOTES
  *
@@ -191,6 +191,8 @@ cat > $TABCFILE <<FuNkYfMgRtAbStUfF
  *-------------------------------------------------------------------------
  */
 
+#include <string.h>
+
 #include <postgres.h>
 
 #ifdef WIN32
diff --git a/src/backend/utils/adt/nabstime.c b/src/backend/utils/adt/nabstime.c
index 3544b9b4b8b85a19171610965515c7250e461373..438b35df3752ae022726ab8491c729f76dd9ff2b 100644
--- a/src/backend/utils/adt/nabstime.c
+++ b/src/backend/utils/adt/nabstime.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/utils/adt/nabstime.c,v 1.11 1997/01/10 18:22:41 momjian Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/utils/adt/nabstime.c,v 1.12 1997/01/10 20:19:33 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,6 +15,7 @@
 #include <ctype.h>
 #include <string.h>
 #include <sys/types.h>
+
 #include "postgres.h"
 #ifndef USE_POSIX_TIME
 #include <sys/timeb.h>
diff --git a/src/backend/utils/adt/oid.c b/src/backend/utils/adt/oid.c
index 04bf4690392023393b8c8ed80fe62913780a5e1a..7f5a05e5bea2799c182c4537c8ec6e5c1d96e7cc 100644
--- a/src/backend/utils/adt/oid.c
+++ b/src/backend/utils/adt/oid.c
@@ -7,12 +7,13 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/utils/adt/oid.c,v 1.3 1996/11/06 10:31:01 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/utils/adt/oid.c,v 1.4 1997/01/10 20:19:45 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 
 #include <stdio.h>
+#include <string.h>
 
 #include "postgres.h"
 #include "utils/builtins.h"	/* where function declarations go */
diff --git a/src/backend/utils/adt/sets.c b/src/backend/utils/adt/sets.c
index 7ab50498ca9e477bc77e7aad69f5acb1141f25f9..0a2f24f7b8075ca593db67f3bb401e96a59a97e0 100644
--- a/src/backend/utils/adt/sets.c
+++ b/src/backend/utils/adt/sets.c
@@ -9,11 +9,13 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/sets.c,v 1.3 1996/11/08 05:59:49 momjian Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/sets.c,v 1.4 1997/01/10 20:19:49 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include <stdio.h>		/* for sprintf() */
+#include <string.h>
+
 #include "postgres.h"
 #include "access/heapam.h"
 #include "access/relscan.h"