diff --git a/.hgignore b/.hgignore
index 3dc1f119..3956500b 100644
--- a/.hgignore
+++ b/.hgignore
@@ -9,6 +9,7 @@ syntax: regexp
 syntax: glob
 
 .depend
+*.qtcreator.{config,creator,creator.user,files,includes}
 Makevars.local
 
 *.a
diff --git a/src/conf.h b/src/conf.h
index e29f7a73..470c2b6e 100644
--- a/src/conf.h
+++ b/src/conf.h
@@ -222,19 +222,14 @@
 #if (WITH_VALGRIND)
 #  include <valgrind/memcheck.h>
 #endif
-
-#if !defined(VALGRIND_MAKE_WRITABLE)
-#  define VALGRIND_MAKE_WRITABLE(addr,len)      0
+#if !defined(VALGRIND_MAKE_MEM_DEFINED)
+#  define VALGRIND_MAKE_MEM_DEFINED(addr,len)   0
 #endif
-#if !defined(VALGRIND_MAKE_READABLE)
-#  if 0
-#    define VALGRIND_MAKE_READABLE(addr,len)    (memset(addr,0,len), 0)
-#  else
-#    define VALGRIND_MAKE_READABLE(addr,len)    0
-#  endif
+#if !defined(VALGRIND_MAKE_MEM_NOACCESS)
+#  define VALGRIND_MAKE_MEM_NOACCESS(addr,len)  0
 #endif
-#if !defined(VALGRIND_DISCARD)
-#  define VALGRIND_DISCARD(handle)              ((void)(&handle))
+#if !defined(VALGRIND_MAKE_MEM_UNDEFINED)
+#  define VALGRIND_MAKE_MEM_UNDEFINED(addr,len) 0
 #endif