diff --git a/lang/cem/cemcom.ansi/domacro.c b/lang/cem/cemcom.ansi/domacro.c
index 412ab3040..b1c4f5df3 100644
--- a/lang/cem/cemcom.ansi/domacro.c
+++ b/lang/cem/cemcom.ansi/domacro.c
@@ -6,7 +6,8 @@
 /* PREPROCESSOR: CONTROLLINE INTERPRETER */
 
 #include	<assert.h>
-#include    <stdlib.h>
+#include	<stdlib.h>
+#include	<string.h>
 #include	"parameters.h"
 #include    "idf.h"
 #include	"arith.h"
diff --git a/lang/cem/cemcom.ansi/main.c b/lang/cem/cemcom.ansi/main.c
index 5c7ada033..f521453ba 100644
--- a/lang/cem/cemcom.ansi/main.c
+++ b/lang/cem/cemcom.ansi/main.c
@@ -5,6 +5,7 @@
 /* $Id$ */
 /* MAIN PROGRAM */
 
+#include	<string.h>
 #include	"parameters.h"
 #include	<ack_string.h>
 #include	<system.h>
diff --git a/lang/cem/cpp.ansi/domacro.c b/lang/cem/cpp.ansi/domacro.c
index 306ed32cc..193610a6f 100644
--- a/lang/cem/cpp.ansi/domacro.c
+++ b/lang/cem/cpp.ansi/domacro.c
@@ -5,7 +5,9 @@
 /* $Id$ */
 /* PREPROCESSOR: CONTROLLINE INTERPRETER */
 
-#include    <stdlib.h>
+#include	<assert.h>
+#include	<stdlib.h>
+#include	<string.h>
 #include	"arith.h"
 #include	"LLlex.h"
 #include	"Lpars.h"
@@ -13,7 +15,6 @@
 #include	"input.h"
 
 #include    "parameters.h"
-#include	<assert.h>
 #include	<alloc.h>
 #include	"class.h"
 #include	"macro.h"
diff --git a/lang/cem/cpp.ansi/main.c b/lang/cem/cpp.ansi/main.c
index 225562be0..be8a7cd82 100644
--- a/lang/cem/cpp.ansi/main.c
+++ b/lang/cem/cpp.ansi/main.c
@@ -5,11 +5,12 @@
 /* $Id$ */
 /* MAIN PROGRAM */
 
-#include    <stdlib.h>
+#include	<assert.h>
+#include	<stdlib.h>
+#include	<string.h>
 #include	"parameters.h"
 
 #include	<alloc.h>
-#include	<assert.h>
 #include	<system.h>
 #include 	"arith.h"
 #include	"file_info.h"
diff --git a/lang/pc/comp/enter.c b/lang/pc/comp/enter.c
index 80e99f4c7..6eda97fdc 100644
--- a/lang/pc/comp/enter.c
+++ b/lang/pc/comp/enter.c
@@ -1,5 +1,6 @@
 /* H I G H   L E V E L   S Y M B O L   E N T R Y */
 
+#include	<string.h>
 #include	<alloc.h>
 #include	<assert.h>
 #include	<em_arith.h>
