12 files changed, 54 insertions, 17 deletions
diff --git a/lib/curl_fnmatch.c b/lib/curl_fnmatch.c
index bc17ed673..0725ce2bd 100644
--- a/lib/curl_fnmatch.c
+++ b/lib/curl_fnmatch.c
@@ -24,6 +24,13 @@
 
 #include "curl_fnmatch.h"
 
+#define _MPRINTF_REPLACE /* use our functions only */
+#include <curl/mprintf.h>
+
+#include "curl_memory.h"
+/* The last #include file should be: */
+#include "memdebug.h"
+
 #define CURLFNM_CHARSET_LEN (sizeof(char) * 256)
 #define CURLFNM_CHSET_SIZE (CURLFNM_CHARSET_LEN + 15)
 
diff --git a/lib/curl_hmac.h b/lib/curl_hmac.h
index 4c5a5a6c1..9b65c8c2a 100644
--- a/lib/curl_hmac.h
+++ b/lib/curl_hmac.h
@@ -64,4 +64,4 @@ int Curl_HMAC_final(HMAC_context * context, unsigned char * result);
 
 #endif
 
-#endif
+#endif /* HEADER_CURL_HMAC_H */
diff --git a/lib/curl_rtmp.c b/lib/curl_rtmp.c
index 21a67f5ce..df30dc1f6 100644
--- a/lib/curl_rtmp.c
+++ b/lib/curl_rtmp.c
@@ -31,6 +31,13 @@
 #include <curl/curl.h>
 #include <librtmp/rtmp.h>
 
+#define _MPRINTF_REPLACE /* use our functions only */
+#include <curl/mprintf.h>
+
+#include "curl_memory.h"
+/* The last #include file should be: */
+#include "memdebug.h"
+
 #ifdef _WIN32
 #define setsockopt(a,b,c,d,e) (setsockopt)(a,b,c,(const char *)d,(int)e)
 #define SET_RCVTIMEO(tv,s)   int tv = s*1000
diff --git a/lib/curl_rtmp.h b/lib/curl_rtmp.h
index 06555ffce..4a9e9e60c 100644
--- a/lib/curl_rtmp.h
+++ b/lib/curl_rtmp.h
@@ -1,6 +1,5 @@
-#ifndef __CURL_RTMP_H
-#define __CURL_RTMP_H
-
+#ifndef HEADER_CURL_RTMP_H
+#define HEADER_CURL_RTMP_H
 /***************************************************************************
  *                                  _   _ ____  _
  *  Project                     ___| | | |  _ \| |
@@ -31,4 +30,4 @@ extern const struct Curl_handler Curl_handler_rtmps;
 extern const struct Curl_handler Curl_handler_rtmpts;
 #endif
 
-#endif /* __CURL_RTMP_H */
+#endif /* HEADER_CURL_RTMP_H */
diff --git a/lib/fileinfo.c b/lib/fileinfo.c
index c1c112743..f5dbfce4b 100644
--- a/lib/fileinfo.c
+++ b/lib/fileinfo.c
@@ -26,6 +26,13 @@
 #include "strdup.h"
 #include "fileinfo.h"
 
