diff --git a/lib/krb5.c b/lib/krb5.c
index 22aef16992a91e55027eca4d843233c9416a81e3..552ea25dc0b9aa0e1156b9cb9b67d9a891f81de8 100644
--- a/lib/krb5.c
+++ b/lib/krb5.c
@@ -62,6 +62,9 @@
 #include "krb4.h"
 #include "memory.h"
 
+#define _MPRINTF_REPLACE /* use our functions only */
+#include <curl/mprintf.h>
+
 /* The last #include file should be: */
 #include "memdebug.h"
 
diff --git a/lib/security.c b/lib/security.c
index a07da0b1e2601a939268920e6a6b2b7cfe1fd4a6..60585a45ea8271f6ca6dabbc9067e343a44dad5a 100644
--- a/lib/security.c
+++ b/lib/security.c
@@ -51,7 +51,10 @@
 
 #include <stdlib.h>
 #include <string.h>
+
+#ifdef HAVE_NETDB_H
 #include <netdb.h>
+#endif
 
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>