summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/content_encoding.c13
-rw-r--r--lib/urldata.h12
-rw-r--r--lib/version.c12
3 files changed, 25 insertions, 12 deletions
diff --git a/lib/content_encoding.c b/lib/content_encoding.c
index 626bb8ec9..3d061375c 100644
--- a/lib/content_encoding.c
+++ b/lib/content_encoding.c
@@ -25,6 +25,19 @@
#include "urldata.h"
#include <curl/curl.h>
#include <stddef.h>
+
+#ifdef HAVE_ZLIB_H
+#include <zlib.h>
+#ifdef __SYMBIAN32__
+/* zlib pollutes the namespace with this definition */
+#undef WIN32
+#endif
+#endif
+
+#ifdef HAVE_BROTLI
+#include <brotli/decode.h>
+#endif
+
#include "sendf.h"
#include "http.h"
#include "content_encoding.h"
diff --git a/lib/urldata.h b/lib/urldata.h
index 7dfb26b6d..94f692223 100644
--- a/lib/urldata.h
+++ b/lib/urldata.h
@@ -88,18 +88,6 @@
#include "timeval.h"
-#ifdef HAVE_ZLIB_H
-#include <zlib.h> /* for content-encoding */
-#ifdef __SYMBIAN32__
-/* zlib pollutes the namespace with this definition */
-#undef WIN32
-#endif
-#endif
-
-#ifdef HAVE_BROTLI
-#include <brotli/decode.h>
-#endif
-
#include <curl/curl.h>
#include "http_chunks.h" /* for the structs and enum stuff */
diff --git a/lib/version.c b/lib/version.c
index 66c761e34..79cc0bba4 100644
--- a/lib/version.c
+++ b/lib/version.c
@@ -64,6 +64,18 @@
#define CURL_LIBSSH2_VERSION LIBSSH2_VERSION
#endif
+#ifdef HAVE_ZLIB_H
+#include <zlib.h>
+#ifdef __SYMBIAN32__
+/* zlib pollutes the namespace with this definition */
+#undef WIN32
+#endif
+#endif
+
+#ifdef HAVE_BROTLI
+#include <brotli/decode.h>
+#endif
+
void Curl_version_init(void);
/* For thread safety purposes this function is called by global_init so that