diff --git a/tests/libtest/first.c b/tests/libtest/first.c
index d25c7ad287000ee2e86947ec09b8a8a4748807c8..9b06f74bcfb32cdf3c503cf67d572f1c4dc32dbe 100644
--- a/tests/libtest/first.c
+++ b/tests/libtest/first.c
@@ -11,9 +11,8 @@
 #include "test.h"
 
 #ifdef CURLDEBUG
-/* provide a proto for this debug function */
-extern void curl_memdebug(const char *);
-extern void curl_memlimit(int);
+#  define MEMDEBUG_NODEFINES
+#  include "memdebug.h"
 #endif
 
 int select_test (int num_fds, fd_set *rd, fd_set *wr, fd_set *exc,
diff --git a/tests/libtest/lib500.c b/tests/libtest/lib500.c
index c28f5d0c94854f247ebb9cccf558f2d9a52ed558..14a8e7aebe7e0649dc6764da49d5c44e67fdb1ea 100644
--- a/tests/libtest/lib500.c
+++ b/tests/libtest/lib500.c
@@ -10,6 +10,8 @@
 
 #include "test.h"
 
+#include "memdebug.h"
+
 int test(char *URL)
 {
   CURLcode res;
diff --git a/tests/libtest/lib501.c b/tests/libtest/lib501.c
index cf2d957241df4689fbe078bd4dee413af967c402..ff2bbb5b90ef35d7e824da5215636544cda1024f 100644
--- a/tests/libtest/lib501.c
+++ b/tests/libtest/lib501.c
@@ -10,6 +10,8 @@
 
 #include "test.h"
 
+#include "memdebug.h"
+
 int test(char *URL)
 {
   CURLcode res;
diff --git a/tests/libtest/lib502.c b/tests/libtest/lib502.c
index ea53795c028ecc5953813a93155640ba9526416b..85c300fbe6111fefa32feac89eedb8d17da4355f 100644
--- a/tests/libtest/lib502.c
+++ b/tests/libtest/lib502.c
@@ -11,6 +11,7 @@
 #include "test.h"
 
 #include "testutil.h"
+#include "memdebug.h"
 
 #define MAIN_LOOP_HANG_TIMEOUT     90 * 1000
 #define MULTI_PERFORM_HANG_TIMEOUT 60 * 1000
diff --git a/tests/libtest/lib503.c b/tests/libtest/lib503.c
index 5eda5996ea4804227f4dea99c48df6673c3cdab5..11f1150c06cd180c1b69023c9d4cd134cbf9b500 100644
--- a/tests/libtest/lib503.c
+++ b/tests/libtest/lib503.c
@@ -13,6 +13,7 @@
 #include <sys/types.h>
 
 #include "testutil.h"
+#include "memdebug.h"
 
 #define MAIN_LOOP_HANG_TIMEOUT     90 * 1000
 #define MULTI_PERFORM_HANG_TIMEOUT 60 * 1000
diff --git a/tests/libtest/lib504.c b/tests/libtest/lib504.c
index a57a3d15796667972f8cd2dc11a655842fe62325..fece016b81a13059be0869e72d2324cf8f788f6e 100644
--- a/tests/libtest/lib504.c
+++ b/tests/libtest/lib504.c
@@ -13,6 +13,7 @@
 #include <sys/types.h>
 
 #include "testutil.h"
+#include "memdebug.h"
 
 #define MAIN_LOOP_HANG_TIMEOUT     90 * 1000
 #define MULTI_PERFORM_HANG_TIMEOUT 60 * 1000
diff --git a/tests/libtest/lib505.c b/tests/libtest/lib505.c
index eec2071c9f94d10a37f907ec20450a5b1792494b..ceccd6b280046b9286b721e5970fed5cfc319ca7 100644
--- a/tests/libtest/lib505.c
+++ b/tests/libtest/lib505.c
@@ -28,6 +28,8 @@
 #include <unistd.h>
 #endif
 
+#include "memdebug.h"
+
 /*
  * This example shows an FTP upload, with a rename of the file just after
  * a successful upload.
diff --git a/tests/libtest/lib506.c b/tests/libtest/lib506.c
index 260fec19406abcd14becd18302d04350320fd99b..34c774e5dfd083c6bcafa6bc4dc51aeef87eac63 100644
--- a/tests/libtest/lib506.c
+++ b/tests/libtest/lib506.c
@@ -15,6 +15,8 @@
 
 #include <curl/mprintf.h>
 
+#include "memdebug.h"
+
 static const char *HOSTHEADER = "Host: www.host.foo.com";
 static const char *JAR = "log/jar506";
 #define THREADS 2
diff --git a/tests/libtest/lib507.c b/tests/libtest/lib507.c
index 0137130ce1876cf17f25f60941108ab3a38b01c4..b2fd0988888d77ee83962a49954ba4f12410d4c5 100644
--- a/tests/libtest/lib507.c
+++ b/tests/libtest/lib507.c
@@ -11,6 +11,7 @@
 #include "test.h"
 
 #include "testutil.h"
+#include "memdebug.h"
 
 #define MAIN_LOOP_HANG_TIMEOUT     90 * 1000
 #define MULTI_PERFORM_HANG_TIMEOUT 60 * 1000
diff --git a/tests/libtest/lib508.c b/tests/libtest/lib508.c
index 35679d18084bc0f8e916faa688de50dfb8f04ea8..a709b80be5ed529806f7f188a9516c7a8b580bd3 100644
--- a/tests/libtest/lib508.c
+++ b/tests/libtest/lib508.c
@@ -10,6 +10,8 @@
 
 #include "test.h"
 
+#include "memdebug.h"
+
 static char data[]="this is what we post to the silly web server\n";
 
 struct WriteThis {
diff --git a/tests/libtest/lib510.c b/tests/libtest/lib510.c
index d8644c3faf887990f8011aed3aeb54bf08986f40..43ead093606e9fefc6130b54226d631c04e473a1 100644
--- a/tests/libtest/lib510.c
+++ b/tests/libtest/lib510.c
@@ -10,6 +10,8 @@
 
 #include "test.h"
 
+#include "memdebug.h"
+
 static const char *post[]={
   "one",
   "two",
diff --git a/tests/libtest/lib511.c b/tests/libtest/lib511.c
index b0f455d5980aed273b0630d9d9951fb8dd0df5fa..0f9993db116d4cade2ba84ff3b1cbeee1f6e2f4c 100644
--- a/tests/libtest/lib511.c
+++ b/tests/libtest/lib511.c
@@ -10,6 +10,8 @@
 
 #include "test.h"
 
+#include "memdebug.h"
+
 int test(char *URL)
 {
   CURLcode res;
diff --git a/tests/libtest/lib512.c b/tests/libtest/lib512.c
index 0af95919b68675eb9f09b3abe3a808dfc20c8599..14072f45cd082efedcfaa71b0b38ef9e1b1b1965 100644
--- a/tests/libtest/lib512.c
+++ b/tests/libtest/lib512.c
@@ -10,6 +10,8 @@
 
 #include "test.h"
 
+#include "memdebug.h"
+
 /* Test case code based on source in a bug report filed by James Bursa on
    28 Apr 2004 */
 
diff --git a/tests/libtest/lib513.c b/tests/libtest/lib513.c
index d6f3756b78b45aa0ab538499dbfa28b05aea54de..e49724ca6104a7191c6903793d28cd000e46aeb9 100644
--- a/tests/libtest/lib513.c
+++ b/tests/libtest/lib513.c
@@ -10,6 +10,8 @@
 
 #include "test.h"
 
+#include "memdebug.h"
+
 static size_t read_callback(void *ptr, size_t size, size_t nmemb, void *userp)
 {
   (void)ptr;
diff --git a/tests/libtest/lib514.c b/tests/libtest/lib514.c
index 419b8422af5ee9b49ec97e4fd930bb1ce21c9bec..06f975f34773c967ebeae16f7a34d291635fc8e3 100644
--- a/tests/libtest/lib514.c
+++ b/tests/libtest/lib514.c
@@ -10,6 +10,8 @@
 
 #include "test.h"
 
+#include "memdebug.h"
+
 int test(char *URL)
 {
   CURL *curl;
diff --git a/tests/libtest/lib515.c b/tests/libtest/lib515.c
index 18df7c9380229a9355dcb0ff48e2996d042e6c2b..c85f2bed11745489f8e73b103608d4d3e0061d15 100644
--- a/tests/libtest/lib515.c
+++ b/tests/libtest/lib515.c
@@ -10,6 +10,8 @@
 
 #include "test.h"
 
+#include "memdebug.h"
+
 int test(char *URL)
 {
   CURL *curl;
diff --git a/tests/libtest/lib516.c b/tests/libtest/lib516.c
index 8295699e3a5a13eddeaafccf8842e03c64fe8f76..b3c63f4b51796c24c2fee71cff00ca2dcc734faf 100644
--- a/tests/libtest/lib516.c
+++ b/tests/libtest/lib516.c
@@ -10,6 +10,8 @@
 
 #include "test.h"
 
+#include "memdebug.h"
+
 int test(char *URL)
 {
   CURL *curl;
diff --git a/tests/libtest/lib517.c b/tests/libtest/lib517.c
index 20fba6fbd05d9362531d17d63a39b9ffdd450d04..86539fb73a904c6fbb74e01e159bcb1381443b04 100644
--- a/tests/libtest/lib517.c
+++ b/tests/libtest/lib517.c
@@ -10,6 +10,8 @@
 
 #include "test.h"
 
+#include "memdebug.h"
+
 static const char *dates[]={
   "Sun, 06 Nov 1994 08:49:37 GMT",
   "Sunday, 06-Nov-94 08:49:37 GMT",
diff --git a/tests/libtest/lib518.c b/tests/libtest/lib518.c
index 41c3fe282159d5eb526bfa7a308ea11c4510847b..a1b914916fd1cd8b3bc833d87bcb1c141c2e5749 100644
--- a/tests/libtest/lib518.c
+++ b/tests/libtest/lib518.c
@@ -26,6 +26,8 @@
 #include <string.h>
 #endif
 
+#include "memdebug.h"
+
 #ifndef FD_SETSIZE
 #error "this test requires FD_SETSIZE"
 #endif
diff --git a/tests/libtest/lib519.c b/tests/libtest/lib519.c
index ce440485a784af2a6fac9a9b05b813fd2739fa5a..70ada8a15be7f10b4e401fad2a67358745bc9be4 100644
--- a/tests/libtest/lib519.c
+++ b/tests/libtest/lib519.c
@@ -10,6 +10,8 @@
 
 #include "test.h"
 
+#include "memdebug.h"
+
 int test(char *URL)
 {
   CURLcode res;
diff --git a/tests/libtest/lib520.c b/tests/libtest/lib520.c
index 46cad415df206664d65c32f46a714da8ad670132..1d63881c38c0edec34be6409676311bbb62356f6 100644
--- a/tests/libtest/lib520.c
+++ b/tests/libtest/lib520.c
@@ -10,6 +10,8 @@
 
 #include "test.h"
 
+#include "memdebug.h"
+
 int test(char *URL)
 {
   CURLcode res;
diff --git a/tests/libtest/lib521.c b/tests/libtest/lib521.c
index 346ece0561e8b616b34f94d58cc3437dc6700315..60fe4d95d7d5a3b9585461e93fb671142897f02f 100644
--- a/tests/libtest/lib521.c
+++ b/tests/libtest/lib521.c
@@ -10,6 +10,8 @@
 
 #include "test.h"
 
+#include "memdebug.h"
+
 int test(char *URL)
 {
   CURLcode res;
diff --git a/tests/libtest/lib523.c b/tests/libtest/lib523.c
index 9f485ffedbce7a34bcd2ccaba3afe70871264a00..c6011fc57d8a06381e3a88549f5aad18a54e0fa7 100644
--- a/tests/libtest/lib523.c
+++ b/tests/libtest/lib523.c
@@ -10,6 +10,8 @@
 
 #include "test.h"
 
+#include "memdebug.h"
+
 int test(char *URL)
 {
   CURLcode res;
diff --git a/tests/libtest/lib524.c b/tests/libtest/lib524.c
index 2fde663cab50d103e8c5c829dbaa7a5228d2d5b3..c8b07834a0f236e573b0531824cd980034e63eaa 100644
--- a/tests/libtest/lib524.c
+++ b/tests/libtest/lib524.c
@@ -10,6 +10,8 @@
 
 #include "test.h"
 
+#include "memdebug.h"
+
 int test(char *URL)
 {
   CURLcode res;
diff --git a/tests/libtest/lib525.c b/tests/libtest/lib525.c
index 154c209e389f913055ed8aa6714d0a5bfcd7335c..c503d1618527ee10ce0c603c867e084b8a7f20d5 100644
--- a/tests/libtest/lib525.c
+++ b/tests/libtest/lib525.c
@@ -15,6 +15,7 @@
 #include <fcntl.h>
 
 #include "testutil.h"
+#include "memdebug.h"
 
 #define MAIN_LOOP_HANG_TIMEOUT     90 * 1000
 #define MULTI_PERFORM_HANG_TIMEOUT 60 * 1000
diff --git a/tests/libtest/lib526.c b/tests/libtest/lib526.c
index 8951a7444c3d3e64ddbc32a3601662973f1feb7d..b4d8913376c69bdf00b69bb8198554525dbf5974 100644
--- a/tests/libtest/lib526.c
+++ b/tests/libtest/lib526.c
@@ -34,6 +34,7 @@
 #include <fcntl.h>
 
 #include "testutil.h"
+#include "memdebug.h"
 
 #define MAIN_LOOP_HANG_TIMEOUT     90 * 1000
 #define MULTI_PERFORM_HANG_TIMEOUT 60 * 1000
diff --git a/tests/libtest/lib530.c b/tests/libtest/lib530.c
index af7d00d02fb16fe023b23eb984d3bc88afbf4009..d738277f23448bc46455e57e090aaef1e66d6241 100644
--- a/tests/libtest/lib530.c
+++ b/tests/libtest/lib530.c
@@ -21,6 +21,7 @@
 #endif
 
 #include "testutil.h"
+#include "memdebug.h"
 
 #define MAIN_LOOP_HANG_TIMEOUT     90 * 1000
 #define MULTI_PERFORM_HANG_TIMEOUT 60 * 1000
diff --git a/tests/libtest/lib533.c b/tests/libtest/lib533.c
index 71c43c2ca53d8b44b1535ad37a367acd6e558db8..92b371a81e4a6c6c0fe95c9a567abcd72a36f10e 100644
--- a/tests/libtest/lib533.c
+++ b/tests/libtest/lib533.c
@@ -17,6 +17,7 @@
 #include <fcntl.h>
 
 #include "testutil.h"
+#include "memdebug.h"
 
 #define MAIN_LOOP_HANG_TIMEOUT     90 * 1000
 #define MULTI_PERFORM_HANG_TIMEOUT 60 * 1000
diff --git a/tests/libtest/lib536.c b/tests/libtest/lib536.c
index 9e764a97acb2e599131386fe958b32340bed4376..016b7e922f34d79b8b1a85b39ba009458feb5f13 100644
--- a/tests/libtest/lib536.c
+++ b/tests/libtest/lib536.c
@@ -15,6 +15,7 @@
 #include <fcntl.h>
 
 #include "testutil.h"
+#include "memdebug.h"
 
 #define MAIN_LOOP_HANG_TIMEOUT     90 * 1000
 #define MULTI_PERFORM_HANG_TIMEOUT 60 * 1000
diff --git a/tests/libtest/lib537.c b/tests/libtest/lib537.c
index f3b42e755720bed36b494812eb271c77bef5fd47..7bb8c143652fc4c7a781bb626db494020ca8002e 100644
--- a/tests/libtest/lib537.c
+++ b/tests/libtest/lib537.c
@@ -26,6 +26,8 @@
 #include <string.h>
 #endif
 
+#include "memdebug.h"
+
 #if !defined(HAVE_POLL_FINE)    && \
     !defined(USE_WINSOCK)       && \
     !defined(TPF)               && \
diff --git a/tests/libtest/lib539.c b/tests/libtest/lib539.c
index 0e43654ef97041585a567c43b3f2a90d63cc2490..c99344421cc13f7673fd4d00b447571cd6090d1c 100644
--- a/tests/libtest/lib539.c
+++ b/tests/libtest/lib539.c
@@ -10,6 +10,8 @@
 
 #include "test.h"
 
+#include "memdebug.h"
+
 int test(char *URL)
 {
    CURLcode res;
diff --git a/tests/libtest/lib540.c b/tests/libtest/lib540.c
index 089fcd5cb23469e9d7595381257a30467036f2c6..cfaa1622df1127627737badb66afe86002cccf69 100644
--- a/tests/libtest/lib540.c
+++ b/tests/libtest/lib540.c
@@ -18,6 +18,8 @@
 
 #include "test.h"
 
+#include "memdebug.h"
+
 #define PROXY libtest_arg2
 #define PROXYUSERPWD libtest_arg3
 #define HOST test_argv[4]
diff --git a/tests/libtest/lib541.c b/tests/libtest/lib541.c
index a2224ae696d585ae8c1440cdc0c992d4600c0f68..ada389cf1c5b23f94a3a4b48c09dab800898678e 100644
--- a/tests/libtest/lib541.c
+++ b/tests/libtest/lib541.c
@@ -28,6 +28,8 @@
 #include <unistd.h>
 #endif
 
+#include "memdebug.h"
+
 /*
  * Two FTP uploads, the second with no content sent.
  */
diff --git a/tests/libtest/lib542.c b/tests/libtest/lib542.c
index ffd8f361cd0b230a6fe7b84d8018bedd911769b2..1d45405bb8ffd350c2a9a38f2093d2162afb14c2 100644
--- a/tests/libtest/lib542.c
+++ b/tests/libtest/lib542.c
@@ -28,6 +28,8 @@
 #include <unistd.h>
 #endif
 
+#include "memdebug.h"
+
 /*
  * FTP get with NOBODY but no HEADER
  */
diff --git a/tests/libtest/lib543.c b/tests/libtest/lib543.c
index 2e930d2d6b7ae1332fdd29bd7d284d66b5f11b24..662883529a1a97ef78728f2ebbd007afb9330754 100644
--- a/tests/libtest/lib543.c
+++ b/tests/libtest/lib543.c
@@ -13,6 +13,8 @@
 #include "setup.h"
 #include "test.h"
 
+#include "memdebug.h"
+
 int test(char *URL)
 {
   unsigned char a[] = {0x9c, 0x26, 0x4b, 0x3d, 0x49, 0x4, 0xa1, 0x1,
diff --git a/tests/libtest/lib544.c b/tests/libtest/lib544.c
index f91cef354a1df2c010d9eead107c0f0bb9eb07fd..7562919729cef3cf7cfcf934275e809bb82451e4 100644
--- a/tests/libtest/lib544.c
+++ b/tests/libtest/lib544.c
@@ -10,6 +10,7 @@
 
 #include "test.h"
 
+#include "memdebug.h"
 
 static char teststring[] =
   "This\0 is test binary data with an embedded NUL byte\n";
diff --git a/tests/libtest/lib547.c b/tests/libtest/lib547.c
index 85f22fe8ed6725dbe1054dd64ca00797ec23e790..8a1070f70a330dc7d66da307e130cc9d6375c974 100644
--- a/tests/libtest/lib547.c
+++ b/tests/libtest/lib547.c
@@ -14,6 +14,8 @@
 
 #include "test.h"
 
+#include "memdebug.h"
+
 #define UPLOADTHIS "this is the blurb we want to upload\n"
 
 #ifndef LIB548
diff --git a/tests/libtest/lib549.c b/tests/libtest/lib549.c
index d50835624ded875c040eb12d591418237791cdad..e196aba56fc214f5470c1f7973825113b26443ca 100644
--- a/tests/libtest/lib549.c
+++ b/tests/libtest/lib549.c
@@ -14,6 +14,8 @@
 
 #include "test.h"
 
+#include "memdebug.h"
+
 int test(char *URL)
 {
   CURLcode res;
diff --git a/tests/libtest/lib552.c b/tests/libtest/lib552.c
index ab097da3e51fef2f1e1644053033c475c6fd4161..ff2b8c9866cfa67bfeb140f71f2077088f9ebe19 100644
--- a/tests/libtest/lib552.c
+++ b/tests/libtest/lib552.c
@@ -13,6 +13,8 @@
 
 #include "test.h"
 
+#include "memdebug.h"
+
 struct data {
   char trace_ascii; /* 1 or 0 */
 };
diff --git a/tests/libtest/lib553.c b/tests/libtest/lib553.c
index 0603b3fd5ec927f3294f04ebc1f26b8b6dc6be4b..b9372b34792852c51459973ede04d3bc232b1c12 100644
--- a/tests/libtest/lib553.c
+++ b/tests/libtest/lib553.c
@@ -13,6 +13,8 @@
 
 #include "test.h"
 
+#include "memdebug.h"
+
 #define POSTLEN 40960
 
 static size_t myreadfunc(void *ptr, size_t size, size_t nmemb, void *stream)
diff --git a/tests/libtest/lib554.c b/tests/libtest/lib554.c
index fe0c16a660d2ef36416a62d832bff80ed9b1f93c..2999aea08a2424964fd37bf44c8db8b7fb405d5e 100644
--- a/tests/libtest/lib554.c
+++ b/tests/libtest/lib554.c
@@ -10,6 +10,8 @@
 
 #include "test.h"
 
+#include "memdebug.h"
+
 static char data[]="this is what we post to the silly web server\n";
 
 struct WriteThis {
diff --git a/tests/libtest/lib555.c b/tests/libtest/lib555.c
index ad259e0e61a849a69c05dd87baee7afeefd224ad..33a1a26c72fc36ae91146d3552bbe4c6a09f4331 100644
--- a/tests/libtest/lib555.c
+++ b/tests/libtest/lib555.c
@@ -17,6 +17,7 @@
 
 #include "test.h"
 #include "testutil.h"
+#include "memdebug.h"
 
 #define MULTI_PERFORM_HANG_TIMEOUT 60 * 1000
 
diff --git a/tests/libtest/lib556.c b/tests/libtest/lib556.c
index 85fd65699879c1c37f95fdb29713aa73514500db..0e3949da35a78bc38c80005c5c916ef6759ac3af 100644
--- a/tests/libtest/lib556.c
+++ b/tests/libtest/lib556.c
@@ -10,6 +10,8 @@
 
 #include "test.h"
 
+#include "memdebug.h"
+
 int test(char *URL)
 {
   CURLcode res;
diff --git a/tests/libtest/lib557.c b/tests/libtest/lib557.c
index 13148dd845dbb913c2ed47f749cfc68792facf59..cb54ec70828ac7301af6e2e95371a3f08eda1fd3 100644
--- a/tests/libtest/lib557.c
+++ b/tests/libtest/lib557.c
@@ -15,6 +15,8 @@
 
 #include "test.h"
 
+#include "memdebug.h"
+
 int curl_msprintf(char *buffer, const char *format, ...);
 
 
diff --git a/tests/libtest/testutil.c b/tests/libtest/testutil.c
index 573e6faed2b9c87fe61adcb79f537918285c1e30..a70652626dd8d56fbcdb791e6634cdad90e16229 100644
--- a/tests/libtest/testutil.c
+++ b/tests/libtest/testutil.c
@@ -24,6 +24,7 @@
 #include "setup.h"
 
 #include "testutil.h"
+#include "memdebug.h"
 
 #if defined(WIN32) && !defined(MSDOS)