From 46a7f05cbc731ba807ff653f62183036f008d490 Mon Sep 17 00:00:00 2001
From: dockes <none@none>
Date: Thu, 13 Dec 2007 06:58:22 +0000
Subject: [PATCH] gcc 4 compat, thanks to Kartik Mistry

---
 src/aspell/rclaspell.cpp       | 4 ++--
 src/bincimapmime/convert.h     | 2 ++
 src/common/rclconfig.cpp       | 4 +++-
 src/common/rclinit.cpp         | 3 ++-
 src/common/textsplit.cpp       | 4 +++-
 src/common/unacpp.cpp          | 4 ++--
 src/index/csguess.cpp          | 5 ++---
 src/index/indexer.cpp          | 4 ++--
 src/index/rclmonprc.cpp        | 4 +++-
 src/index/rclmonrcv.cpp        | 3 ++-
 src/index/recollindex.cpp      | 3 ++-
 src/internfile/htmlparse.cpp   | 3 ++-
 src/internfile/mh_mail.cpp     | 3 ++-
 src/internfile/mh_mbox.cpp     | 3 ++-
 src/internfile/myhtmlparse.cpp | 2 ++
 src/query/docseqhist.cpp       | 5 +++--
 src/query/history.cpp          | 3 ++-
 src/query/recollq.cpp          | 3 ++-
 src/rcldb/pathhash.cpp         | 3 ++-
 src/rcldb/rcldb.cpp            | 3 ++-
 src/utils/base64.cpp           | 5 +++--
 src/utils/conftree.cpp         | 3 ++-
 src/utils/copyfile.cpp         | 3 ++-
 src/utils/fstreewalk.cpp       | 4 +++-
 src/utils/idfile.cpp           | 3 ++-
 src/utils/mimeparse.cpp        | 4 +++-
 src/utils/pathut.cpp           | 4 +++-
 src/utils/readfile.cpp         | 3 ++-
 src/utils/wipedir.cpp          | 3 ++-
 29 files changed, 66 insertions(+), 34 deletions(-)

diff --git a/src/aspell/rclaspell.cpp b/src/aspell/rclaspell.cpp
index 65c42f85..0e043564 100644
--- a/src/aspell/rclaspell.cpp
+++ b/src/aspell/rclaspell.cpp
@@ -1,6 +1,6 @@
 #ifndef TEST_RCLASPELL
 #ifndef lint
-static char rcsid[] = "@(#$Id: rclaspell.cpp,v 1.9 2007-08-07 08:26:40 dockes Exp $ (C) 2006 J.F.Dockes";
+static char rcsid[] = "@(#$Id: rclaspell.cpp,v 1.10 2007-12-13 06:58:21 dockes Exp $ (C) 2006 J.F.Dockes";
 #endif
 #ifdef HAVE_CONFIG_H
 #include "autoconfig.h"
@@ -11,7 +11,7 @@ static char rcsid[] = "@(#$Id: rclaspell.cpp,v 1.9 2007-08-07 08:26:40 dockes Ex
 #include <unistd.h>
 #include <dlfcn.h>
 #include <iostream>
-
+#include <stdlib.h>
 #include <vector>
 
 #include ASPELL_INCLUDE
diff --git a/src/bincimapmime/convert.h b/src/bincimapmime/convert.h
index 9fa1b8fd..c780479f 100644
--- a/src/bincimapmime/convert.h
+++ b/src/bincimapmime/convert.h
@@ -36,6 +36,8 @@
 
 #include <stdio.h>
 #include <sys/stat.h>
+#include <cstdlib>
+#include <cstring>
 
 #include "address.h"
 //#include "depot.h"
diff --git a/src/common/rclconfig.cpp b/src/common/rclconfig.cpp
index 694c3a76..6e97401d 100644
--- a/src/common/rclconfig.cpp
+++ b/src/common/rclconfig.cpp
@@ -1,5 +1,5 @@
 #ifndef lint