diff --git a/lang/pc/comp/statement.g b/lang/pc/comp/statement.g
index 686e20682..a77f6ee96 100644
--- a/lang/pc/comp/statement.g
+++ b/lang/pc/comp/statement.g
@@ -1,5 +1,6 @@
 /* S T A T E M E N T S */
 {
+#include	<string.h>
 #include    "parameters.h"
 #include	<alloc.h>
 #include	<em.h>
diff --git a/util/LLgen/src/name.c b/util/LLgen/src/name.c
index 4d34097fb..2b9ba11fb 100644
--- a/util/LLgen/src/name.c
+++ b/util/LLgen/src/name.c
@@ -17,6 +17,7 @@
  * initialising routine.
  */
 
+#include <string.h>
 # include "types.h"
 # include "extern.h"
 # include "assert.h"
diff --git a/util/LLgen/src/tokens.c b/util/LLgen/src/tokens.c
index 6526ec1a3..096c50951 100644
--- a/util/LLgen/src/tokens.c
+++ b/util/LLgen/src/tokens.c
@@ -77,6 +77,7 @@ extern LLnc_recover();
 
 # line 20 "tokens.g"
 
+#include <string.h>
 # include "types.h"
 # include "io.h"
 # include "extern.h"
@@ -101,7 +102,7 @@ STATIC string	vallookup();
 STATIC void copyact();
 
 static int	nparams;
-# line 75 "tokens.g"
+# line 76 "tokens.g"
 
 
 /*
@@ -419,7 +420,8 @@ unput(c) {
 	backupc = c;
 }
 
-void skipcomment(flag) {
+void
+skipcomment(flag) {
 	/*
 	 * Skip comment. If flag != 0, the comment is inside a fragment
 	 * of C-code, so keep it.
diff --git a/util/LLgen/src/tokens.g b/util/LLgen/src/tokens.g
index 51b83fcb3..bc39d22ad 100644
--- a/util/LLgen/src/tokens.g
+++ b/util/LLgen/src/tokens.g
@@ -18,6 +18,7 @@
  */
 
 {
+#include <string.h>
 # include "types.h"
 # include "io.h"
 # include "extern.h"
diff --git a/util/ack/files.c b/util/ack/files.c
index e149b90f7..413395438 100644
--- a/util/ack/files.c
+++ b/util/ack/files.c
@@ -5,6 +5,7 @@
  */
 
 #include <stdlib.h>
+#include <string.h>
 #include "ack.h"
 #include "list.h"
 #include "trans.h"
diff --git a/util/ack/rmach.c b/util/ack/rmach.c
index 13f904a38..1a4cd03a1 100644
--- a/util/ack/rmach.c
+++ b/util/ack/rmach.c
@@ -6,6 +6,7 @@
 
 #include <stdlib.h>
 #include <stdio.h>
+#include <string.h>
 #include "ack.h"
 #include <em_path.h>
 #include "list.h"
diff --git a/util/ego/cs/cs_profit.c b/util/ego/cs/cs_profit.c
index 67eb713ed..77a46f023 100644
--- a/util/ego/cs/cs_profit.c
+++ b/util/ego/cs/cs_profit.c
@@ -4,6 +4,7 @@
  * See the copyright notice in the ACK home directory, in the file "Copyright".
  */
 #include <stdio.h>
+#include <string.h>
 #include <em_mnem.h>
 #include <em_spec.h>
 #include "../share/types.h"
diff --git a/util/ego/ra/makeitems.c b/util/ego/ra/makeitems.c
index 1f84aa95d..bd9cf35f4 100644
--- a/util/ego/ra/makeitems.c
+++ b/util/ego/ra/makeitems.c
@@ -6,6 +6,7 @@
  
 #include <stdlib.h>
 #include <stdio.h>
+#include <string.h>
 
 /*  MAKE ITEMS TABLE
  *
diff --git a/util/ego/ra/ra.c b/util/ego/ra/ra.c
index fd05cdef0..61a5efebd 100644
--- a/util/ego/ra/ra.c
+++ b/util/ego/ra/ra.c
@@ -10,6 +10,7 @@
 
 #include <stdlib.h>
 #include <stdio.h>
+#include <string.h>
 #include <em_reg.h>
 #include "../share/types.h"
 #include "../share/debug.h"
diff --git a/util/ego/share/makecldef.c b/util/ego/share/makecldef.c
index ff22f68f1..a89d30538 100644
--- a/util/ego/share/makecldef.c
+++ b/util/ego/share/makecldef.c
@@ -6,6 +6,7 @@
  
 #include <stdlib.h>
 #include <stdio.h>
+#include <string.h>
 
 /*  MAKECLASSDEF
  *
diff --git a/util/ego/sp/sp.c b/util/ego/sp/sp.c
index b04895647..024f1a53b 100644
--- a/util/ego/sp/sp.c
+++ b/util/ego/sp/sp.c
@@ -11,6 +11,7 @@
 
 #include <stdlib.h>
 #include <stdio.h>
+#include <string.h>
 #include <em_mnem.h>
 #include <em_spec.h>
 #include "../share/types.h"
diff --git a/util/ego/sr/sr.c b/util/ego/sr/sr.c
index 5f2194ed1..b201ef90e 100644
--- a/util/ego/sr/sr.c
+++ b/util/ego/sr/sr.c
@@ -8,6 +8,7 @@
 
 #include <stdlib.h>
 #include <stdio.h>
+#include <string.h>
 #include "../share/types.h"
 #include "sr.h"
 #include "../share/debug.h"
diff --git a/util/ego/ud/ud.c b/util/ego/ud/ud.c
index afcba53a5..6dc5604d2 100644
--- a/util/ego/ud/ud.c
+++ b/util/ego/ud/ud.c
@@ -7,6 +7,7 @@
 
 #include <stdlib.h>
 #include <stdio.h>
+#include <string.h>
 #include <em_spec.h>
 #include "../share/types.h"
 #include "ud.h"
diff --git a/util/ncgg/expr.c b/util/ncgg/expr.c
index b57e79beb..d1a345961 100644
--- a/util/ncgg/expr.c
+++ b/util/ncgg/expr.c
@@ -9,6 +9,7 @@ static char rcsid[]= "$Id$";
 #include <assert.h>
 #include <stdlib.h>
 #include <stdio.h>
+#include <string.h>
 #include "param.h"
 #include "set.h"
 #include "reg.h"
diff --git a/util/ncgg/instruct.c b/util/ncgg/instruct.c
index b33f95ad2..a0af649cc 100644
--- a/util/ncgg/instruct.c
+++ b/util/ncgg/instruct.c
@@ -6,6 +6,7 @@
 static char rcsid[]= "$Id$";
 #endif
 
+#include <string.h>
 #include "param.h"
 #include "instruct.h"
 #include "pseudo.h"
diff --git a/util/ncgg/iocc.c b/util/ncgg/iocc.c
index d45f0fad5..9519b1cd6 100644
--- a/util/ncgg/iocc.c
+++ b/util/ncgg/iocc.c
@@ -9,6 +9,7 @@ static char rcsid[]= "$Id$";
 #include <assert.h>
 #include <stdlib.h>
 #include <stdio.h>
+#include <string.h>
 #include "param.h"
 #include "set.h"
 #include "expr.h"
diff --git a/util/ncgg/lookup.c b/util/ncgg/lookup.c
index 2b692cee8..7c162f926 100644
--- a/util/ncgg/lookup.c
+++ b/util/ncgg/lookup.c
@@ -7,6 +7,7 @@ static char rcsid[]= "$Id$";
 #endif
 
 #include <assert.h>
+#include <string.h>
 #include "param.h"
 #include "lookup.h"
 #include "extern.h"
diff --git a/util/ncgg/strlookup.c b/util/ncgg/strlookup.c
index d473341aa..708dd9b41 100644
--- a/util/ncgg/strlookup.c
+++ b/util/ncgg/strlookup.c
@@ -6,6 +6,7 @@
 static char rcsid[]= "$Id$";
 #endif
 
+#include <string.h>
 #include "param.h"
 #include "extern.h"
 
diff --git a/util/topgen/hash.c b/util/topgen/hash.c
index 7661dd375..03b214ecc 100644
--- a/util/topgen/hash.c
+++ b/util/topgen/hash.c
@@ -11,6 +11,7 @@
  
 #include <stdlib.h>
 #include <stdio.h>
+#include <string.h>
 #include "misc.h"
 
 struct hlist {			/* linear list of pattern numbers */
diff --git a/util/topgen/pattern.c b/util/topgen/pattern.c
index bc5b7a64f..db6ad6268 100644
--- a/util/topgen/pattern.c
+++ b/util/topgen/pattern.c
@@ -12,6 +12,7 @@
 
 #include <stdlib.h>
 #include <stdio.h>
+#include <string.h>
 #include <ctype.h>
 #include "misc.h"
 #include "symtab.h"