diff --git a/src/bincimapmime/address.cc b/src/bincimapmime/address.cc
index ba9fd0b8..f6140855 100644
--- a/src/bincimapmime/address.cc
+++ b/src/bincimapmime/address.cc
@@ -31,8 +31,10 @@
 #include "convert.h"
 #include <string>
 
+#ifndef NO_NAMESPACES
 using namespace ::std;
 using namespace Binc;
+#endif /* NO_NAMESPACES */
 
 //------------------------------------------------------------------------
 Address::Address(const string &name, const string &addr)
diff --git a/src/bincimapmime/convert.cc b/src/bincimapmime/convert.cc
index c2d877cc..438c4847 100644
--- a/src/bincimapmime/convert.cc
+++ b/src/bincimapmime/convert.cc
@@ -30,8 +30,10 @@
 #include "convert.h"
 #include <string>
 
+#ifndef NO_NAMESPACES
 using namespace ::std;
 using namespace Binc;
+#endif /* NO_NAMESPACES */
 
 //------------------------------------------------------------------------
 BincStream::BincStream(void)
diff --git a/src/bincimapmime/iodevice.cc b/src/bincimapmime/iodevice.cc
index 0cda86f2..e17643b2 100644
--- a/src/bincimapmime/iodevice.cc
+++ b/src/bincimapmime/iodevice.cc
@@ -30,8 +30,10 @@
 #include <stdlib.h>
 #include <unistd.h>
 
+#ifndef NO_NAMESPACES
 using namespace ::std;
 using namespace ::Binc;
+#endif /* NO_NAMESPACES */
 
 //------------------------------------------------------------------------
 IODevice::IODevice(int f) : flags(f | IsEnabled),
diff --git a/src/bincimapmime/iofactory.cc b/src/bincimapmime/iofactory.cc
index 96d873b8..04b6999e 100644
--- a/src/bincimapmime/iofactory.cc
+++ b/src/bincimapmime/iofactory.cc
@@ -26,8 +26,10 @@
 #include "iofactory.h"
 #include "iodevice.h"
 
+#ifndef NO_NAMESPACES
 using namespace ::Binc;
 using namespace ::std;
+#endif /* NO_NAMESPACES */
 
 //------------------------------------------------------------------------
 IOFactory::IOFactory(void)
diff --git a/src/bincimapmime/mime-getpart.cc b/src/bincimapmime/mime-getpart.cc
index a0cd2cc6..bde43ca9 100644
--- a/src/bincimapmime/mime-getpart.cc
+++ b/src/bincimapmime/mime-getpart.cc
@@ -40,7 +40,9 @@
 #include <stdio.h>
 #include <errno.h>
 
+#ifndef NO_NAMESPACES
 using namespace ::std;
