diff --git a/src/getpass.c b/src/getpass.c
index a2854cd16..eb210460e 100644
--- a/src/getpass.c
+++ b/src/getpass.c
@@ -94,8 +94,8 @@ char *getpass_r(const char *prompt, char *buffer, size_t buflen)
 #endif
 
 /* The last #include file should be: */
-#ifdef CURLDEBUG
-#include "../lib/memdebug.h"
+#if defined(CURLDEBUG) && defined(CURLTOOLDEBUG)
+#include "memdebug.h"
 #endif
 
 char *getpass_r(const char *prompt, char *buffer, size_t buflen)
diff --git a/src/homedir.c b/src/homedir.c
index fedbdb8fc..3ec196a7e 100644
--- a/src/homedir.c
+++ b/src/homedir.c
@@ -42,8 +42,8 @@
 
 #include "homedir.h"
 
-#ifdef CURLDEBUG
-#include "../lib/memdebug.h"
+#if defined(CURLDEBUG) && defined(CURLTOOLDEBUG)
+#include "memdebug.h"
 #endif
 
 static
diff --git a/src/main.c b/src/main.c
index 6cc264b24..9c915203c 100644
--- a/src/main.c
+++ b/src/main.c
@@ -107,6 +107,9 @@
 
 /* The last #include file should be: */
 #ifdef CURLDEBUG
+#ifndef CURLTOOLDEBUG
+#define MEMDEBUG_NODEFINES
+#endif
 /* This is low-level hard-hacking memory leak tracking and similar. Using
    the library level code from this client-side is ugly, but we do this
    anyway for convenience. */
diff --git a/src/urlglob.c b/src/urlglob.c
index b7f56192c..582ec1b0b 100644
--- a/src/urlglob.c
+++ b/src/urlglob.c
@@ -35,9 +35,8 @@
 
 #include "urlglob.h"
 
-
-#ifdef CURLDEBUG
-#include "../lib/memdebug.h"
+#if defined(CURLDEBUG) && defined(CURLTOOLDEBUG)
+#include "memdebug.h"
 #endif
 
 typedef enum {