diff -Naur recoll-1.12.0-orig/bincimapmime/convert.h recoll-1.12.0/bincimapmime/convert.h
--- recoll-1.12.0-orig/bincimapmime/convert.h	2009-01-08 11:46:12 +0200
+++ recoll-1.12.0/bincimapmime/convert.h	2009-05-28 23:38:26 +0300
@@ -105,7 +105,7 @@
       unsigned char c = *i;
       unsigned char d = *(i + 1);
       
-      char *t;
+      const char *t;
       if ((t = strchr(hexchars, c)) == 0)
 	return "out of range";
       n = (t - hexchars) << 4;
diff -Naur recoll-1.12.0-orig/qtgui/guiutils.cpp recoll-1.12.0/qtgui/guiutils.cpp
--- recoll-1.12.0-orig/qtgui/guiutils.cpp	2009-01-23 11:34:15 +0200
+++ recoll-1.12.0/qtgui/guiutils.cpp	2009-05-28 23:42:19 +0300
@@ -19,6 +19,7 @@
  */
 #include <unistd.h>
 
+#include <cstdio>
 #include <algorithm>
 
 #include "recoll.h"
diff -Naur recoll-1.12.0-orig/qtgui/preview_w.h recoll-1.12.0/qtgui/preview_w.h
--- recoll-1.12.0-orig/qtgui/preview_w.h	2009-01-23 11:34:15 +0200
+++ recoll-1.12.0/qtgui/preview_w.h	2009-05-28 23:49:10 +0300
@@ -20,6 +20,7 @@
 
 #include <qvariant.h>
 #include <qwidget.h>
+#include <cstdio>
 
 #include "rcldb.h"
 #include "refcntr.h"
diff -Naur recoll-1.12.0-orig/qtgui/spell_w.h recoll-1.12.0/qtgui/spell_w.h
--- recoll-1.12.0-orig/qtgui/spell_w.h	2009-01-08 11:46:12 +0200
+++ recoll-1.12.0/qtgui/spell_w.h	2009-05-28 23:51:22 +0300
@@ -20,6 +20,7 @@
 
 #include <qvariant.h>
 #include <qwidget.h>
+#include <cstdio>
 
 //MOC_SKIP_BEGIN
 #if QT_VERSION < 0x040000
diff -Naur recoll-1.12.0-orig/utils/base64.cpp recoll-1.12.0/utils/base64.cpp
--- recoll-1.12.0-orig/utils/base64.cpp	2009-01-08 11:46:13 +0200
+++ recoll-1.12.0/utils/base64.cpp	2009-05-28 23:20:39 +0300
@@ -40,7 +40,7 @@
 bool base64_decode(const string& in, string& out)
 {
     int io = 0, state = 0, ch = 0;
-    char *pos;
+    const char *pos;
     unsigned int ii = 0;
     out.erase();
     out.reserve(in.length());
diff -Naur recoll-1.12.0-orig/utils/md5.cpp recoll-1.12.0/utils/md5.cpp
--- recoll-1.12.0-orig/utils/md5.cpp	2009-01-12 18:43:13 +0200
+++ recoll-1.12.0/utils/md5.cpp	2009-05-28 23:28:31 +0300
@@ -29,6 +29,7 @@
  */
 #ifndef TEST_MD5
 #include <string.h>
+#include <cstdio>
 
 #include "md5.h"
 
diff -Naur recoll-1.12.0-orig/utils/readfile.cpp recoll-1.12.0/utils/readfile.cpp
--- recoll-1.12.0-orig/utils/readfile.cpp	2009-01-23 11:34:15 +0200
+++ recoll-1.12.0/utils/readfile.cpp	2009-05-28 23:30:28 +0300
@@ -29,7 +29,7 @@
 #endif
 #include <errno.h>
 #include <cstring>
-
+#include <cstdio>
 #include <string>
 
 #ifndef NO_NAMESPACES