diff --git a/lib/memdebug.h b/lib/memdebug.h
index 23b420e2e..4d965fb1f 100644
--- a/lib/memdebug.h
+++ b/lib/memdebug.h
@@ -92,12 +92,15 @@ CURL_EXTERN int curl_fclose(FILE *file, int line, const char *source);
 #define ogetaddrinfo(host,serv,hint,res) \
   curl_dogetaddrinfo(host,serv,hint,res,__LINE__,__FILE__)
 #else
+#undef getaddrinfo
 #define getaddrinfo(host,serv,hint,res) \
   curl_dogetaddrinfo(host,serv,hint,res,__LINE__,__FILE__)
 #endif
+#undef getnameinfo
 #define getnameinfo(sa,salen,host,hostlen,serv,servlen,flags) \
   curl_dogetnameinfo(sa,salen,host,hostlen,serv,servlen,flags, __LINE__, \
   __FILE__)
+#undef freeaddrinfo
 #define freeaddrinfo(data) \
   curl_dofreeaddrinfo(data,__LINE__,__FILE__)
 
diff --git a/lib/ssluse.c b/lib/ssluse.c
index b2bb3bbe4..c0cf93664 100644
--- a/lib/ssluse.c
+++ b/lib/ssluse.c
@@ -1162,7 +1162,7 @@ Curl_ossl_connect(struct connectdata *conn,
 #ifdef SSL_CTRL_SET_MSG_CALLBACK
   if (data->set.fdebug) {
     if (!SSL_CTX_callback_ctrl(connssl->ctx, SSL_CTRL_SET_MSG_CALLBACK,
-                               ssl_tls_trace)) {
+                               (void (*)(void))ssl_tls_trace)) {
       failf(data, "SSL: couldn't set callback!");
       return CURLE_SSL_CONNECT_ERROR;
     }