--- WWW-Curl-4.17/Curl.xs.fix	2021-09-29 19:53:42.965436393 +0200
+++ WWW-Curl-4.17/Curl.xs	2021-09-29 19:53:42.967436383 +0200
@@ -17,8 +17,12 @@
 #include <curl/curl.h>
 #include <curl/easy.h>
 #include <curl/multi.h>
 
+#if defined(__CURL_MULTI_H) && !defined(CURLINC_MULTI_H)
+#   define CURLINC_MULTI_H
+#endif
+
 #define header_callback_func writeheader_callback_func
 
 /* Do a favor for older perl versions */
 #ifndef Newxz
@@ -69,9 +73,9 @@ typedef struct {
 } perl_curl_form;
 
 
 typedef struct {
-#ifdef __CURL_MULTI_H
+#ifdef CURLINC_MULTI_H
     struct CURLM *curlm;
 #else
     void *curlm;
 #endif
@@ -233,9 +237,9 @@ static void perl_curl_form_delete(perl_c
 static perl_curl_multi * perl_curl_multi_new()
 {
     perl_curl_multi *self;
     Newz(1, self, 1, perl_curl_multi);
-#ifdef __CURL_MULTI_H
+#ifdef CURLINC_MULTI_H
     self->curlm=curl_multi_init();
 #else
     croak("curl version too old to support curl_multi_init()");
 #endif
@@ -244,9 +248,9 @@ static perl_curl_multi * perl_curl_multi
 
 /* delete the multi */
 static void perl_curl_multi_delete(perl_curl_multi *self)
 {
-#ifdef __CURL_MULTI_H
+#ifdef CURLINC_MULTI_H
     if (self->curlm) 
         curl_multi_cleanup(self->curlm);
     Safefree(self);
 #endif
@@ -1064,18 +1068,18 @@ void
 curl_multi_add_handle(curlm, curl)
     WWW::Curl::Multi curlm
     WWW::Curl::Easy curl
     CODE:
-#ifdef __CURL_MULTI_H
+#ifdef CURLINC_MULTI_H
         curl_multi_add_handle(curlm->curlm, curl->curl);
 #endif
 
 void
 curl_multi_remove_handle(curlm, curl)
     WWW::Curl::Multi curlm
     WWW::Curl::Easy curl
     CODE:
-#ifdef __CURL_MULTI_H
+#ifdef CURLINC_MULTI_H
         curl_multi_remove_handle(curlm->curlm, curl->curl);
 #endif
 
 void
@@ -1148,9 +1152,9 @@ curl_multi_perform(self)
     WWW::Curl::Multi self
     PREINIT:
         int remaining;
     CODE:
-#ifdef __CURL_MULTI_H
+#ifdef CURLINC_MULTI_H
         while(CURLM_CALL_MULTI_PERFORM ==
             curl_multi_perform(self->curlm, &remaining));
 	    RETVAL = remaining;
         /* while(remaining) {
--- WWW-Curl-4.17/Makefile.PL.fix	2021-09-29 19:53:42.967436383 +0200
+++ WWW-Curl-4.17/Makefile.PL	2021-09-29 19:54:41.412146443 +0200
@@ -127,9 +127,9 @@ if (!defined($curl_h)) {
     }
     close H;
 
     for my $e (sort @syms) {
-       if($e =~ /(OBSOLETE|^CURL_EXTERN|^CURL_STRICTER\z|_LAST\z|_LASTENTRY\z)/) {
+       if($e =~ /(OBSOLETE|^CURL_EXTERN|^CURL_WIN32\z|^CURLOPT\z|^CURL_STRICTER\z|^CURL_DID_MEMORY_FUNC_TYPEDEFS\z|_LAST\z|_LASTENTRY\z)/) {
           next;
        }
        my ($group) = $e =~ m/^([^_]+_)/;
        $constants{$group}->{$e} = $e;