+#endif /* NO_NAMESPACES */
 
 //------------------------------------------------------------------------
 const Binc::MimePart *Binc::MimePart::getPart(const string &findpart,
diff --git a/src/bincimapmime/mime-parsefull.cc b/src/bincimapmime/mime-parsefull.cc
index 59288440..4f665533 100644
--- a/src/bincimapmime/mime-parsefull.cc
+++ b/src/bincimapmime/mime-parsefull.cc
@@ -44,7 +44,9 @@
 
 Binc::MimeInputSource *mimeSource = 0;
 
+#ifndef NO_NAMESPACES
 using namespace ::std;
+#endif /* NO_NAMESPACES */
 
 //------------------------------------------------------------------------
 void Binc::MimeDocument::parseFull(int fd) const
diff --git a/src/bincimapmime/mime-parseonlyheader.cc b/src/bincimapmime/mime-parseonlyheader.cc
index 2ca41541..8dddacf3 100644
--- a/src/bincimapmime/mime-parseonlyheader.cc
+++ b/src/bincimapmime/mime-parseonlyheader.cc
@@ -42,7 +42,9 @@
 #include <stdio.h>
 #include <errno.h>
 
+#ifndef NO_NAMESPACES
 using namespace ::std;
+#endif /* NO_NAMESPACES */
 
 //------------------------------------------------------------------------
 void Binc::MimeDocument::parseOnlyHeader(int fd) const
diff --git a/src/bincimapmime/mime-printbody.cc b/src/bincimapmime/mime-printbody.cc
index e4c05e59..3b70ae1b 100644
--- a/src/bincimapmime/mime-printbody.cc
+++ b/src/bincimapmime/mime-printbody.cc
@@ -46,7 +46,9 @@
 #include <stdio.h>
 #include <errno.h>
 
+#ifndef NO_NAMESPACES
 using namespace ::std;
+#endif /* NO_NAMESPACES */
 
 //------------------------------------------------------------------------
 void Binc::MimePart::printBody(int fd, IODevice &output,
diff --git a/src/bincimapmime/mime-printdoc.cc b/src/bincimapmime/mime-printdoc.cc
index 24b6f3fc..02a2c15f 100644
--- a/src/bincimapmime/mime-printdoc.cc
+++ b/src/bincimapmime/mime-printdoc.cc
@@ -45,7 +45,9 @@
 #include <stdio.h>
 #include <errno.h>
 
+#ifndef NO_NAMESPACES
 using namespace ::std;
+#endif /* NO_NAMESPACES */
 
 //------------------------------------------------------------------------
 void Binc::MimePart::printDoc(int fd, IODevice &output,
diff --git a/src/bincimapmime/mime-printheader.cc b/src/bincimapmime/mime-printheader.cc
index 0d1c0ba2..381b2c38 100644
--- a/src/bincimapmime/mime-printheader.cc
+++ b/src/bincimapmime/mime-printheader.cc
@@ -45,7 +45,9 @@
 #include <stdio.h>
 #include <errno.h>
 
+#ifndef NO_NAMESPACES
 using namespace ::std;
+#endif /* NO_NAMESPACES */
 
 //------------------------------------------------------------------------
 void Binc::MimePart::printHeader(int fd, IODevice &output,
diff --git a/src/bincimapmime/mime-utils.h b/src/bincimapmime/mime-utils.h
index 5bf8ca9c..0fa9c2b2 100644
--- a/src/bincimapmime/mime-utils.h
+++ b/src/bincimapmime/mime-utils.h
@@ -35,7 +35,9 @@
 #include <stdio.h>
 #include <errno.h>
 
+#ifndef NO_NAMESPACES
 using namespace ::std;
+#endif /* NO_NAMESPACES */
 
 inline bool compareStringToQueue(const char *s_in, char *bqueue,
 				 int pos, int size)
diff --git a/src/bincimapmime/mime.cc b/src/bincimapmime/mime.cc
index c1764030..cd5ea5be 100644
--- a/src/bincimapmime/mime.cc
+++ b/src/bincimapmime/mime.cc
@@ -40,7 +40,9 @@
 #include <stdio.h>
 #include <errno.h>
 
+#ifndef NO_NAMESPACES
 using namespace ::std;
+#endif /* NO_NAMESPACES */
 
 //------------------------------------------------------------------------
 Binc::MimeDocument::MimeDocument(void) : MimePart()
diff --git a/src/bincimapmime/trbinc.cc b/src/bincimapmime/trbinc.cc
index 0596d7f0..16882a46 100644
--- a/src/bincimapmime/trbinc.cc
+++ b/src/bincimapmime/trbinc.cc
@@ -1,5 +1,5 @@
 #ifndef 	lint
-static char rcsid [] = "@(#$Id: trbinc.cc,v 1.2 2005-03-31 10:04:07 dockes Exp $  (C) 1994 CDKIT";
+static char rcsid [] = "@(#$Id: trbinc.cc,v 1.3 2005-11-24 07:16:15 dockes Exp $  (C) 1994 CDKIT";
 #endif
 
 #include <stdio.h>
@@ -11,7 +11,9 @@ static char rcsid [] = "@(#$Id: trbinc.cc,v 1.2 2005-03-31 10:04:07 dockes Exp $
 
 #include <sstream>
 
+#ifndef NO_NAMESPACES
 using namespace std;
+#endif /* NO_NAMESPACES */
 
 #include "mime.h"
 
diff --git a/src/common/rclconfig.cpp b/src/common/rclconfig.cpp
index 1e4cdc59..1d61106c 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.12 2005-11-21 14:31:24 dockes Exp $ (C) 2004 J.F.Dockes";
+static char rcsid[] = "@(#$Id: rclconfig.cpp,v 1.13 2005-11-24 07:16:15 dockes Exp $ (C) 2004 J.F.Dockes";
 #endif
 #include <unistd.h>
 #include <errno.h>
@@ -12,7 +12,9 @@ static char rcsid[] = "@(#$Id: rclconfig.cpp,v 1.12 2005-11-21 14:31:24 dockes E
 #include "debuglog.h"
 #include "smallut.h"
 
+#ifndef NO_NAMESPACES
 using namespace std;
+#endif /* NO_NAMESPACES */
 
 RclConfig::RclConfig()
     : m_ok(false), conf(0), mimemap(0), mimeconf(0), stopsuffixes(0)
diff --git a/src/common/textsplit.cpp b/src/common/textsplit.cpp
index 41c83adb..fea9c006 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.13 2005-10-19 10:21:48 dockes Exp $ (C) 2004 J.F.Dockes";
+static char rcsid[] = "@(#$Id: textsplit.cpp,v 1.14 2005-11-24 07:16:15 dockes Exp $ (C) 2004 J.F.Dockes";
 #endif
 #ifndef TEST_TEXTSPLIT
 
@@ -11,7 +11,9 @@ static char rcsid[] = "@(#$Id: textsplit.cpp,v 1.13 2005-10-19 10:21:48 dockes E
 #include "utf8iter.h"
 #include "uproplist.h"
 
+#ifndef NO_NAMESPACES
 using namespace std;
+#endif /* NO_NAMESPACES */
 
 /**
  * Splitting a text into words. The code in this file will work with any 
diff --git a/src/common/unacpp.cpp b/src/common/unacpp.cpp
index cc698437..5ea46699 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.3 2005-02-04 14:21:17 dockes Exp $ (C) 2004 J.F.Dockes";
+static char rcsid[] = "@(#$Id: unacpp.cpp,v 1.4 2005-11-24 07:16:15 dockes Exp $ (C) 2004 J.F.Dockes";
 #endif
 
 #ifndef TEST_UNACPP
@@ -9,7 +9,9 @@ static char rcsid[] = "@(#$Id: unacpp.cpp,v 1.3 2005-02-04 14:21:17 dockes Exp $
 
 #include <string>
 
+#ifndef NO_NAMESPACES
 using std::string;
+#endif /* NO_NAMESPACES */
 
 #include "unacpp.h"
 #include "unac.h"
diff --git a/src/configure b/src/configure
index 8f7da8fd..1dcb8476 100755
--- a/src/configure
+++ b/src/configure
@@ -2196,6 +2196,10 @@ XAPIANCXXFLAGS=`$XAPIAN_CONFIG --cxxflags`
 
 ac_config_files="$ac_config_files mk/localdefs"
 
+ac_config_files="$ac_config_files recollinstall"
+
+ac_config_files="$ac_config_files sampleconf/recoll.conf"
+
 
 for d in bincimapmime index lib query
 do
@@ -2700,6 +2704,8 @@ do
   case "$ac_config_target" in
   # Handling of arguments.
   "mk/localdefs" ) CONFIG_FILES="$CONFIG_FILES mk/localdefs" ;;
+  "recollinstall" ) CONFIG_FILES="$CONFIG_FILES recollinstall" ;;
+  "sampleconf/recoll.conf" ) CONFIG_FILES="$CONFIG_FILES sampleconf/recoll.conf" ;;
   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
diff --git a/src/configure.ac b/src/configure.ac
index f360dbfd..82a46003 100644
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -66,6 +66,8 @@ AC_SUBST(LIBICONV)
 AC_SUBST(INCICONV)
 
 AC_CONFIG_FILES(mk/localdefs)
+AC_CONFIG_FILES(recollinstall)
+AC_CONFIG_FILES(sampleconf/recoll.conf)
 
 for d in bincimapmime index lib query
 do 
diff --git a/src/index/csguess.cpp b/src/index/csguess.cpp
index 47e6c20e..ec9fdf31 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.3 2005-02-04 14:21:17 dockes Exp $ (C) 2004 J.F.Dockes";
+static char	rcsid[] = "@(#$Id: csguess.cpp,v 1.4 2005-11-24 07:16:15 dockes Exp $ (C) 2004 J.F.Dockes";
 #endif
 
 #ifndef TEST_CSGUESS
@@ -27,7 +27,10 @@ static char	rcsid[] = "@(#$Id: csguess.cpp,v 1.3 2005-02-04 14:21:17 dockes Exp
 
 #include <string>
 #include <iostream>
+
+#ifndef NO_NAMESPACES
 using std::string;
+#endif /* NO_NAMESPACES */
 
 #include <iconv.h>
 
diff --git a/src/index/indexer.cpp b/src/index/indexer.cpp
index f47c3bf6..b9b61239 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.16 2005-11-21 14:31:24 dockes Exp $ (C) 2004 J.F.Dockes";
+static char rcsid[] = "@(#$Id: indexer.cpp,v 1.17 2005-11-24 07:16:15 dockes Exp $ (C) 2004 J.F.Dockes";
 #endif
 #include <stdio.h>
 #include <sys/stat.h>
@@ -25,7 +25,9 @@ static char rcsid[] = "@(#$Id: indexer.cpp,v 1.16 2005-11-21 14:31:24 dockes Exp
 #include "smallut.h"
 #include "wipedir.h"
 
+#ifndef NO_NAMESPACES
 using namespace std;
+#endif /* NO_NAMESPACES */
 
 #ifndef deleteZ
 #define deleteZ(X) {delete X;X = 0;}
diff --git a/src/index/mimetype.cpp b/src/index/mimetype.cpp
index ac35b0a7..ee395fcb 100644
--- a/src/index/mimetype.cpp
+++ b/src/index/mimetype.cpp
@@ -1,5 +1,5 @@
 #ifndef lint
-static char rcsid[] = "@(#$Id: mimetype.cpp,v 1.13 2005-11-23 10:19:00 dockes Exp $ (C) 2004 J.F.Dockes";
+static char rcsid[] = "@(#$Id: mimetype.cpp,v 1.14 2005-11-24 07:16:15 dockes Exp $ (C) 2004 J.F.Dockes";
 #endif
 
 #ifndef TEST_MIMETYPE
@@ -7,8 +7,9 @@ static char rcsid[] = "@(#$Id: mimetype.cpp,v 1.13 2005-11-23 10:19:00 dockes Ex
 #include <string>
 #include <list>
 
-using std::string;
-using std::list;
+#ifndef NO_NAMESPACES
+using namespace std;
+#endif /* NO_NAMESPACES */
 
 #include "mimetype.h"
 #include "debuglog.h"
diff --git a/src/internfile/htmlparse.cpp b/src/internfile/htmlparse.cpp
index 8382c22e..37ea066d 100644
--- a/src/internfile/htmlparse.cpp
+++ b/src/internfile/htmlparse.cpp
@@ -23,14 +23,17 @@
  */
 
 #ifndef lint
-static char rcsid[] = "@(#$Id: htmlparse.cpp,v 1.2 2005-01-28 08:50:17 dockes Exp $ ";
+static char rcsid[] = "@(#$Id: htmlparse.cpp,v 1.3 2005-11-24 07:16:15 dockes Exp $ ";
 #endif
 
 //#include <config.h>
 
 #include <algorithm>
-using std::find;
-using std::find_if;
+#ifndef NO_NAMESPACES
+using namespace std;
+//using std::find;
+//using std::find_if;
+#endif /* NO_NAMESPACES */
 #include "htmlparse.h"
 #include <stdio.h>
 #include <ctype.h>
diff --git a/src/internfile/htmlparse.h b/src/internfile/htmlparse.h
index 21867638..20da34f0 100644
--- a/src/internfile/htmlparse.h
+++ b/src/internfile/htmlparse.h
@@ -24,8 +24,10 @@
 #include <string>
 #include <map>
 
+#ifndef NO_NAMESPACES
 using std::string;
 using std::map;
+#endif /* NO_NAMESPACES */
 
 class HtmlParser {
     protected:
diff --git a/src/internfile/internfile.cpp b/src/internfile/internfile.cpp
index d0582f36..bd13541b 100644
--- a/src/internfile/internfile.cpp
+++ b/src/internfile/internfile.cpp
@@ -1,5 +1,5 @@
 #ifndef lint
-static char rcsid[] = "@(#$Id: internfile.cpp,v 1.10 2005-11-21 14:31:24 dockes Exp $ (C) 2004 J.F.Dockes";
+static char rcsid[] = "@(#$Id: internfile.cpp,v 1.11 2005-11-24 07:16:15 dockes Exp $ (C) 2004 J.F.Dockes";
 #endif
 #include <unistd.h>
 #include <sys/types.h>
@@ -8,7 +8,9 @@ static char rcsid[] = "@(#$Id: internfile.cpp,v 1.10 2005-11-21 14:31:24 dockes
 
 #include <string>
 #include <iostream>
+#ifndef NO_NAMESPACES
 using namespace std;
+#endif /* NO_NAMESPACES */
 
 #include "internfile.h"
 #include "mimetype.h"
diff --git a/src/internfile/mh_exec.cpp b/src/internfile/mh_exec.cpp
index f02d75fa..844e2f40 100644
--- a/src/internfile/mh_exec.cpp
+++ b/src/internfile/mh_exec.cpp
@@ -1,5 +1,5 @@
 #ifndef lint
-static char rcsid[] = "@(#$Id: mh_exec.cpp,v 1.2 2005-11-18 15:19:14 dockes Exp $ (C) 2005 J.F.Dockes";
+static char rcsid[] = "@(#$Id: mh_exec.cpp,v 1.3 2005-11-24 07:16:15 dockes Exp $ (C) 2005 J.F.Dockes";
 #endif
 
 #include "execmd.h"
@@ -7,7 +7,9 @@ static char rcsid[] = "@(#$Id: mh_exec.cpp,v 1.2 2005-11-18 15:19:14 dockes Exp
 #include "mh_html.h"
 #include "debuglog.h"
 
+#ifndef NO_NAMESPACES
 using namespace std;
+#endif /* NO_NAMESPACES */
 
 // Execute an external program to translate a file from its native format
 // to html. Then call the html parser to do the actual indexing
diff --git a/src/internfile/mh_html.cpp b/src/internfile/mh_html.cpp
index ff007fad..fa659b8c 100644
--- a/src/internfile/mh_html.cpp
+++ b/src/internfile/mh_html.cpp
@@ -36,7 +36,9 @@
 #include "smallut.h"
 
 #include <iostream>
+#ifndef NO_NAMESPACES
 using namespace std;
+#endif /* NO_NAMESPACES */
 
 
 MimeHandler::Status 
diff --git a/src/internfile/mh_mail.cpp b/src/internfile/mh_mail.cpp
index fda908dc..326561b7 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.10 2005-11-18 13:23:46 dockes Exp $ (C) 2005 J.F.Dockes";
+static char rcsid[] = "@(#$Id: mh_mail.cpp,v 1.11 2005-11-24 07:16:15 dockes Exp $ (C) 2005 J.F.Dockes";
 #endif
 
 #include <stdio.h>
@@ -9,8 +9,6 @@ static char rcsid[] = "@(#$Id: mh_mail.cpp,v 1.10 2005-11-18 13:23:46 dockes Exp
 
 #include <map>
 #include <sstream>
-using std::stringstream;
-using std::map;
 
 #include "mimehandler.h"
 #include "debuglog.h"
@@ -28,11 +26,13 @@ using std::map;
 // binc imap mime definitions
 #include "mime.h"
 
+#ifndef NO_NAMESPACES
+using namespace std;
+#endif /* NO_NAMESPACES */
+
 static void 
 walkmime(RclConfig *cnf, string &out, Binc::MimePart& doc, int depth);
 
-using namespace std;
-
 MimeHandlerMail::~MimeHandlerMail()
 {
     if (vfp) {
diff --git a/src/internfile/mh_text.cpp b/src/internfile/mh_text.cpp
index b172acbd..74467047 100644
--- a/src/internfile/mh_text.cpp
+++ b/src/internfile/mh_text.cpp
@@ -1,10 +1,12 @@
 #ifndef lint
-static char rcsid[] = "@(#$Id: mh_text.cpp,v 1.1 2005-11-18 13:23:46 dockes Exp $ (C) 2005 J.F.Dockes";
+static char rcsid[] = "@(#$Id: mh_text.cpp,v 1.2 2005-11-24 07:16:15 dockes Exp $ (C) 2005 J.F.Dockes";
 #endif
 
 #include <iostream>
 #include <string>
+#ifndef NO_NAMESPACES
 using namespace std;
+#endif /* NO_NAMESPACES */
 
 #include "mh_text.h"
 #include "csguess.h"
diff --git a/src/internfile/mimehandler.cpp b/src/internfile/mimehandler.cpp
index a3cb4c8d..0f880ec2 100644
--- a/src/internfile/mimehandler.cpp
+++ b/src/internfile/mimehandler.cpp
@@ -1,10 +1,12 @@
 #ifndef lint
-static char rcsid[] = "@(#$Id: mimehandler.cpp,v 1.13 2005-11-21 14:31:24 dockes Exp $ (C) 2004 J.F.Dockes";
+static char rcsid[] = "@(#$Id: mimehandler.cpp,v 1.14 2005-11-24 07:16:15 dockes Exp $ (C) 2004 J.F.Dockes";
 #endif
 
 #include <iostream>
 #include <string>
+#ifndef NO_NAMESPACES
 using namespace std;
+#endif /* NO_NAMESPACES */
 
 #include "mimehandler.h"
 #include "debuglog.h"
diff --git a/src/makestaticdist.sh b/src/makestaticdist.sh
index 9c98361e..562c6b8c 100644
--- a/src/makestaticdist.sh
+++ b/src/makestaticdist.sh
@@ -35,7 +35,7 @@ rm -f index/recollindex qtgui/recoll
 make static || exit 1
 strip index/recollindex qtgui/recoll
 
-files="COPYING README INSTALL recollinstall
+files="COPYING README INSTALL Makefile recollinstall
 filters sampleconf 
 index/recollindex qtgui/recoll qtgui/mtpics/*.png"
 
diff --git a/src/qtgui/advsearch.ui.h b/src/qtgui/advsearch.ui.h
index 1f0a342a..b453bf2f 100644
--- a/src/qtgui/advsearch.ui.h
+++ b/src/qtgui/advsearch.ui.h
@@ -15,8 +15,10 @@
 #include <list>
 #include <string>
 
+#ifndef NO_NAMESPACES
 using std::list;
 using std::string;
+#endif /* NO_NAMESPACES */
 
 #include "recoll.h"
 #include "rclconfig.h"
diff --git a/src/qtgui/main.cpp b/src/qtgui/main.cpp
index fd3de3b2..dd22bf23 100644
--- a/src/qtgui/main.cpp
+++ b/src/qtgui/main.cpp
@@ -1,5 +1,5 @@
 #ifndef lint
-static char rcsid[] = "@(#$Id: main.cpp,v 1.16 2005-11-17 12:47:03 dockes Exp $ (C) 2005 J.F.Dockes";
+static char rcsid[] = "@(#$Id: main.cpp,v 1.17 2005-11-24 07:16:16 dockes Exp $ (C) 2005 J.F.Dockes";
 #endif
 
 #include <unistd.h>
@@ -15,7 +15,9 @@ static char rcsid[] = "@(#$Id: main.cpp,v 1.16 2005-11-17 12:47:03 dockes Exp $
 
 
 #include "rcldb.h"
+#ifndef NO_NAMESPACES
 using Rcl::AdvSearchData;
+#endif /* NO_NAMESPACES */
 #include "rclconfig.h"
 #include "pathut.h"
 #include "recoll.h"
diff --git a/src/qtgui/plaintorich.cpp b/src/qtgui/plaintorich.cpp
index a44a979c..33cd8075 100644
--- a/src/qtgui/plaintorich.cpp
+++ b/src/qtgui/plaintorich.cpp
@@ -1,13 +1,15 @@
 #ifndef lint
-static char rcsid[] = "@(#$Id: plaintorich.cpp,v 1.5 2005-11-16 11:22:51 dockes Exp $ (C) 2005 J.F.Dockes";
+static char rcsid[] = "@(#$Id: plaintorich.cpp,v 1.6 2005-11-24 07:16:16 dockes Exp $ (C) 2005 J.F.Dockes";
 #endif
 
 
 #include <string>
 #include <utility>
 #include <list>
+#ifndef NO_NAMESPACES
 using std::list;
 using std::pair;
+#endif /* NO_NAMESPACES */
 
 #include "rcldb.h"
 #include "rclconfig.h"
diff --git a/src/qtgui/preview/preview.ui.h b/src/qtgui/preview/preview.ui.h
index 3aa4e1ee..5bedd265 100644
--- a/src/qtgui/preview/preview.ui.h
+++ b/src/qtgui/preview/preview.ui.h
@@ -13,7 +13,9 @@
 
 #include <list>
 #include <utility>
+#ifndef NO_NAMESPACES
 using std::pair;
+#endif /* NO_NAMESPACES */
 
 #include <qmessagebox.h>
 #include <qprogressdialog.h>
diff --git a/src/qtgui/preview/pvmain.cpp b/src/qtgui/preview/pvmain.cpp
index 20340225..5bd16d1e 100644
--- a/src/qtgui/preview/pvmain.cpp
+++ b/src/qtgui/preview/pvmain.cpp
@@ -1,5 +1,5 @@
 #ifndef lint
-static char rcsid[] = "@(#$Id: pvmain.cpp,v 1.4 2005-10-21 08:14:42 dockes Exp $ (C) 2005 J.F.Dockes";
+static char rcsid[] = "@(#$Id: pvmain.cpp,v 1.5 2005-11-24 07:16:16 dockes Exp $ (C) 2005 J.F.Dockes";
 #endif
 
 #include <stdio.h>
@@ -7,9 +7,12 @@ static char rcsid[] = "@(#$Id: pvmain.cpp,v 1.4 2005-10-21 08:14:42 dockes Exp $
 
 #include <string>
 #include <list>
+
+#ifndef NO_NAMESPACES
 using std::string;
 using std::list;
 using std::pair;
+#endif /* NO_NAMESPACES */
 
 #include <qapplication.h>
 #include <qobject.h>
diff --git a/src/qtgui/recollmain.ui.h b/src/qtgui/recollmain.ui.h
index 0020ab2c..f397a027 100644
--- a/src/qtgui/recollmain.ui.h
+++ b/src/qtgui/recollmain.ui.h
@@ -17,7 +17,9 @@
 #include <sys/stat.h>
 
 #include <utility>
+#ifndef NO_NAMESPACES
 using std::pair;
+#endif /* NO_NAMESPACES */
 
 #include <qmessagebox.h>
 #include <qcstring.h>
diff --git a/src/query/qtry.cpp b/src/query/qtry.cpp
index 56541ba3..1d216f75 100644
--- a/src/query/qtry.cpp
+++ b/src/query/qtry.cpp
@@ -1,5 +1,5 @@
 #ifndef lint
-static char rcsid[] = "@(#$Id: qtry.cpp,v 1.4 2005-01-31 14:31:10 dockes Exp $ (C) 2004 J.F.Dockes";
+static char rcsid[] = "@(#$Id: qtry.cpp,v 1.5 2005-11-24 07:16:16 dockes Exp $ (C) 2004 J.F.Dockes";
 #endif
 
 // Tests with the query interface
@@ -17,7 +17,9 @@ static char rcsid[] = "@(#$Id: qtry.cpp,v 1.4 2005-01-31 14:31:10 dockes Exp $ (
 #include "mimehandler.h"
 #include "pathut.h"
 
+#ifndef NO_NAMESPACES
 using namespace std;
+#endif /* NO_NAMESPACES */
 
 #include "rcldb.h"
 
diff --git a/src/query/qxtry.cpp b/src/query/qxtry.cpp
index 7e7f3d86..b20e2891 100644
--- a/src/query/qxtry.cpp
+++ b/src/query/qxtry.cpp
@@ -1,5 +1,5 @@
 #ifndef lint
-static char rcsid[] = "@(#$Id: qxtry.cpp,v 1.1 2005-01-24 13:17:58 dockes Exp $ (C) 2004 J.F.Dockes";
+static char rcsid[] = "@(#$Id: qxtry.cpp,v 1.2 2005-11-24 07:16:16 dockes Exp $ (C) 2004 J.F.Dockes";
 #endif
 // Tests with direct xapian questions
 
@@ -11,7 +11,9 @@ static char rcsid[] = "@(#$Id: qxtry.cpp,v 1.1 2005-01-24 13:17:58 dockes Exp $
 
 #include "transcode.h"
 
+#ifndef NO_NAMESPACES
 using namespace std;
+#endif /* NO_NAMESPACES */
 
 #include "xapian.h"
 
diff --git a/src/query/xadump.cpp b/src/query/xadump.cpp
index ae9f7613..0fd48b85 100644
--- a/src/query/xadump.cpp
+++ b/src/query/xadump.cpp
@@ -1,5 +1,5 @@
 #ifndef lint
-static char rcsid[] = "@(#$Id: xadump.cpp,v 1.4 2005-02-08 09:34:47 dockes Exp $ (C) 2004 J.F.Dockes";
+static char rcsid[] = "@(#$Id: xadump.cpp,v 1.5 2005-11-24 07:16:16 dockes Exp $ (C) 2004 J.F.Dockes";
 #endif
 
 #include <strings.h>
@@ -10,7 +10,9 @@ static char rcsid[] = "@(#$Id: xadump.cpp,v 1.4 2005-02-08 09:34:47 dockes Exp $
 
 #include "transcode.h"
 
+#ifndef NO_NAMESPACES
 using namespace std;
+#endif /* NO_NAMESPACES */
 
 #include "xapian.h"
 
diff --git a/src/rcldb/pathhash.cpp b/src/rcldb/pathhash.cpp
index 851c589e..20db7f19 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.1 2005-11-06 11:16:52 dockes Exp $ (C) 2005 J.F.Dockes";
+static char rcsid[] = "@(#$Id: pathhash.cpp,v 1.2 2005-11-24 07:16:15 dockes Exp $ (C) 2005 J.F.Dockes";
 #endif
 
 #include <stdio.h>
@@ -8,7 +8,9 @@ static char rcsid[] = "@(#$Id: pathhash.cpp,v 1.1 2005-11-06 11:16:52 dockes Exp
 #include "md5.h"
 #include "base64.h"
 
+#ifndef NO_NAMESPACES
 using std::string;
+#endif /* NO_NAMESPACES */
 
 #ifdef PATHHASH_HEX
 static void md5hexprint(const unsigned char hash[16], string &out)
diff --git a/src/rcldb/rcldb.cpp b/src/rcldb/rcldb.cpp
index fdd70eb6..843d5497 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.39 2005-11-23 10:59:33 dockes Exp $ (C) 2004 J.F.Dockes";
+static char rcsid[] = "@(#$Id: rcldb.cpp,v 1.40 2005-11-24 07:16:15 dockes Exp $ (C) 2004 J.F.Dockes";
 #endif
 #include <stdio.h>
 #include <sys/stat.h>
@@ -9,7 +9,9 @@ static char rcsid[] = "@(#$Id: rcldb.cpp,v 1.39 2005-11-23 10:59:33 dockes Exp $
 #include <vector>
 #include <algorithm>
 
+#ifndef NO_NAMESPACES
 using namespace std;
+#endif /* NO_NAMESPACES */
 
 #include "rcldb.h"
 #include "textsplit.h"
diff --git a/src/recollinstall.in b/src/recollinstall.in
new file mode 100755
index 00000000..5e62bb0e
--- /dev/null
+++ b/src/recollinstall.in
@@ -0,0 +1,83 @@
+#!/bin/sh
+
+# Install recoll files. This has 2 modes, for installing the binaries or
+# the personal configuration files
+
+fatal()
+{
+    echo $*
+    exit 1
+}
+usage()
+{
+    echo 'Usage (common files): recollinstall <dir>, ie: recollinstall /usr/local'
+    fatal 'Usage (personal config): recollinstall'
+}
+
+INSTALL=${INSTALL:=install}
+
+if test $# = 1 ; then
+   # Install commands and example config to target directory
+   PREFIX=$1
+
+   echo "Installing to $PREFIX"
+
+   test -x qtgui/recoll || fatal "qtgui/recoll does not exist." \
+        " You need to build first (type 'make')."
+
+   for d in ${PREFIX} \
+	    ${PREFIX}/bin \
+	    ${PREFIX}/share \
+	    ${PREFIX}/share/recoll \
+	    ${PREFIX}/share/recoll/examples \
+	    ${PREFIX}/share/recoll/images 
+   do
+     test -d $d || mkdir $d || exit 1
+   done
+
+
+   ${INSTALL} qtgui/recoll index/recollindex recollinstall $PREFIX/bin \
+	      || exit 1
+
+   ${INSTALL} filters/rcl* ${PREFIX}/share/recoll/examples/ || exit 1
+
+   ${INSTALL} sampleconf/recoll.conf sampleconf/mimeconf sampleconf/mimemap \
+		    ${PREFIX}/share/recoll/examples/ || exit 1
+
+   ${INSTALL} qtgui/mtpics/*.png ${PREFIX}/share/recoll/images || exit 1
+
+   exit 0
+
+else
+
+  # Install configuration files to home directory
+  PREFIX=${PREFIX:=@prefix@}
+
+  me=`whoami`
+  if test "$me" = root ; then
+    fatal "Can't install personal config in root's home directory"
+  fi
+  if test ! -d ${PREFIX}/share/recoll/examples ; then
+     fatal "Global install should be performed first"
+  fi
+
+  if test -d $HOME/.recoll ; then 
+    cat <<EOF
+     
+     $HOME/.recoll already exists, no modification done.
+     You should check for new filters or updated files in 
+     ${PREFIX}/share/recoll/examples.
+EOF
+     exit 0
+  fi
+
+  mkdir $HOME/.recoll || exit 1
+  cp ${PREFIX}/share/recoll/examples/* $HOME/.recoll
+  chmod a+x $HOME/.recoll/rcl*
+  chmod +w $HOME/.recoll/recoll.conf
+  chmod +w $HOME/.recoll/mimeconf
+
+  echo Copied configuration files and filters to $HOME/.recoll/
+  echo You should now take a look at $HOME/.recoll/recoll.conf
+  exit 0
+fi
diff --git a/src/sampleconf/recoll.conf.in b/src/sampleconf/recoll.conf.in
new file mode 100644
index 00000000..c65108f8
--- /dev/null
+++ b/src/sampleconf/recoll.conf.in
@@ -0,0 +1,58 @@
+# @(#$Id: recoll.conf.in,v 1.1 2005-11-24 07:16:16 dockes Exp $  (C) 2004 J.F.Dockes
+
+# Recoll default configuration file. This should be copied to
+# ~/.recoll/recoll.conf 
+
+# Space-separated list of directories to index. Next line indexes $HOME
+topdirs = ~
+
+# Wildcard expressions for names of files and directories that we should
+# ignore:
+skippedNames = *~ #* .* bin CVS  Cache caughtspam  tmp
+
+# Debug messages
+loglevel = 4
+logfilename = stderr
+
+# Languages for which to build stemming databases at the end of
+# indexing. Stemmer names can be found on the xapian site
+indexstemminglanguages = english french
+
+# Use stemming of query terms or not (ie: expand search for floors to
+# floor, flooring, etc... )
+querystemming = 1
+querystemminglanguage = english
+
+# Name of file suffix to mime-type map file. 
+mimemapfile = mimemap
+# Name of mime-type to filter type/name map file. 
+mimeconffile = mimeconf
+
+# Decide if we do show icons in the result list. This looks a bit more
+# beaglish, but I'm not quite sure it's useful. If you wish to have them, 
+# you will have to copy the pngs from the distribution to wherever you want
+# to store them (the associations are decided in mimeconf)
+showicons = 1
+iconsdir = @prefix@/share/recoll/images
+
+# Where to store the database.
+dbdir = ~/.recoll/xapiandb
+
+# Default character set. Values found inside files, ie content tag in html
+# documents, will override this. It can be specified per directory (see
+# below). Used when converting to utf-8 (internal storage format).
+defaultcharset = iso-8859-1
+defaultlanguage = english
+
+# Guessing charsets usually does not work well
+guesscharset = 0
+
+# Should we use the system's 'file -i' command as a final step in file type
+# identification ? This may be useful, but will usually cause the
+# indexation of many bogus 'text' files
+usesystemfilecommand = 1
+
+# You could specify different parameters for a subdirectory like this. 
+#[~/englishdocs/plain]
+#defaultcharset = iso-8859-2
+
diff --git a/src/utils/base64.cpp b/src/utils/base64.cpp
index 7580a954..90ccdae5 100644
--- a/src/utils/base64.cpp
+++ b/src/utils/base64.cpp
@@ -1,11 +1,13 @@
 #ifndef lint
-static char rcsid[] = "@(#$Id: base64.cpp,v 1.2 2005-11-06 15:07:10 dockes Exp $ (C) 2005 J.F.Dockes";
+static char rcsid[] = "@(#$Id: base64.cpp,v 1.3 2005-11-24 07:16:16 dockes Exp $ (C) 2005 J.F.Dockes";
 #endif
 
 #include <sys/types.h>
 
 #include <string>
+#ifndef NO_NAMESPACES
 using std::string;
+#endif /* NO_NAMESPACES */
 
 //#define DEBUG_BASE64 
 #ifdef DEBUG_BASE64
diff --git a/src/utils/execmd.cpp b/src/utils/execmd.cpp
index 2bb6384d..d432143b 100644
--- a/src/utils/execmd.cpp
+++ b/src/utils/execmd.cpp
@@ -1,5 +1,5 @@
 #ifndef lint
-static char rcsid[] = "@(#$Id: execmd.cpp,v 1.10 2005-11-23 11:11:50 dockes Exp $ (C) 2004 J.F.Dockes";
+static char rcsid[] = "@(#$Id: execmd.cpp,v 1.11 2005-11-24 07:16:16 dockes Exp $ (C) 2004 J.F.Dockes";
 #endif
 #ifndef TEST_EXECMD
 #include <unistd.h>
@@ -20,7 +20,9 @@ static char rcsid[] = "@(#$Id: execmd.cpp,v 1.10 2005-11-23 11:11:50 dockes Exp
 #include "pathut.h"
 #include "debuglog.h"
 
+#ifndef NO_NAMESPACES
 using namespace std;
+#endif /* NO_NAMESPACES */
 #define MAX(A,B) (A>B?A:B)
 
 void  ExecCmd::putenv(const string &ea)
diff --git a/src/utils/fstreewalk.cpp b/src/utils/fstreewalk.cpp
index 07f7671b..1a4aeeda 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.4 2005-04-04 13:18:47 dockes Exp $ (C) 2004 J.F.Dockes";
+static char rcsid[] = "@(#$Id: fstreewalk.cpp,v 1.5 2005-11-24 07:16:16 dockes Exp $ (C) 2004 J.F.Dockes";
 #endif
 
 #ifndef TEST_FSTREEWALK
@@ -16,7 +16,9 @@ static char rcsid[] = "@(#$Id: fstreewalk.cpp,v 1.4 2005-04-04 13:18:47 dockes E
 #include "pathut.h"
 #include "fstreewalk.h"
 
+#ifndef NO_NAMESPACES
 using namespace std;
+#endif /* NO_NAMESPACES */
 
 class FsTreeWalker::Internal {
     Options options;
diff --git a/src/utils/idfile.cpp b/src/utils/idfile.cpp
index b7a8eaf4..72096a8a 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.2 2005-10-19 14:14:17 dockes Exp $ (C) 2005 J.F.Dockes";
+static char rcsid[] = "@(#$Id: idfile.cpp,v 1.3 2005-11-24 07:16:16 dockes Exp $ (C) 2005 J.F.Dockes";
 #endif
 #ifndef TEST_IDFILE
 #include <unistd.h> // for access(2)
@@ -11,7 +11,9 @@ static char rcsid[] = "@(#$Id: idfile.cpp,v 1.2 2005-10-19 14:14:17 dockes Exp $
 #include "idfile.h"
 #include "debuglog.h"
 
+#ifndef NO_NAMESPACES
 using namespace std;
+#endif /* NO_NAMESPACES */
 
 std::list<string> idFileAllTypes()
 {
diff --git a/src/utils/mimeparse.cpp b/src/utils/mimeparse.cpp
index 801bc063..305de72d 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.7 2005-11-23 10:17:15 dockes Exp $ (C) 2004 J.F.Dockes";
+static char rcsid[] = "@(#$Id: mimeparse.cpp,v 1.8 2005-11-24 07:16:16 dockes Exp $ (C) 2004 J.F.Dockes";
 #endif
 
 #ifndef TEST_MIMEPARSE
@@ -12,7 +12,9 @@ static char rcsid[] = "@(#$Id: mimeparse.cpp,v 1.7 2005-11-23 10:17:15 dockes Ex
 #include "mimeparse.h"
 #include "base64.h"
 
+#ifndef NO_NAMESPACES
 using namespace std;
+#endif /* NO_NAMESPACES */
 
 // Parsing a header value. Only content-type has parameters, but
 // others are compatible with content-type syntax, only, parameters
diff --git a/src/utils/pathut.cpp b/src/utils/pathut.cpp
index 41d7a6f1..8802498c 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.4 2005-02-04 14:21:18 dockes Exp $ (C) 2004 J.F.Dockes";
+static char rcsid[] = "@(#$Id: pathut.cpp,v 1.5 2005-11-24 07:16:16 dockes Exp $ (C) 2004 J.F.Dockes";
 #endif
 
 #ifndef TEST_PATHUT
@@ -8,7 +8,9 @@ static char rcsid[] = "@(#$Id: pathut.cpp,v 1.4 2005-02-04 14:21:18 dockes Exp $
 #include <iostream>
 
 #include "pathut.h"
+#ifndef NO_NAMESPACES
 using std::string;
+#endif /* NO_NAMESPACES */
 
 string path_getfather(const string &s) {
     string father = s;
diff --git a/src/utils/readfile.cpp b/src/utils/readfile.cpp
index 83dbaa09..fa0fce54 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.1 2004-12-14 17:54:16 dockes Exp $ (C) 2004 J.F.Dockes";
+static char rcsid[] = "@(#$Id: readfile.cpp,v 1.2 2005-11-24 07:16:16 dockes Exp $ (C) 2004 J.F.Dockes";
 #endif
 
 #include <unistd.h>
@@ -10,7 +10,9 @@ static char rcsid[] = "@(#$Id: readfile.cpp,v 1.1 2004-12-14 17:54:16 dockes Exp
 #include <errno.h>
 
 #include <string>
+#ifndef NO_NAMESPACES
 using std::string;
+#endif /* NO_NAMESPACES */
 
 #include "readfile.h"
 
diff --git a/src/utils/smallut.cpp b/src/utils/smallut.cpp
index bbc40d89..1668f3bd 100644
--- a/src/utils/smallut.cpp
+++ b/src/utils/smallut.cpp
@@ -1,5 +1,5 @@
 #ifndef lint
-static char rcsid[] = "@(#$Id: smallut.cpp,v 1.7 2005-11-23 10:16:28 dockes Exp $ (C) 2004 J.F.Dockes";
+static char rcsid[] = "@(#$Id: smallut.cpp,v 1.8 2005-11-24 07:16:16 dockes Exp $ (C) 2004 J.F.Dockes";
 #endif
 #ifndef TEST_SMALLUT
 #include <string>
@@ -14,7 +14,9 @@ static char rcsid[] = "@(#$Id: smallut.cpp,v 1.7 2005-11-23 10:16:28 dockes Exp
 #include "debuglog.h"
 #include "pathut.h"
 
+#ifndef NO_NAMESPACES
 using namespace std;
+#endif /* NO_NAMESPACES */
 
 #define MIN(A,B) ((A)<(B)?(A):(B))
 
diff --git a/src/utils/smallut.h b/src/utils/smallut.h
index e5c0c847..f8299af9 100644
--- a/src/utils/smallut.h
+++ b/src/utils/smallut.h
@@ -1,12 +1,14 @@
 #ifndef _SMALLUT_H_INCLUDED_
 #define _SMALLUT_H_INCLUDED_
-/* @(#$Id: smallut.h,v 1.7 2005-11-23 10:16:28 dockes Exp $  (C) 2004 J.F.Dockes */
+/* @(#$Id: smallut.h,v 1.8 2005-11-24 07:16:16 dockes Exp $  (C) 2004 J.F.Dockes */
 #include <string>
 #include <list>
-#include <iostream>
+
+#ifndef NO_NAMESPACES
 using std::string;
 using std::list;
-using std::ostream;
+#endif /* NO_NAMESPACES */
+
 extern int stringicmp(const string& s1, const string& s2);
 extern int stringlowercmp(const string& alreadylower, const string& s2);
 extern int stringuppercmp(const string& alreadyupper, const string& s2); 
diff --git a/src/utils/transcode.cpp b/src/utils/transcode.cpp
index 3dbdc7a2..83e2ba00 100644
--- a/src/utils/transcode.cpp
+++ b/src/utils/transcode.cpp
@@ -1,5 +1,5 @@
 #ifndef lint
-static char	rcsid[] = "@(#$Id: transcode.cpp,v 1.3 2005-02-04 14:21:18 dockes Exp $ (C) 2004 J.F.Dockes";
+static char	rcsid[] = "@(#$Id: transcode.cpp,v 1.4 2005-11-24 07:16:16 dockes Exp $ (C) 2004 J.F.Dockes";
 #endif
 
 #ifndef TEST_TRANSCODE
@@ -8,7 +8,9 @@ static char	rcsid[] = "@(#$Id: transcode.cpp,v 1.3 2005-02-04 14:21:18 dockes Ex
 
 #include <string>
 #include <iostream>
+#ifndef NO_NAMESPACES
 using std::string;
+#endif /* NO_NAMESPACES */
 
 #include <iconv.h>
 
diff --git a/src/utils/utf8iter.cpp b/src/utils/utf8iter.cpp
index 64fbd11b..8cb71199 100644
--- a/src/utils/utf8iter.cpp
+++ b/src/utils/utf8iter.cpp
@@ -1,5 +1,5 @@
 #ifndef lint
-static char rcsid[] = "@(#$Id: utf8iter.cpp,v 1.2 2005-02-11 11:20:02 dockes Exp $ (C) 2005 J.F.Dockes";
+static char rcsid[] = "@(#$Id: utf8iter.cpp,v 1.3 2005-11-24 07:16:16 dockes Exp $ (C) 2005 J.F.Dockes";
 #endif
 #include <stdio.h>
 #include <string>
@@ -7,7 +7,9 @@ static char rcsid[] = "@(#$Id: utf8iter.cpp,v 1.2 2005-02-11 11:20:02 dockes Exp
 #include <list>
 #include <vector>
 #include "debuglog.h"
+#ifndef NO_NAMESPACES
 using namespace std;
+#endif /* NO_NAMESPACES */
 
 #include "utf8iter.h"
 #include "readfile.h"
diff --git a/src/utils/wipedir.cpp b/src/utils/wipedir.cpp
index 011abdd3..5372567d 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.2 2005-04-06 10:20:11 dockes Exp $ (C) 2004 J.F.Dockes";
+static char rcsid[] = "@(#$Id: wipedir.cpp,v 1.3 2005-11-24 07:16:16 dockes Exp $ (C) 2004 J.F.Dockes";
 #endif
 
 #ifndef TEST_WIPEDIR
@@ -10,7 +10,9 @@ static char rcsid[] = "@(#$Id: wipedir.cpp,v 1.2 2005-04-06 10:20:11 dockes Exp
 #include <errno.h>
 
 #include <string>
+#ifndef NO_NAMESPACES
 using namespace std;
+#endif /* NO_NAMESPACES */
 
 #include "debuglog.h"
 #include "pathut.h"