4 files changed, 41 insertions, 20 deletions
diff --git a/tests/libtest/first.c b/tests/libtest/first.c
index 303766fc8..4f42136a0 100644
--- a/tests/libtest/first.c
+++ b/tests/libtest/first.c
@@ -1,10 +1,26 @@
 #include <curl/curl.h>
 
+#ifdef MALLOCDEBUG
+/* provide a proto for this debug function */
+extern void curl_memdebug(const char *);
+#endif
+
+/* test is provided in the test code file */
+CURLcode test(char *url);
+
 int main(int argc, char **argv)
 {
+  char *URL;
   if(argc< 2 ) {
     fprintf(stderr, "Pass URL as argument please\n");
     return 1;
   }
+  URL = argv[1]; /* provide this to the rest */
+
+  fprintf(stderr, "URL: %s\n", URL);
 
+#ifdef MALLOCDEBUG
   curl_memdebug("memdump");
+#endif
+  return test(URL);
+}
diff --git a/tests/libtest/lib500.c b/tests/libtest/lib500.c
index a825b930c..f78ab5561 100644
--- a/tests/libtest/lib500.c
+++ b/tests/libtest/lib500.c
@@ -1,12 +1,13 @@
-#include "first.c"
+#include "test.h"
 
-fprintf(stderr, "URL: %s\n", argv[1]);
+CURLcode test(char *URL)
+{
+  CURLcode res;
+  CURL *curl = curl_easy_init();
+  curl_easy_setopt(curl, CURLOPT_URL, URL);
+  curl_easy_setopt(curl, CURLOPT_HEADER, TRUE);
+  res = curl_easy_perform(curl);
+  curl_easy_cleanup(curl);  
+  return res;
+}
 
-CURL *curl;
-curl = curl_easy_init();
-curl_easy_setopt(curl, CURLOPT_URL, argv[1]);
-curl_easy_setopt(curl, CURLOPT_HEADER, TRUE);
-curl_easy_perform(curl);
-curl_easy_cleanup(curl);
-
-#include "last.c"
diff --git a/tests/libtest/lib501.c b/tests/libtest/lib501.c
index 4199598fa..2ed1a9ae4 100644
--- a/tests/libtest/lib501.c
+++ b/tests/libtest/lib501.c
@@ -1,13 +1,14 @@
-#include "first.c"
+#include "test.h"
 
-fprintf(stderr, "URL: %s\n", argv[1]);
+CURLcode test(char *URL)
+{
+  CURLcode res;
+  CURL *curl = curl_easy_init();
 
-CURL *curl;
-CURLcode res;
-curl = curl_easy_init();
-curl_easy_setopt(curl, CURLOPT_HEADER, TRUE);
-res = curl_easy_perform(curl);
-curl_easy_cleanup(curl);
+  (void)URL; /* we don't use this */
+  curl_easy_setopt(curl, CURLOPT_HEADER, TRUE);
+  res = curl_easy_perform(curl);
+  curl_easy_cleanup(curl);
+  return res;
+}
 
-return res;
-#include "last.c"
diff --git a/tests/libtest/test.h b/tests/libtest/test.h
new file mode 100644
index 000000000..959270a30
--- /dev/null
+++ b/tests/libtest/test.h
@@ -0,0 +1,3 @@
+#include <curl/curl.h>
+#include <stdio.h>
+