-static char rcsid[] = "@(#$Id: rclconfig.cpp,v 1.55 2007-11-16 14:28:52 dockes Exp $ (C) 2004 J.F.Dockes";
+static char rcsid[] = "@(#$Id: rclconfig.cpp,v 1.56 2007-12-13 06:58:21 dockes Exp $ (C) 2004 J.F.Dockes";
 #endif
 /*
  *   This program is free software; you can redistribute it and/or modify
@@ -33,6 +33,8 @@ static char rcsid[] = "@(#$Id: rclconfig.cpp,v 1.55 2007-11-16 14:28:52 dockes E
 #endif
 
 #include <iostream>
+#include <cstdlib>
+#include <cstring>
 
 #include "pathut.h"
 #include "rclconfig.h"
diff --git a/src/common/rclinit.cpp b/src/common/rclinit.cpp
index 1a37928f..3a0534a6 100644
--- a/src/common/rclinit.cpp
+++ b/src/common/rclinit.cpp
@@ -1,5 +1,5 @@
 #ifndef lint
-static char rcsid[] = "@(#$Id: rclinit.cpp,v 1.10 2007-05-23 08:28:35 dockes Exp $ (C) 2004 J.F.Dockes";
+static char rcsid[] = "@(#$Id: rclinit.cpp,v 1.11 2007-12-13 06:58:21 dockes Exp $ (C) 2004 J.F.Dockes";
 #endif
 /*
  *   This program is free software; you can redistribute it and/or modify
@@ -22,6 +22,7 @@ static char rcsid[] = "@(#$Id: rclinit.cpp,v 1.10 2007-05-23 08:28:35 dockes Exp
 #include <signal.h>
 #include <locale.h>
 #include <pthread.h>
+#include <cstdlib>
 
 #include "debuglog.h"
 #include "rclconfig.h"
diff --git a/src/common/textsplit.cpp b/src/common/textsplit.cpp
index e125f6df..177f749e 100644
--- a/src/common/textsplit.cpp
+++ b/src/common/textsplit.cpp
@@ -1,5 +1,5 @@
 #ifndef lint
-static char rcsid[] = "@(#$Id: textsplit.cpp,v 1.35 2007-10-04 12:21:52 dockes Exp $ (C) 2004 J.F.Dockes";
+static char rcsid[] = "@(#$Id: textsplit.cpp,v 1.36 2007-12-13 06:58:21 dockes Exp $ (C) 2004 J.F.Dockes";
 #endif
 /*
  *   This program is free software; you can redistribute it and/or modify
@@ -22,6 +22,8 @@ static char rcsid[] = "@(#$Id: textsplit.cpp,v 1.35 2007-10-04 12:21:52 dockes E
 #include <iostream>
 #include <string>
 #include <set>
+#include <cstring>
+
 #include "textsplit.h"
 #include "debuglog.h"
 #include "assert.h"
diff --git a/src/common/unacpp.cpp b/src/common/unacpp.cpp
index 7fcc06e3..78dbe96a 100644
--- a/src/common/unacpp.cpp
+++ b/src/common/unacpp.cpp
@@ -1,5 +1,5 @@
 #ifndef lint
-static char rcsid[] = "@(#$Id: unacpp.cpp,v 1.8 2006-04-04 09:36:46 dockes Exp $ (C) 2004 J.F.Dockes";
+static char rcsid[] = "@(#$Id: unacpp.cpp,v 1.9 2007-12-13 06:58:21 dockes Exp $ (C) 2004 J.F.Dockes";
 #endif
 /*
  *   This program is free software; you can redistribute it and/or modify
@@ -20,7 +20,7 @@ static char rcsid[] = "@(#$Id: unacpp.cpp,v 1.8 2006-04-04 09:36:46 dockes Exp $
 
 #ifndef TEST_UNACPP
 #include <stdio.h>
-
+#include <cstdlib>
 #include <errno.h>
 
 #include <string>
diff --git a/src/index/csguess.cpp b/src/index/csguess.cpp
index 169e979e..a760eeae 100644
--- a/src/index/csguess.cpp
+++ b/src/index/csguess.cpp
@@ -1,5 +1,5 @@
 #ifndef lint
-static char	rcsid[] = "@(#$Id: csguess.cpp,v 1.6 2007-06-19 07:52:33 dockes Exp $ (C) 2004 J.F.Dockes";
+static char	rcsid[] = "@(#$Id: csguess.cpp,v 1.7 2007-12-13 06:58:21 dockes Exp $ (C) 2004 J.F.Dockes";
 #endif
 /*
  *   This program is free software; you can redistribute it and/or modify
@@ -40,8 +40,7 @@ static char	rcsid[] = "@(#$Id: csguess.cpp,v 1.6 2007-06-19 07:52:33 dockes Exp
  * *********************************************************/
 
 #include <errno.h>
