diff --git a/meson.build b/meson.build
index f7a3f3ada2..f406d595e6 100644
--- a/meson.build
+++ b/meson.build
@@ -1074,6 +1074,7 @@ else
         libcurl = []
 endif
 conf.set10('HAVE_LIBCURL', have)
+conf.set10('CURL_NO_OLDIES', get_option('mode') == 'developer')
 
 want_libidn = get_option('libidn')
 want_libidn2 = get_option('libidn2')
diff --git a/src/import/curl-util.c b/src/import/curl-util.c
index bb81f97b09..f29d09d3aa 100644
--- a/src/import/curl-util.c
+++ b/src/import/curl-util.c
@@ -178,7 +178,7 @@ CurlGlue *curl_glue_unref(CurlGlue *g) {
 
 int curl_glue_new(CurlGlue **glue, sd_event *event) {
         _cleanup_(curl_glue_unrefp) CurlGlue *g = NULL;
-        _cleanup_(curl_multi_cleanupp) CURL *c = NULL;
+        _cleanup_(curl_multi_cleanupp) CURLM *c = NULL;
         _cleanup_(sd_event_unrefp) sd_event *e = NULL;
         int r;
 
diff --git a/src/import/curl-util.h b/src/import/curl-util.h
index f4a882d234..4ab52d73a4 100644
--- a/src/import/curl-util.h
+++ b/src/import/curl-util.h
@@ -35,5 +35,5 @@ int curl_header_strdup(const void *contents, size_t sz, const char *field, char
 int curl_parse_http_time(const char *t, usec_t *ret);
 
 DEFINE_TRIVIAL_CLEANUP_FUNC(CURL*, curl_easy_cleanup);
-DEFINE_TRIVIAL_CLEANUP_FUNC(CURL*, curl_multi_cleanup);
+DEFINE_TRIVIAL_CLEANUP_FUNC(CURLM*, curl_multi_cleanup);
 DEFINE_TRIVIAL_CLEANUP_FUNC(struct curl_slist*, curl_slist_free_all);