diff --git a/lib/hash.c b/lib/hash.c
index 3fcb44e4f0c2aa71a01c8ef376d63ccfc5cd01a2..f7d072482e2faf1383178fcbe5f36da4c26e79f3 100644
--- a/lib/hash.c
+++ b/lib/hash.c
@@ -28,9 +28,12 @@
 
 #include "hash.h"
 #include "llist.h"
-#include "memory.h"
 
-/* this must be the last include file */
+#define _MPRINTF_REPLACE /* use our functions only */
+#include <curl/mprintf.h>
+
+#include "memory.h"
+/* The last #include file should be: */
 #include "memdebug.h"
 
 static void
diff --git a/lib/multi.c b/lib/multi.c
index e503a11a2cb00e67197283e29e129c3efc27cb76..a91c8d76697780a639090d75e51b4e5b496d952f 100644
--- a/lib/multi.c
+++ b/lib/multi.c
@@ -37,13 +37,16 @@
 #include "url.h"
 #include "connect.h"
 #include "progress.h"
-#include "memory.h"
 #include "easyif.h"
 #include "multiif.h"
 #include "sendf.h"
 #include "timeval.h"
 #include "http.h"
 
+#define _MPRINTF_REPLACE /* use our functions only */
+#include <curl/mprintf.h>
+
+#include "memory.h"
 /* The last #include file should be: */
 #include "memdebug.h"
 
diff --git a/src/writeenv.c b/src/writeenv.c
index 90d341356d7ce369b79c4f1460ccd777b522a0a5..9789e2aeb43efd6f98d1391bd7a977435e54deac 100644
--- a/src/writeenv.c
+++ b/src/writeenv.c
@@ -5,7 +5,7 @@
  *                            | (__| |_| |  _ <| |___ 
  *                             \___|\___/|_| \_\_____|
  *
- * Copyright (C) 1998 - 2004, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2008, Daniel Stenberg, <daniel@haxx.se>, et al.
  *
  * This software is licensed as described in the file COPYING, which
  * you should have received as part of this distribution. The terms
@@ -32,6 +32,9 @@
 #include <kernel.h>
 #endif
 
+#define _MPRINTF_REPLACE /* use our functions only */
+#include <curl/mprintf.h>
+
 static const struct
 {
   const char * name;