-
-#include <string>
+#include <cstring>
 #include <iostream>
 
 #ifndef NO_NAMESPACES
diff --git a/src/index/indexer.cpp b/src/index/indexer.cpp
index 71cf8495..88fe5072 100644
--- a/src/index/indexer.cpp
+++ b/src/index/indexer.cpp
@@ -1,5 +1,5 @@
 #ifndef lint
-static char rcsid[] = "@(#$Id: indexer.cpp,v 1.63 2007-10-04 12:20:56 dockes Exp $ (C) 2004 J.F.Dockes";
+static char rcsid[] = "@(#$Id: indexer.cpp,v 1.64 2007-12-13 06:58:21 dockes Exp $ (C) 2004 J.F.Dockes";
 #endif
 /*
  *   This program is free software; you can redistribute it and/or modify
@@ -25,7 +25,7 @@ static char rcsid[] = "@(#$Id: indexer.cpp,v 1.63 2007-10-04 12:20:56 dockes Exp
 #include <sys/stat.h>
 #include <unistd.h>
 #include <errno.h>
-#include <strings.h>
+#include <cstring>
 #include <fnmatch.h>
 
 #include <iostream>
diff --git a/src/index/rclmonprc.cpp b/src/index/rclmonprc.cpp
index 618d9b47..63398904 100644
--- a/src/index/rclmonprc.cpp
+++ b/src/index/rclmonprc.cpp
@@ -2,7 +2,7 @@
 
 #ifdef RCL_MONITOR
 #ifndef lint
-static char rcsid[] = "@(#$Id: rclmonprc.cpp,v 1.12 2007-05-21 13:30:21 dockes Exp $ (C) 2006 J.F.Dockes";
+static char rcsid[] = "@(#$Id: rclmonprc.cpp,v 1.13 2007-12-13 06:58:21 dockes Exp $ (C) 2006 J.F.Dockes";
 #endif
 /*
  *   This program is free software; you can redistribute it and/or modify
@@ -32,6 +32,8 @@ static char rcsid[] = "@(#$Id: rclmonprc.cpp,v 1.12 2007-05-21 13:30:21 dockes E
 #include <unistd.h>
 #include <errno.h>
 #include <signal.h>
+#include <cstring>
+#include <cstdlib>
 
 #include "debuglog.h"
 #include "rclmon.h"
diff --git a/src/index/rclmonrcv.cpp b/src/index/rclmonrcv.cpp
index fc73c85e..8255ead6 100644
--- a/src/index/rclmonrcv.cpp
+++ b/src/index/rclmonrcv.cpp
@@ -1,7 +1,7 @@
 #include "autoconfig.h"
 #ifdef RCL_MONITOR
 #ifndef lint
-static char rcsid[] = "@(#$Id: rclmonrcv.cpp,v 1.13 2007-08-30 09:01:52 dockes Exp $ (C) 2006 J.F.Dockes";
+static char rcsid[] = "@(#$Id: rclmonrcv.cpp,v 1.14 2007-12-13 06:58:21 dockes Exp $ (C) 2006 J.F.Dockes";
 #endif
 /*
  *   This program is free software; you can redistribute it and/or modify
@@ -22,6 +22,7 @@ static char rcsid[] = "@(#$Id: rclmonrcv.cpp,v 1.13 2007-08-30 09:01:52 dockes E
 #include <unistd.h>
 #include <sys/stat.h>
 #include <errno.h>
+#include <cstring>
 
 #include "debuglog.h"
 #include "rclmon.h"
diff --git a/src/index/recollindex.cpp b/src/index/recollindex.cpp
index 2025bb14..417f2e74 100644
--- a/src/index/recollindex.cpp
+++ b/src/index/recollindex.cpp
@@ -1,5 +1,5 @@
 #ifndef lint
-static char rcsid[] = "@(#$Id: recollindex.cpp,v 1.34 2007-07-10 09:23:28 dockes Exp $ (C) 2004 J.F.Dockes";
+static char rcsid[] = "@(#$Id: recollindex.cpp,v 1.35 2007-12-13 06:58:21 dockes Exp $ (C) 2004 J.F.Dockes";
 #endif
 /*
  *   This program is free software; you can redistribute it and/or modify
@@ -28,6 +28,7 @@ static char rcsid[] = "@(#$Id: recollindex.cpp,v 1.34 2007-07-10 09:23:28 dockes
 #include <iostream>
 #include <list>
 #include <string>
+#include <cstdlib>
 
 using namespace std;
 
diff --git a/src/internfile/htmlparse.cpp b/src/internfile/htmlparse.cpp
index 595464e0..dd57fed2 100644
--- a/src/internfile/htmlparse.cpp
+++ b/src/internfile/htmlparse.cpp
@@ -23,7 +23,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "@(#$Id: htmlparse.cpp,v 1.7 2007-06-19 10:28:40 dockes Exp $ ";
+static char rcsid[] = "@(#$Id: htmlparse.cpp,v 1.8 2007-12-13 06:58:21 dockes Exp $ ";
 #endif
 
 #include <algorithm>
@@ -32,6 +32,7 @@ using std::find_if;
 #include "htmlparse.h"
 #include <stdio.h>
 #include <ctype.h>
+#include <cstring>
 
 map<string, unsigned int> HtmlParser::named_ents;
 
diff --git a/src/internfile/mh_mail.cpp b/src/internfile/mh_mail.cpp
index 0b110c8f..6fa7f6ec 100644
--- a/src/internfile/mh_mail.cpp
+++ b/src/internfile/mh_mail.cpp
@@ -1,5 +1,5 @@
 #ifndef lint
-static char rcsid[] = "@(#$Id: mh_mail.cpp,v 1.30 2007-10-17 11:40:35 dockes Exp $ (C) 2005 J.F.Dockes";
+static char rcsid[] = "@(#$Id: mh_mail.cpp,v 1.31 2007-12-13 06:58:21 dockes Exp $ (C) 2005 J.F.Dockes";
 #endif
 /*
  *   This program is free software; you can redistribute it and/or modify
@@ -23,6 +23,7 @@ static char rcsid[] = "@(#$Id: mh_mail.cpp,v 1.30 2007-10-17 11:40:35 dockes Exp
 #include <errno.h>
 #include <unistd.h>
 #include <time.h>
+#include <cstdlib>
 
 #include <map>
 #include <sstream>
diff --git a/src/internfile/mh_mbox.cpp b/src/internfile/mh_mbox.cpp
index 13ae060d..50dd0841 100644
--- a/src/internfile/mh_mbox.cpp
+++ b/src/internfile/mh_mbox.cpp
@@ -1,5 +1,5 @@
 #ifndef lint
-static char rcsid[] = "@(#$Id: mh_mbox.cpp,v 1.2 2007-10-03 14:53:37 dockes Exp $ (C) 2005 J.F.Dockes";
+static char rcsid[] = "@(#$Id: mh_mbox.cpp,v 1.3 2007-12-13 06:58:21 dockes Exp $ (C) 2005 J.F.Dockes";
 #endif
 /*
  *   This program is free software; you can redistribute it and/or modify
@@ -24,6 +24,7 @@ static char rcsid[] = "@(#$Id: mh_mbox.cpp,v 1.2 2007-10-03 14:53:37 dockes Exp
 #include <unistd.h>
 #include <time.h>
 #include <regex.h>
+#include <cstring>
 
 #include <map>
 #include <sstream>
diff --git a/src/internfile/myhtmlparse.cpp b/src/internfile/myhtmlparse.cpp
index 6b661630..79a177da 100644
--- a/src/internfile/myhtmlparse.cpp
+++ b/src/internfile/myhtmlparse.cpp
@@ -24,6 +24,8 @@
  */
 #include <time.h>
 #include <stdio.h>