+#define _MPRINTF_REPLACE /* use our functions only */
+#include <curl/mprintf.h>
+
+#include "curl_memory.h"
+/* The last #include file should be: */
+#include "memdebug.h"
+
 struct curl_fileinfo *Curl_fileinfo_alloc(void)
 {
   struct curl_fileinfo *tmp = malloc(sizeof(struct curl_fileinfo));
diff --git a/lib/fileinfo.h b/lib/fileinfo.h
index b040ef4ce..b0e5e59e1 100644
--- a/lib/fileinfo.h
+++ b/lib/fileinfo.h
@@ -1,5 +1,5 @@
-#ifndef __FILEINFO_H
-#define __FILEINFO_H
+#ifndef HEADER_CURL_FILEINFO_H
+#define HEADER_CURL_FILEINFO_H
 /***************************************************************************
  *                                  _   _ ____  _
  *  Project                     ___| | | |  _ \| |
@@ -30,4 +30,4 @@ void Curl_fileinfo_dtor(void *, void *);
 
 struct curl_fileinfo *Curl_fileinfo_dup(const struct curl_fileinfo *src);
 
-#endif /* __FILEINFO_H */
+#endif /* HEADER_CURL_FILEINFO_H */
diff --git a/lib/ftplistparser.c b/lib/ftplistparser.c
index 95adfe68d..65addfaa1 100644
--- a/lib/ftplistparser.c
+++ b/lib/ftplistparser.c
@@ -50,6 +50,13 @@
 #include "rawstr.h"
 #include "ftp.h"
 
+#define _MPRINTF_REPLACE /* use our functions only */
+#include <curl/mprintf.h>
+
+#include "curl_memory.h"
+/* The last #include file should be: */
+#include "memdebug.h"
+
 /* allocs buffer which will contain one line of LIST command response */
 #define FTP_BUFFER_ALLOCSIZE 160
 
diff --git a/lib/ftplistparser.h b/lib/ftplistparser.h
index 20d75efa2..5a16abf6a 100644
--- a/lib/ftplistparser.h
+++ b/lib/ftplistparser.h
@@ -1,5 +1,5 @@
-#ifndef __FTPLISTPARSER_H_
-#define __FTPLISTPARSER_H_
+#ifndef HEADER_CURL_FTPLISTPARSER_H
+#define HEADER_CURL_FTPLISTPARSER_H
 /***************************************************************************
  *                                  _   _ ____  _
  *  Project                     ___| | | |  _ \| |
@@ -35,4 +35,4 @@ struct ftp_parselist_data *ftp_parselist_data_alloc(void);
 
 void ftp_parselist_data_free(struct ftp_parselist_data **pl_data);
 
-#endif /* __FTPLISTPARSER_H_ */
+#endif /* HEADER_CURL_FTPLISTPARSER_H */
diff --git a/lib/hmac.c b/lib/hmac.c
index f59397653..0c01d1187 100644
--- a/lib/hmac.c
+++ b/lib/hmac.c
@@ -28,6 +28,13 @@
 
 #include "curl_hmac.h"
 
+#define _MPRINTF_REPLACE /* use our functions only */
+#include <curl/mprintf.h>
+
+#include "curl_memory.h"
+/* The last #include file should be: */
+#include "memdebug.h"
+
 /*
  * Generic HMAC algorithm.
  *
diff --git a/lib/polarssl.h b/lib/polarssl.h
index be905987e..964af1728 100644
--- a/lib/polarssl.h
+++ b/lib/polarssl.h
@@ -1,5 +1,5 @@
-#ifndef __POLARSSL_H
-#define __POLARSSL_H
+#ifndef HEADER_CURL_POLARSSL_H
+#define HEADER_CURL_POLARSSL_H
 /***************************************************************************
  *                                  _   _ ____  _
  *  Project                     ___| | | |  _ \| |
@@ -54,4 +54,4 @@ int Curl_polarssl_shutdown(struct connectdata *conn, int sockindex);
 #define curlssl_data_pending(x,y) (x=x, y=y, 0)
 
 #endif /* USE_POLARSSL */
-#endif
+#endif /* HEADER_CURL_POLARSSL_H */
diff --git a/lib/wildcard.c b/lib/wildcard.c
index 186c515c5..0fe153c5f 100644
--- a/lib/wildcard.c
+++ b/lib/wildcard.c
@@ -25,6 +25,9 @@
 #include "llist.h"
 #include "fileinfo.h"
 
+#define _MPRINTF_REPLACE /* use our functions only */
+#include <curl/mprintf.h>
+
 #include "curl_memory.h"
 /* The last #include file should be: */
 #include "memdebug.h"
diff --git a/lib/wildcard.h b/lib/wildcard.h
index 1a1c1bb0c..8f732d106 100644
--- a/lib/wildcard.h
+++ b/lib/wildcard.h
@@ -1,5 +1,5 @@
-#ifndef __WILDCARD_H
-#define __WILDCARD_H
+#ifndef HEADER_CURL_WILDCARD_H
+#define HEADER_CURL_WILDCARD_H
 /***************************************************************************
  *                                  _   _ ____  _
  *  Project                     ___| | | |  _ \| |
@@ -55,4 +55,4 @@ void Curl_wildcard_dtor(struct WildcardData *wc);
 
 struct SessionHandle;
 
-#endif /* __WILDCARD_H */
+#endif /* HEADER_CURL_WILDCARD_H */