+#include <algorithm>
+#include <cstring>
 
 #include "myhtmlparse.h"
 #include "indextext.h" // for lowercase_term()
diff --git a/src/query/docseqhist.cpp b/src/query/docseqhist.cpp
index 872ebe70..ea7075f6 100644
--- a/src/query/docseqhist.cpp
+++ b/src/query/docseqhist.cpp
@@ -1,5 +1,5 @@
 #ifndef lint
-static char rcsid[] = "@(#$Id: docseqhist.cpp,v 1.1 2007-01-19 10:32:39 dockes Exp $ (C) 2005 J.F.Dockes";
+static char rcsid[] = "@(#$Id: docseqhist.cpp,v 1.2 2007-12-13 06:58:21 dockes Exp $ (C) 2005 J.F.Dockes";
 #endif
 /*
  *   This program is free software; you can redistribute it and/or modify
@@ -19,6 +19,7 @@ static char rcsid[] = "@(#$Id: docseqhist.cpp,v 1.1 2007-01-19 10:32:39 dockes E
  */
 #include <math.h>
 #include <time.h>
+#include <cmath>
 
 #include "docseqhist.h"
 #include "rcldb.h"
@@ -48,7 +49,7 @@ bool DocSequenceHistory::getDoc(int num, Rcl::Doc &doc, int *percent,
     if (percent)
 	*percent = 100;
     if (sh) {
-	if (m_prevtime < 0 || abs(m_prevtime - m_it->unixtime) > 86400) {
+	if (m_prevtime < 0 || abs (float(m_prevtime) - float(m_it->unixtime)) > 86400) {
 	    m_prevtime = m_it->unixtime;
 	    time_t t = (time_t)(m_it->unixtime);
 	    *sh = string(ctime(&t));
diff --git a/src/query/history.cpp b/src/query/history.cpp
index bc1e00af..f3982573 100644
--- a/src/query/history.cpp
+++ b/src/query/history.cpp
@@ -1,5 +1,5 @@
 #ifndef lint
-static char rcsid[] = "@(#$Id: history.cpp,v 1.8 2007-06-20 13:16:11 dockes Exp $ (C) 2005 J.F.Dockes";
+static char rcsid[] = "@(#$Id: history.cpp,v 1.9 2007-12-13 06:58:21 dockes Exp $ (C) 2005 J.F.Dockes";
 #endif
 /*
  *   This program is free software; you can redistribute it and/or modify
@@ -21,6 +21,7 @@ static char rcsid[] = "@(#$Id: history.cpp,v 1.8 2007-06-20 13:16:11 dockes Exp
 #ifndef TEST_HISTORY
 #include <stdio.h>
 #include <time.h>
+#include <cstdlib>
 
 #include "history.h"
 #include "base64.h"
diff --git a/src/query/recollq.cpp b/src/query/recollq.cpp
index dc852de1..d52bfb04 100644
--- a/src/query/recollq.cpp
+++ b/src/query/recollq.cpp
@@ -1,5 +1,5 @@
 #ifndef lint
-static char rcsid[] = "@(#$Id: recollq.cpp,v 1.11 2007-11-13 18:40:51 dockes Exp $ (C) 2006 J.F.Dockes";
+static char rcsid[] = "@(#$Id: recollq.cpp,v 1.12 2007-12-13 06:58:21 dockes Exp $ (C) 2006 J.F.Dockes";
 #endif
 /*
  *   This program is free software; you can redistribute it and/or modify
@@ -26,6 +26,7 @@ static char rcsid[] = "@(#$Id: recollq.cpp,v 1.11 2007-11-13 18:40:51 dockes Exp
 #include <errno.h>
 #include <string.h>
 #include <sys/stat.h>
+#include <limits.h>
 
 #include <iostream>
 using namespace std;
diff --git a/src/rcldb/pathhash.cpp b/src/rcldb/pathhash.cpp
index 624ff4ba..b0b6f5c9 100644
--- a/src/rcldb/pathhash.cpp
+++ b/src/rcldb/pathhash.cpp
@@ -1,5 +1,5 @@
 #ifndef lint
-static char rcsid[] = "@(#$Id: pathhash.cpp,v 1.4 2006-11-15 14:57:53 dockes Exp $ (C) 2005 J.F.Dockes";
+static char rcsid[] = "@(#$Id: pathhash.cpp,v 1.5 2007-12-13 06:58:21 dockes Exp $ (C) 2005 J.F.Dockes";
 #endif
 /*
  *   This program is free software; you can redistribute it and/or modify
@@ -19,6 +19,7 @@ static char rcsid[] = "@(#$Id: pathhash.cpp,v 1.4 2006-11-15 14:57:53 dockes Exp
  */
 
 #include <stdio.h>
+#include <cstdlib>
 
 #include "pathhash.h"
 #include "md5.h"
diff --git a/src/rcldb/rcldb.cpp b/src/rcldb/rcldb.cpp
index 7b3e5f2d..0da2fea8 100644
--- a/src/rcldb/rcldb.cpp
+++ b/src/rcldb/rcldb.cpp
@@ -1,5 +1,5 @@
 #ifndef lint
-static char rcsid[] = "@(#$Id: rcldb.cpp,v 1.128 2007-10-27 16:40:57 dockes Exp $ (C) 2004 J.F.Dockes";
+static char rcsid[] = "@(#$Id: rcldb.cpp,v 1.129 2007-12-13 06:58:21 dockes Exp $ (C) 2004 J.F.Dockes";
 #endif
 /*
  *   This program is free software; you can redistribute it and/or modify
@@ -18,6 +18,7 @@ static char rcsid[] = "@(#$Id: rcldb.cpp,v 1.128 2007-10-27 16:40:57 dockes Exp
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 #include <stdio.h>
+#include <cstring>
 #include <unistd.h>
 #include <sys/stat.h>
 #include <fnmatch.h>
diff --git a/src/utils/base64.cpp b/src/utils/base64.cpp
index 610ca7dc..2d2e930d 100644
--- a/src/utils/base64.cpp
+++ b/src/utils/base64.cpp
@@ -1,5 +1,5 @@
 #ifndef lint
-static char rcsid[] = "@(#$Id: base64.cpp,v 1.6 2006-02-01 07:14:45 dockes Exp $ (C) 2005 J.F.Dockes";
+static char rcsid[] = "@(#$Id: base64.cpp,v 1.7 2007-12-13 06:58:22 dockes Exp $ (C) 2005 J.F.Dockes";
 #endif
 /*
  *   This program is free software; you can redistribute it and/or modify
@@ -19,8 +19,9 @@ static char rcsid[] = "@(#$Id: base64.cpp,v 1.6 2006-02-01 07:14:45 dockes Exp $
  */
 
 #include <sys/types.h>
-
+#include <cstring>
 #include <string>
+
 #ifndef NO_NAMESPACES
 using std::string;
 #endif /* NO_NAMESPACES */
diff --git a/src/utils/conftree.cpp b/src/utils/conftree.cpp
index 1633dd2e..3fbacc19 100755
--- a/src/utils/conftree.cpp
+++ b/src/utils/conftree.cpp
@@ -1,5 +1,5 @@
 #ifndef lint
-static char rcsid [] = "@(#$Id: conftree.cpp,v 1.14 2007-11-21 09:34:54 dockes Exp $  (C) 2003 J.F.Dockes";
+static char rcsid [] = "@(#$Id: conftree.cpp,v 1.15 2007-12-13 06:58:22 dockes Exp $  (C) 2003 J.F.Dockes";
 #endif
 /*
  *   This program is free software; you can redistribute it and/or modify
@@ -30,6 +30,7 @@ static char rcsid [] = "@(#$Id: conftree.cpp,v 1.14 2007-11-21 09:34:54 dockes E
 #include <sstream>
 #include <algorithm>
 #include <iostream>
+#include <cstring>
 
 #include "conftree.h"
 #include "pathut.h"
diff --git a/src/utils/copyfile.cpp b/src/utils/copyfile.cpp
index 23b48a45..99a739e0 100644
--- a/src/utils/copyfile.cpp
+++ b/src/utils/copyfile.cpp
@@ -1,5 +1,5 @@
 #ifndef lint
-static char rcsid[] = "@(#$Id: copyfile.cpp,v 1.3 2006-01-23 13:32:28 dockes Exp $ (C) 2005 J.F.Dockes";
+static char rcsid[] = "@(#$Id: copyfile.cpp,v 1.4 2007-12-13 06:58:22 dockes Exp $ (C) 2005 J.F.Dockes";
 #endif
 /*
  *   This program is free software; you can redistribute it and/or modify
@@ -22,6 +22,7 @@ static char rcsid[] = "@(#$Id: copyfile.cpp,v 1.3 2006-01-23 13:32:28 dockes Exp
 #include <fcntl.h>
 #include <errno.h>
 #include <unistd.h>
+#include <cstring>
 
 #include <string>
 using std::string;
diff --git a/src/utils/fstreewalk.cpp b/src/utils/fstreewalk.cpp
index b7cf5844..3d410fb5 100644
--- a/src/utils/fstreewalk.cpp
+++ b/src/utils/fstreewalk.cpp
@@ -1,5 +1,5 @@
 #ifndef lint
-static char rcsid[] = "@(#$Id: fstreewalk.cpp,v 1.14 2007-08-30 09:01:52 dockes Exp $ (C) 2004 J.F.Dockes";
+static char rcsid[] = "@(#$Id: fstreewalk.cpp,v 1.15 2007-12-13 06:58:22 dockes Exp $ (C) 2004 J.F.Dockes";
 #endif
 /*
  *   This program is free software; you can redistribute it and/or modify
@@ -24,6 +24,8 @@ static char rcsid[] = "@(#$Id: fstreewalk.cpp,v 1.14 2007-08-30 09:01:52 dockes
 #include <sys/stat.h>
 #include <errno.h>
 #include <fnmatch.h>
+#include <cstring>
+#include <algorithm>
 
 #include <sstream>
 #include <list>
diff --git a/src/utils/idfile.cpp b/src/utils/idfile.cpp
index 095779cf..ba8a66bf 100644
--- a/src/utils/idfile.cpp
+++ b/src/utils/idfile.cpp
@@ -1,5 +1,5 @@
 #ifndef lint
-static char rcsid[] = "@(#$Id: idfile.cpp,v 1.5 2006-12-02 07:32:13 dockes Exp $ (C) 2005 J.F.Dockes";
+static char rcsid[] = "@(#$Id: idfile.cpp,v 1.6 2007-12-13 06:58:22 dockes Exp $ (C) 2005 J.F.Dockes";
 #endif
 /*
  *   This program is free software; you can redistribute it and/or modify
@@ -20,6 +20,7 @@ static char rcsid[] = "@(#$Id: idfile.cpp,v 1.5 2006-12-02 07:32:13 dockes Exp $
 #ifndef TEST_IDFILE
 #include <unistd.h> // for access(2)
 #include <ctype.h>
+#include <cstring>
 
 #include <fstream>
 #include <sstream>
diff --git a/src/utils/mimeparse.cpp b/src/utils/mimeparse.cpp
index f461b904..fbdfc7d9 100644
--- a/src/utils/mimeparse.cpp
+++ b/src/utils/mimeparse.cpp
@@ -1,5 +1,5 @@
 #ifndef lint
-static char rcsid[] = "@(#$Id: mimeparse.cpp,v 1.19 2007-10-17 11:40:35 dockes Exp $ (C) 2004 J.F.Dockes";
+static char rcsid[] = "@(#$Id: mimeparse.cpp,v 1.20 2007-12-13 06:58:22 dockes Exp $ (C) 2004 J.F.Dockes";
 #endif
 /*
  *   This program is free software; you can redistribute it and/or modify
@@ -27,6 +27,8 @@ static char rcsid[] = "@(#$Id: mimeparse.cpp,v 1.19 2007-10-17 11:40:35 dockes E
 #include <stdio.h>
 #include <ctype.h>
 #include <time.h>
+#include <cstdlib>
+#include <cstring>
 
 #include "mimeparse.h"
 #include "base64.h"
diff --git a/src/utils/pathut.cpp b/src/utils/pathut.cpp
index 91ef1f25..94d1d243 100644
--- a/src/utils/pathut.cpp
+++ b/src/utils/pathut.cpp
@@ -1,5 +1,5 @@
 #ifndef lint
-static char rcsid[] = "@(#$Id: pathut.cpp,v 1.17 2007-09-08 08:07:05 dockes Exp $ (C) 2004 J.F.Dockes";
+static char rcsid[] = "@(#$Id: pathut.cpp,v 1.18 2007-12-13 06:58:22 dockes Exp $ (C) 2004 J.F.Dockes";
 #endif
 /*
  *   This program is free software; you can redistribute it and/or modify
@@ -24,6 +24,8 @@ static char rcsid[] = "@(#$Id: pathut.cpp,v 1.17 2007-09-08 08:07:05 dockes Exp
 #include <sys/param.h>
 #include <pwd.h>
 #include <math.h>
+#include <cstdlib>
+#include <cstring>
 
 #include <iostream>
 #include <list>
diff --git a/src/utils/readfile.cpp b/src/utils/readfile.cpp
index 18e5f3d7..844bdccd 100644
--- a/src/utils/readfile.cpp
+++ b/src/utils/readfile.cpp
@@ -1,5 +1,5 @@
 #ifndef lint
-static char rcsid[] = "@(#$Id: readfile.cpp,v 1.6 2007-09-08 09:44:43 dockes Exp $ (C) 2004 J.F.Dockes";
+static char rcsid[] = "@(#$Id: readfile.cpp,v 1.7 2007-12-13 06:58:22 dockes Exp $ (C) 2004 J.F.Dockes";
 #endif
 /*
  *   This program is free software; you can redistribute it and/or modify
@@ -24,6 +24,7 @@ static char rcsid[] = "@(#$Id: readfile.cpp,v 1.6 2007-09-08 09:44:43 dockes Exp
 #define O_STREAMING 0
 #endif
 #include <errno.h>
+#include <cstring>
 
 #include <string>
 #ifndef NO_NAMESPACES
diff --git a/src/utils/wipedir.cpp b/src/utils/wipedir.cpp
index b8b14710..ce60024e 100644
--- a/src/utils/wipedir.cpp
+++ b/src/utils/wipedir.cpp
@@ -1,5 +1,5 @@
 #ifndef lint
-static char rcsid[] = "@(#$Id: wipedir.cpp,v 1.5 2006-01-23 13:32:29 dockes Exp $ (C) 2004 J.F.Dockes";
+static char rcsid[] = "@(#$Id: wipedir.cpp,v 1.6 2007-12-13 06:58:22 dockes Exp $ (C) 2004 J.F.Dockes";
 #endif
 /*
  *   This program is free software; you can redistribute it and/or modify
@@ -25,6 +25,7 @@ static char rcsid[] = "@(#$Id: wipedir.cpp,v 1.5 2006-01-23 13:32:29 dockes Exp
 #include <sys/stat.h>
 #include <errno.h>
 
+#include <cstring>
 #include <string>
 #ifndef NO_NAMESPACES
 using namespace std;