739 files changed, 4681 insertions, 2716 deletions

diff --git a/.gitignore b/.gitignore
index 9b040fea0..12240a533 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,22 +38,24 @@ config.log
 config.status
 config.sub
 configure
-curl-*.tar.bz2
-curl-*.tar.gz
-curl-*.tar.xz
-curl-*.zip
-curl-config
+gnurl-*.tar.bz2
+gnurl-*.tar.gz
+gnurl-*.tar.xz
+gnurl-*.zip
+gnurl-*.tar.Z
+gnurl-config
 depcomp
 install-sh
-libcurl.pc
+libgnurl.pc
 libtool
 ltmain.sh
 missing
 mkinstalldirs
 tags
 test-driver
-scripts/_curl
+scripts/_gnurl
 scripts/curl.fish
+\#*\#
 curl_fuzzer
 curl_fuzzer_seed_corpus.zip
 libstandaloneengine.a
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 000000000..08a256c4b
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,21 @@
+variables:
+
+stages:
+  - container
+  - build
+
+build-container:
+  stage: container
+  image: docker:dind
+  only:
+    - master
+  script:
+    - docker build -f ci-gnurl/Dockerfile -t gnurl .
+
+build-gnurl:
+  stage: build
+  image: gnurl:latest
+  only:
+    - master
+  script:
+    - ./buildconf ; ./configure ; make ; make -C tests test
diff --git a/CMakeLists.txt b/CMakeLists.txt
index edb1cec21..4c5d3518c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -49,7 +49,7 @@ project(CURL C)
 
 message(WARNING "the curl cmake build system is poorly maintained. Be aware")
 
-file(READ ${CURL_SOURCE_DIR}/include/curl/curlver.h CURL_VERSION_H_CONTENTS)
+file(READ ${CURL_SOURCE_DIR}/include/gnurl/curlver.h CURL_VERSION_H_CONTENTS)
 string(REGEX MATCH "#define LIBCURL_VERSION \"[^\"]*"
   CURL_VERSION ${CURL_VERSION_H_CONTENTS})
 string(REGEX REPLACE "[^\"]+\"" "" CURL_VERSION ${CURL_VERSION})
@@ -1298,7 +1298,7 @@ install(FILES "${CURL_BINARY_DIR}/libcurl.pc"
         DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
 
 # install headers
-install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/include/curl"
+install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/include/gnurl"
     DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
     FILES_MATCHING PATTERN "*.h")
 
diff --git a/GNURL-TODO b/GNURL-TODO
new file mode 100644
index 000000000..fecb0e12c
--- /dev/null
+++ b/GNURL-TODO
@@ -0,0 +1,12 @@
+* Make build crash with nghttp2
+* Same for libpsl
+* Output a message what's enforced now, so that everyone can catch up.
+* Write the sed to finalize adjustment of pages in doc/:
+  file named 'gnurl.1' should at least have the correct content, gnurl
+  1 instead of curl 1.
+* scripts/installcheck.sh,
+  tests/certs/scripts/genroot.sh,
+  tests/certs/scripts/genserv.sh,
+  tests/fuzz/download_fuzzer.sh: Check for bashisms, fix if necessary.
+  bash as invoked by /bin/sh works.
+* convert groff pages to mdoc.
diff --git a/MacOSX-Framework b/MacOSX-Framework
index e6badcde5..c0f91e6b9 100755
--- a/MacOSX-Framework
+++ b/MacOSX-Framework
@@ -19,7 +19,7 @@ PPC_NEEDED=0
 #desire compatibility with older versions then change USE_OLD to 1 :)
 USE_OLD=0
 
-VERSION=`/usr/bin/sed -ne 's/^#define LIBCURL_VERSION "\(.*\)"/\1/p' include/curl/curlver.h`
+VERSION=`/usr/bin/sed -ne 's/^#define LIBCURL_VERSION "\(.*\)"/\1/p' include/gnurl/curlver.h`
 FRAMEWORK_VERSION=Versions/Release-$VERSION
 
 #I also wanted to "copy over" the system, and thus the reason I added the
@@ -97,7 +97,7 @@ if test ! -z $SDK32; then
   install_name_tool -id @rpath/libcurl.framework/${FRAMEWORK_VERSION}/libcurl libcurl.framework/${FRAMEWORK_VERSION}/libcurl
   /usr/bin/sed -e "s/7\.12\.3/$VERSION/" lib/libcurl.plist >libcurl.framework/${FRAMEWORK_VERSION}/Resources/Info.plist
   mkdir -p libcurl.framework/${FRAMEWORK_VERSION}/Headers/curl
-  cp include/curl/*.h libcurl.framework/${FRAMEWORK_VERSION}/Headers/curl
+  cp include/gnurl/*.h libcurl.framework/${FRAMEWORK_VERSION}/Headers/curl
   pushd libcurl.framework
   ln -fs ${FRAMEWORK_VERSION}/libcurl libcurl
   ln -fs ${FRAMEWORK_VERSION}/Resources Resources
diff --git a/Makefile.am b/Makefile.am
index ac5eca3ba..bf685e1c2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -154,8 +154,8 @@ VC_DIST = projects/README                           \
 WINBUILD_DIST = winbuild/BUILD.WINDOWS.txt winbuild/gen_resp_file.bat \
  winbuild/MakefileBuild.vc winbuild/Makefile.vc
 
-EXTRA_DIST = CHANGES COPYING maketgz Makefile.dist curl-config.in \
- RELEASE-NOTES buildconf libcurl.pc.in MacOSX-Framework \
+EXTRA_DIST = CHANGES COPYING maketgz Makefile.dist gnurl-config.in \
+ RELEASE-NOTES buildconf libgnurl.pc.in MacOSX-Framework \
  scripts/updatemanpages.pl $(CMAKE_DIST) $(VC_DIST) $(WINBUILD_DIST) \
  lib/libcurl.vers.in buildconf.bat scripts/coverage.sh scripts/completion.pl
 
@@ -165,13 +165,13 @@ CLEANFILES = $(VC6_LIBDSP) $(VC6_SRCDSP) $(VC7_LIBVCPROJ) $(VC7_SRCVCPROJ) \
  $(VC11_LIBVCXPROJ) $(VC11_SRCVCXPROJ) $(VC12_LIBVCXPROJ) $(VC12_SRCVCXPROJ) \
  $(VC14_LIBVCXPROJ) $(VC14_SRCVCXPROJ) $(VC15_LIBVCXPROJ) $(VC15_SRCVCXPROJ)
 
-bin_SCRIPTS = curl-config
+bin_SCRIPTS = gnurl-config
 
 SUBDIRS = lib src
 DIST_SUBDIRS = $(SUBDIRS) tests packages scripts include docs
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libcurl.pc
+pkgconfig_DATA = libgnurl.pc
 
 # List of files required to generate VC IDE .dsp, .vcproj and .vcxproj files
 include lib/Makefile.inc
@@ -300,7 +300,7 @@ checksrc:
 	cd lib && $(MAKE) checksrc
 	cd src && $(MAKE) checksrc
 	cd tests && $(MAKE) checksrc
-	cd include/curl && $(MAKE) checksrc
+	cd include/gnurl && $(MAKE) checksrc
 	cd docs/examples && $(MAKE) checksrc
 
 .PHONY: vc-ide
diff --git a/README b/README
index f0b3b9393..f9440aa2a 100644
--- a/README
+++ b/README
@@ -1,3 +1,174 @@
+libgnurl is a fork of libcurl with the following major changes:
+
+Compilation requirements:
+* libgnurl must be compiled so that it supports only HTTP and HTTPS
+  (remove Gopher, SSH, IMAP, etc.)
+* libgnurl must be compiled so that it supports only GnuTLS
+  (remove CaySSL, QsoSSL, GSKit, etc.)
+* removed support for NTLM, GSSAPI, SPNEGO, LDAP, metalink, HTTP2
+* We recommend to build GnuTLS with DANE support, provided by 'unbound'.
+  This is optional.
+
+If you are a package maintainer: Do not enable the latest features
+curl likes to add, do not add libnghttp2 or libpsl support.
+
+Changes to the code:
+* renamed the library binary from 'libcurl' to 'lignurl'
+* renamed files to ensure a system-wide installation of
+  libgnurl does not result in namespace collisions with libcurl
+* adjustments to the testsuite to address the gnurl specific build
+* Changes to be written:
+  * Replace the release process with more automatization
+
+Usage notes:
+* exported symbols were NOT renamed, so they still all have the
+  curl prefix; you should be able to start using libgnurl simply
+  by changing -lcurl to -lgnurl.
+
+Note that the compilation requirements are still not fully
+hardcoded, but work on this is in progress since gnURL 7.56.1-2.
+If you compile libgnurl, please pass '--disable-ntlm-wb' to the
+configure script. So instead of just running
+
+  ./configure
+
+you will run
+
+  ./configure --disable-ntlm-wb
+
+Naturally, you're free to specify additional options, such as
+"--prefix".  Please keep in mind that you might have to pass
+"--with-ca-bundle=/etc/ssl/certs/ca-certificates.crt" or similar
+paths and options for gnurl to pick up certificates, just like
+curl.
+The result should have support only for HTTP, HTTPS (via
+GnuTLS), IDN, zlib and TLS-SRP. The output of the result from
+./gnurl --version should look like this:
+
+  curl 7.58.0-DEV (x86_64-unknown-linux-gnu) libcurl/7.58.0-DEV GnuTLS/3.5.13 zlib/1.2.11 libidn2/2.0.4
+  Release-Date: [unreleased]
+  Protocols: http https
+  Features: AsynchDNS IDN IPv6 Largefile NTLM NTLM_WB SSL libz TLS-SRP UnixSockets HTTPS-proxy
+
+In previous versions (gnURL < 7.56.1-2) we used to socially enforce
+the following configuration, which was almost never done right on
+system distribution side:
+
+  ./configure --enable-ipv6 --with-gnutls --without-libssh2 \
+  --without-libmetalink --without-winidn --without-librtmp \
+  --without-nghttp2 --without-nss --without-cyassl \
+  --without-polarssl --without-ssl --without-winssl \
+  --without-darwinssl --disable-sspi --disable-ntlm-wb --disable-ldap \
+  --disable-rtsp --disable-dict --disable-telnet --disable-tftp \
+  --disable-pop3 --disable-imap --disable-smtp --disable-gopher \
+  --disable-file --disable-ftp --disable-smb --disable-ares
+
+
+Motivation:
+
+cURL supports a bunch of crypto backends. GNUnet requires the use of
+GnuTLS, but other variants are used by some distributions. Supporting
+other crypto backends would again expose us to a wider array of
+security issues, may create licensing issues and most importantly
+introduce new bugs as some crypto backends are known to introduce
+subtle runtime issues. While it is possible to have two versions of
+libcurl installed on the same system, this is error-prone, especially
+as if we are linked against the wrong version, the bugs that arise
+might be rather subtle.
+
+For GNUnet, we also need a particularly modern version of
+GnuTLS. Thus, it would anyway be necessary to recompile cURL for
+GNUnet. But what happens if one links cURL against this version of
+GnuTLS? Well, first one would install GnuTLS by hand in the
+system. Then, we build cURL. cURL will build against it just fine, but
+the linker will eventually complain bitterly. The reason is that cURL
+also links against a bunch of other system libraries (gssapi, ldap,
+ssh2, rtmp, krb5, sasl2, see discussion on obscure protocols above),
+which --- as they are part of the distribution --- were linked against
+an older version of GnuTLS. As a result, the same binary would be
+linked against two different versions of GnuTLS. That is typically a
+recipe for disaster. Thus, in order to avoid updating a dozen system
+libraries (and having two versions of those installed), it is
+necessary to disable all of those cURL features that GNUnet does not
+use, and there are many of those. For GNUnet, the more obscure
+protocols supported by cURL are close to dead code --- mostly
+harmless, but not useful. However, as some application may use one of
+those features, distributions are typically forced to enable all of
+those features, and thus including security issues that might arise
+from that code.
+
+So to use a modern version of GnuTLS, a sane approach is to disable
+all of the "optional" features of cURL that drag in system libraries
+that link against the older GnuTLS. That works, except that one should
+then NEVER install that version of libcurl in say /usr or /usr/local,
+as that may break other parts of the system that might depend on these
+features that we just disabled. Libtool versioning doesn't help here,
+as it is not intended to deal with libraries that have optional
+features. Naturally, installing cURL somewhere else is also
+problematic, as we now need to be really careful that the linker will
+link GNUnet against the right version. Note that none of this can
+really be trivially fixed by the cURL developers.
+
+Rename to Fix
+At this point, developers that don't want to rebuild an entire
+distribution from scratch get grumpy. Grumpy developers do silly
+things, like forking code to fix it. I called the fork gnurl (to be
+pronounced with a grumpy voice and an emphasis on the R) as it is bits
+of cURL, a bit more GNUish, for GNUnet, and gnurl can be pronounced to
+indicate the grumpy origins.
+
+How does forking fix it? Easy. First, we can get rid of all of the
+compatibility issues --- if you use libgnurl, you state that you don't
+need anything but HTTP/HTTPS. Those applications that need more,
+should stick with the original cURL. Those that do not, can choose to
+move to something simpler. As the library gets a new name, we do not
+have to worry about tons of packages breaking as soon as one rebuilds
+it. So renaming itself and saying that "libgnurl = libcurl with only
+HTTP/HTTPS support and GnuTLS" fixes 99% of the problems that darkened
+my mood. Note that this pretty much CANNOT be done without a fork, as
+renaming is an essential part of the fix. Now, there might be creative
+solutions to achieve the same thing within the standard cURL build
+system, but I'm not happy to wait for a decade for Daniel to review
+the patches. The changes libgnurl makes to curl are miniscule and can
+easily be applied again and again whenever libcurl makes a new
+release.
+
+
+Summary:
+
+I want to note that the main motiviations for this fork are technical
+The goal of the cURL project is clearly to support many crypto
+backends and many protocols. That is a worthy goal, and I wish them
+luck with it. The goal for libgnurl is to support only HTTP and HTTPS
+(and only HTTP 1.x) with a single crypto backend (GnuTLS) to ensure a
+small footprint and uniform experience for developers regardless of
+how libcurl was compiled.
+
+
+Using libgnurl:
+
+Projects that use cURL only for HTTP/HTTPS and that would work with
+GnuTLS should be able to switch to libgnurl by changing "-lcurl" to
+"-lgnurl".  That's it.  No changes to the source code should be
+required.  Continue to read the cURL documentation --- as libgnurl
+strives for bug-for-bug compatibility with the HTTP/HTTPS/GnuTLS
+subset of cURL.  However, we're happy to add new features relating to
+this core subset and might be easier to convince than the cURL
+developers.
+
+THANKS:
+
+gnURL was started within the GNUnet developer community,
+initiated by Christian Grothoff, with contributions by
+Jeff Burdges and Florian Dold.
+Maintenance and development since 7.52.0 (released 2016-12-21)
+is done by ng0.
+The developers of gnURL express their thanks to the cURL
+developer community.
+
+Now, on to the cURL documentation...
+
+
                                   _   _ ____  _
                               ___| | | |  _ \| |
                              / __| | | | |_) | |
diff --git a/aux-gnurl/ReleaseProcess b/aux-gnurl/ReleaseProcess
new file mode 100644
index 000000000..91866ba43
--- /dev/null
+++ b/aux-gnurl/ReleaseProcess
@@ -0,0 +1,39 @@
+# May this be automated one day.
+
+git checkout master
+git pull upstream master
+git checkout -b gnurl-$new curl-$new
+git cherry-pick `git log gnurl-$old | head -n 1 | cut -c8-`
+git mergetool
+git cherry-pick --continue
+
+make clean
+make autoclean
+guix build -f gnurl-guix.scm
+
+# XXX: Fix the one remaining /gnu/store/… reference in shebang
+./buildconf
+./configure --enable-ipv6 --with-gnutls --without-libssh2 --without-libmetalink \ 
+--without-winidn --without-librtmp --without-nghttp2 --without-nss --without-cyassl \
+--without-polarssl --without-ssl --without-winssl --without-darwinssl --disable-sspi \
+--disable-ntlm-wb --disable-ldap --disable-rtsp --disable-dict --disable-telnet --disable-tftp \
+--disable-pop3 --disable-imap --disable-smtp --disable-gopher \
+--disable-file --disable-ftp --disable-smb
+make
+make test
+make distcheck
+make clean
+
+git push .....
+git diff HEAD^ HEAD > ../gnurl-$new.diff
+
+# XXX: The procedure below should be replaced by a fixed "make dist"!
+cp -a . ../gnurl-$new
+cd ..
+rm -rf gnurl-$new/.git
+tar cjf gnurl-$new.tar.bz2 gnurl-$new
+# XXX: Do .tar.xz and .zip releases as soon as drupal website is gone!
+rm -rf gnurl-$new
+gpg --local-user A88C8ADD129828D7EAC02E52E22F9BBFEE348588 --detach-sig gnurl-$new.tar.bz2
+# login and upload.
+
diff --git a/aux-gnurl/guix.scm b/aux-gnurl/guix.scm
new file mode 100644
index 000000000..eeb153031
--- /dev/null
+++ b/aux-gnurl/guix.scm
@@ -0,0 +1,111 @@
+;;; /***************************************************************************
+;;; *
+;;; *
+;;; * Copyright (C) 2016, 2017, 2018 Nils Gillmann <gillmann@gnunet.org>.
+;;; *
+;;; * This file is an appendum to gnURL, based on cURL/libcurl.
+;;; *
+;;; * This software is licensed as described in the file COPYING, which
+;;; * you should have received as part of this distribution. The terms
+;;; * are also available at https://curl.haxx.se/docs/copyright.html.
+;;; *
+;;; * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+;;; * copies of the Software, and permit persons to whom the Software is
+;;; * furnished to do so, under the terms of the COPYING file.
+;;; *
+;;; * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+;;; * KIND, either express or implied.
+;;; *
+;;; ***************************************************************************/
+
+
+(use-modules
+ (ice-9 popen)
+ (ice-9 match)
+ (ice-9 rdelim)
+ (srfi srfi-1)
+ (guix packages)
+ (guix build-system gnu)
+ (guix gexp)
+ (guix utils)
+ ((guix build utils) #:select (with-directory-excursion))
+ (gnu packages)
+ ;;(gnu packages base)
+ ((gnu packages autotools) #:select (autoconf automake libtool))
+ ((gnu packages python) #:select (python-2))
+ ((gnu packages tls) #:select (gnutls/dane))
+ ((gnu packages compression) #:select (zlib))
+ (gnu packages groff)
+ (gnu packages libidn)
+ ;;((ports lang perl5 perl5 perl5) #:select (perl))
+ (gnu packages perl)
+ ;;((ports devel openbsd-pkg-config openbsd-pkg-config) #:select (openbsd-pkg-config)))
+ (gnu packages pkg-config))
+
+(define %source-dir (dirname (current-filename)))
+
+(define-public gnurl-git
+  (package
+    (name "gnurl-git")
+    (version (string-append "7.61.1-" "dev"))
+    (source
+     (local-file %source-dir
+                 #:recursive? #t))
+    (inputs
+     `(("gnutls" ,gnutls/dane)
+       ("libidn2" ,libidn2)
+       ("zlib" ,zlib)))
+    (native-inputs
+     `(("autoconf" ,autoconf)
+       ("automake" ,automake)
+       ("libtool" ,libtool)
+       ("groff" ,groff)
+       ("perl" ,perl)
+       ("pkg-config" ,pkg-config)
+       ("python" ,python-2)))
+    (build-system gnu-build-system)
+    (outputs '("doc" "out"))
+    (arguments
+     ;;`(;#:configure-flags '("--enable-gnurl")
+     `(#:configure-flags '("--disable-ntlm-wb")
+       #:test-target "test"
+       #:parallel-tests? #f
+       #:phases
+       ;; We have to patch runtests.pl in tests/ directory
+       (modify-phases %standard-phases
+         (add-after 'unpack 'autoconf
+           (lambda _
+             (zero? (system* "sh" "buildconf"))))
+         (add-after 'install 'move-man3-pages
+           (lambda* (#:key outputs #:allow-other-keys)
+             ;; Move section 3 man pages to "doc".
+             (let ((out (assoc-ref outputs "out"))
+                   (doc (assoc-ref outputs "doc")))
+               (mkdir-p (string-append doc "/share/man"))
+               (rename-file (string-append out "/share/man/man3")
+                            (string-append doc "/share/man/man3"))
+               #t)))
+         (replace 'check
+           (lambda _
+             ;; It is unclear why test1026 fails, however the content of it
+             ;; suggests that it is not vital for gnurl.
+             ;;(delete-file "tests/data/test1026")
+
+             (substitute* "tests/runtests.pl"
+               (("/bin/sh") (which "sh")))
+
+             ;; Make test output more verbose.
+             (zero? (system* "make" "-C" "tests" "test"))
+             #t)))))
+    (description #f)
+    (synopsis #f)
+    (license #f)
+    (home-page #f)))
+           ;; (add-after 'build 'dist
+           ;;   (lambda _
+           ;;     (zero? (system* "maketgz" "7.56.0-dev"))))))))))
+           ;; (add-after 'check 'dist-check
+           ;;   (lambda _
+           ;;     (zero? (system* "make" "distcheck"))))))))))
+
+gnurl-git
diff --git a/aux-gnurl/man_lint.sh b/aux-gnurl/man_lint.sh
new file mode 100755
index 000000000..7adf1501e
--- /dev/null
+++ b/aux-gnurl/man_lint.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+# spit out ONLY error messages using groff.
+for f in `find 'docs/' -name \*\.[1-9]`;
+do
+    LC_ALL=en_US.UTF-8 \
+    MANROFFSEQ='' \
+    MANWIDTH=80 \
+    groff -m mandoc -b -z -w w $f;
+done
+# spit out ONLY error messages with mandoc:
+mandoc -T lint `find 'docs/' -name \*\.[1-9]`
diff --git a/aux-gnurl/sed.sh b/aux-gnurl/sed.sh
new file mode 100755
index 000000000..52c3150c7
--- /dev/null
+++ b/aux-gnurl/sed.sh
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+S=$HOME/src/gnunet/gnurl-releases/gnurl
+
+# /
+# find . -not -iwholename '*.git*' -not -iwholename '*sed.sh*' -type f -print0 | xargs -0 sed -i 's/<curl\/curl.h>/<gnurl\/curl.h>/g'
+find . ! -path '*.git/*' ! -path '*sed.sh*' -type f -print0 | xargs -0 sed -i 's/<curl\/curl.h>/<gnurl\/curl.h>/g'
+echo "'curl/curl.h' -> 'gnurl/curl.h' ... [DONE]"
+
+# docs/
+cd $S/docs
+# find . -not -iwholename '*.git*' -not -iwholename '*sed.sh*' -type f -print0 | xargs -0 sed -i 's/TH curl_/TH gnurl_/g'
+find . ! -path '*.git/*' ! -path '*sed.sh*' -type f -print0 | xargs -0 sed -i 's/TH curl_/TH gnurl_/g'
+echo "'TH curl_' -> 'TH gnurl_' ... [DONE]"
+
+# find . -not -iwholename '*.git*' -not -iwholename '*sed.sh*' -type f -print0 | xargs -0 sed -i 's/libcurl Manual/libgnurl Manual/g'
+find . ! -path '*.git/*' ! -path '*sed.sh*' -type f -print0 | xargs -0 sed -i 's/libcurl Manual/libgnurl Manual/g'
+echo "'libcurl Manual' -> 'libgnurl Manual' ... [DONE]"
+
+# find . -not -iwholename '*.git*' -not -iwholename '*sed.sh*' -type f -print0 | xargs -0 sed -i 's/man3\/curl/man3\/gnurl/g'
+find . ! -path '*.git/*' ! -path '*sed.sh*' -type f -print0 | xargs -0 sed -i 's/man3\/curl/man3\/gnurl/g'
+echo "'man3/curl' -> 'man3/gnurl' ... [DONE]"
+
+# TODO: groff -> mdoc
+# find . ! -path '*.git/*' ! -path '*sed.sh*' -type f -print0 | xargs -0 sed -i 's/.SH/.Sh/g'
+
+cd $S
diff --git a/buildconf b/buildconf
index 509575312..f6460dad9 100755
--- a/buildconf
+++ b/buildconf
@@ -83,7 +83,7 @@ removethis(){
 if test ! -f configure.ac ||
   test ! -f src/tool_main.c ||
   test ! -f lib/urldata.h ||
-  test ! -f include/curl/curl.h ||
+  test ! -f include/gnurl/curl.h ||
   test ! -f m4/curl-functions.m4; then
   echo "Can not run buildconf from outside of curl's source subdirectory!"
   echo "Change to the subdirectory where buildconf is found, and try again."
@@ -266,7 +266,9 @@ else
   else
     echo "buildconf: m4 version $m4 found. You need a GNU m4 installed!"
   fi
-  exit 1
+  # Early testing on NetBSD 8.0 showed that the hard failure here is
+  # overkill, at least for gnurl.
+  # exit 1
 fi
 
 #--------------------------------------------------------------------------
@@ -305,7 +307,7 @@ for fname in .deps \
     config.sub \
     configure \
     configurehelp.pm \
-    curl-config \
+    gnurl-config \
     depcomp \
     libcares.pc \
     libcurl.pc \
diff --git a/ci-gnurl/Dockerfile b/ci-gnurl/Dockerfile
new file mode 100644
index 000000000..3c983213c
--- /dev/null
+++ b/ci-gnurl/Dockerfile
@@ -0,0 +1,8 @@
+from debian:stretch
+
+# Install build tools
+RUN apt-get update && apt-get install -y git make automake autopoint autoconf
+
+# We need at least gnutls-dane-3.5.13 groff-1.22.3 libidn-1.33 libtool-2.4.6 perl-5.26.0 pkg-config-0.29.2 python-2.7.13 zlib-1.2.11
+# at least that's my Guix package building.
+RUN apt-get update && apt-get install -y libltdl-dev libidn11-dev libgnutls28-dev perl pkg-config groff python2.7 python2.7-dev
diff --git a/configure-gnurl b/configure-gnurl
new file mode 100755
index 000000000..b6f841827
--- /dev/null
+++ b/configure-gnurl
@@ -0,0 +1,14 @@
+#!/bin/sh
+# intermediate solution until I have written a --enable-gnurl
+# or something similar to be passed to 'configure'.
+./configure --enable-ipv6 --with-gnutls --without-libssh2 \
+            --without-libmetalink --without-winidn \
+            --without-librtmp --without-nghttp2 \
+            --without-nss --without-cyassl \
+            --without-polarssl --without-ssl \
+            --without-winssl --without-darwinssl \
+            --disable-sspi --disable-ntlm-wb \
+            --disable-ldap --disable-rtsp --disable-dict \
+            --disable-telnet --disable-tftp --disable-pop3 \
+            --disable-imap --disable-smtp --disable-gopher \
+            --disable-file --disable-ftp --disable-smb
diff --git a/configure.ac b/configure.ac
index 6d5ec2c0f..faf2b2129 100755
--- a/configure.ac
+++ b/configure.ac
@@ -24,7 +24,7 @@ dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.57)
 
 dnl We don't know the version number "statically" so we use a dash here
-AC_INIT([curl], [-], [a suitable curl mailing list: https://curl.haxx.se/mail/])
+AC_INIT([gnurl], [-], [a suitable curl mailing list: https://curl.haxx.se/mail/])
 
 XC_OVR_ZZ50
 XC_OVR_ZZ60
@@ -128,7 +128,7 @@ AC_SUBST([AR])
 AC_SUBST(libext)
 
 dnl figure out the libcurl version
-CURLVERSION=`$SED -ne 's/^#define LIBCURL_VERSION "\(.*\)".*/\1/p' ${srcdir}/include/curl/curlver.h`
+CURLVERSION=`$SED -ne 's/^#define LIBCURL_VERSION "\(.*\)".*/\1/p' ${srcdir}/include/gnurl/curlver.h`
 XC_CHECK_PROG_CC
 
 dnl for --enable-code-coverage
@@ -142,7 +142,7 @@ AC_SUBST(CURLVERSION)
 
 dnl
 dnl we extract the numerical version for curl-config only
-VERSIONNUM=`$SED -ne 's/^#define LIBCURL_VERSION_NUM 0x\([0-9A-Fa-f]*\).*/\1/p' ${srcdir}/include/curl/curlver.h`
+VERSIONNUM=`$SED -ne 's/^#define LIBCURL_VERSION_NUM 0x\([0-9A-Fa-f]*\).*/\1/p' ${srcdir}/include/gnurl/curlver.h`
 AC_SUBST(VERSIONNUM)
 
 dnl Solaris pkgadd support definitions
@@ -374,15 +374,6 @@ AC_ARG_ENABLE(http,
 AC_HELP_STRING([--enable-http],[Enable HTTP support])
 AC_HELP_STRING([--disable-http],[Disable HTTP support]),
 [ case "$enableval" in
-  no)
-       AC_MSG_RESULT(no)
-       AC_DEFINE(CURL_DISABLE_HTTP, 1, [to disable HTTP])
-       disable_http="yes"
-       AC_MSG_WARN([disable HTTP disables FTP over proxy and RTSP])
-       AC_SUBST(CURL_DISABLE_HTTP, [1])
-       AC_DEFINE(CURL_DISABLE_RTSP, 1, [to disable RTSP])
-       AC_SUBST(CURL_DISABLE_RTSP, [1])
-       ;;
   *)   AC_MSG_RESULT(yes)
        ;;
   esac ],
@@ -393,46 +384,46 @@ AC_ARG_ENABLE(ftp,
 AC_HELP_STRING([--enable-ftp],[Enable FTP support])
 AC_HELP_STRING([--disable-ftp],[Disable FTP support]),
 [ case "$enableval" in
-  no)
+  *)
        AC_MSG_RESULT(no)
        AC_DEFINE(CURL_DISABLE_FTP, 1, [to disable FTP])
        AC_SUBST(CURL_DISABLE_FTP, [1])
        ;;
-  *)   AC_MSG_RESULT(yes)
-       ;;
   esac ],
-       AC_MSG_RESULT(yes)
+       AC_MSG_RESULT(no)
+       AC_DEFINE(CURL_DISABLE_FTP, 1, [to disable FTP])
+       AC_SUBST(CURL_DISABLE_FTP, [1])
 )
 AC_MSG_CHECKING([whether to support file])
 AC_ARG_ENABLE(file,
 AC_HELP_STRING([--enable-file],[Enable FILE support])
 AC_HELP_STRING([--disable-file],[Disable FILE support]),
 [ case "$enableval" in
-  no)
+  *)
        AC_MSG_RESULT(no)
        AC_DEFINE(CURL_DISABLE_FILE, 1, [to disable FILE])
        AC_SUBST(CURL_DISABLE_FILE, [1])
        ;;
-  *)   AC_MSG_RESULT(yes)
-       ;;
   esac ],
-       AC_MSG_RESULT(yes)
+       AC_MSG_RESULT(no)
+       AC_DEFINE(CURL_DISABLE_FILE, 1, [to disable FILE])
+       AC_SUBST(CURL_DISABLE_FILE, [1])
 )
 AC_MSG_CHECKING([whether to support ldap])
 AC_ARG_ENABLE(ldap,
 AC_HELP_STRING([--enable-ldap],[Enable LDAP support])
 AC_HELP_STRING([--disable-ldap],[Disable LDAP support]),
 [ case "$enableval" in
-  no)
+  *)
        AC_MSG_RESULT(no)
        AC_DEFINE(CURL_DISABLE_LDAP, 1, [to disable LDAP])
        AC_SUBST(CURL_DISABLE_LDAP, [1])
        ;;
-  *)
-       AC_MSG_RESULT(yes)
-       ;;
   esac ],[
-       AC_MSG_RESULT(yes) ]
+       AC_MSG_RESULT(no)
+       AC_DEFINE(CURL_DISABLE_LDAP, 1, [to disable LDAP])
+       AC_SUBST(CURL_DISABLE_LDAP, [1])
+       ]
 )
 AC_MSG_CHECKING([whether to support ldaps])
 AC_ARG_ENABLE(ldaps,
@@ -479,14 +470,16 @@ AC_HELP_STRING([--disable-rtsp],[Disable RTSP support]),
   *)   if test x$CURL_DISABLE_HTTP = x1 ; then
           AC_MSG_ERROR(HTTP support needs to be enabled in order to enable RTSP support!)
        else
-          AC_MSG_RESULT(yes)
-          curl_rtsp_msg="enabled"
+          AC_MSG_RESULT(no)
+          AC_DEFINE(CURL_DISABLE_RTSP, 1, [to disable RTSP])
+          AC_SUBST(CURL_DISABLE_RTSP, [1])
        fi
        ;;
   esac ],
        if test "x$CURL_DISABLE_HTTP" != "x1"; then
-          AC_MSG_RESULT(yes)
-          curl_rtsp_msg="enabled"
+          AC_MSG_RESULT(no)
+          AC_DEFINE(CURL_DISABLE_RTSP, 1, [to disable RTSP])
+          AC_SUBST(CURL_DISABLE_RTSP, [1])
        else
           AC_MSG_RESULT(no)
        fi
@@ -513,45 +506,45 @@ AC_ARG_ENABLE(dict,
 AC_HELP_STRING([--enable-dict],[Enable DICT support])
 AC_HELP_STRING([--disable-dict],[Disable DICT support]),
 [ case "$enableval" in
-  no)
+  *)
        AC_MSG_RESULT(no)
        AC_DEFINE(CURL_DISABLE_DICT, 1, [to disable DICT])
        AC_SUBST(CURL_DISABLE_DICT, [1])
        ;;
-  *)   AC_MSG_RESULT(yes)
-       ;;
   esac ],
-       AC_MSG_RESULT(yes)
+       AC_MSG_RESULT(no)
+       AC_DEFINE(CURL_DISABLE_DICT, 1, [to disable DICT])
+       AC_SUBST(CURL_DISABLE_DICT, [1])
 )
 AC_MSG_CHECKING([whether to support telnet])
 AC_ARG_ENABLE(telnet,
 AC_HELP_STRING([--enable-telnet],[Enable TELNET support])
 AC_HELP_STRING([--disable-telnet],[Disable TELNET support]),
 [ case "$enableval" in
-  no)
+  *)
        AC_MSG_RESULT(no)
        AC_DEFINE(CURL_DISABLE_TELNET, 1, [to disable TELNET])
        AC_SUBST(CURL_DISABLE_TELNET, [1])
        ;;
-  *)   AC_MSG_RESULT(yes)
-       ;;
   esac ],
-       AC_MSG_RESULT(yes)
+       AC_MSG_RESULT(no)
+       AC_DEFINE(CURL_DISABLE_TELNET, 1, [to disable TELNET])
+       AC_SUBST(CURL_DISABLE_TELNET, [1])
 )
 AC_MSG_CHECKING([whether to support tftp])
 AC_ARG_ENABLE(tftp,
 AC_HELP_STRING([--enable-tftp],[Enable TFTP support])
 AC_HELP_STRING([--disable-tftp],[Disable TFTP support]),
 [ case "$enableval" in
-  no)
+  *)
        AC_MSG_RESULT(no)
        AC_DEFINE(CURL_DISABLE_TFTP, 1, [to disable TFTP])
        AC_SUBST(CURL_DISABLE_TFTP, [1])
        ;;
-  *)   AC_MSG_RESULT(yes)
-       ;;
   esac ],
-       AC_MSG_RESULT(yes)
+       AC_MSG_RESULT(no)
+       AC_DEFINE(CURL_DISABLE_TFTP, 1, [to disable TFTP])
+       AC_SUBST(CURL_DISABLE_TFTP, [1])
 )
 
 AC_MSG_CHECKING([whether to support pop3])
@@ -559,15 +552,15 @@ AC_ARG_ENABLE(pop3,
 AC_HELP_STRING([--enable-pop3],[Enable POP3 support])
 AC_HELP_STRING([--disable-pop3],[Disable POP3 support]),
 [ case "$enableval" in
-  no)
+  *)
        AC_MSG_RESULT(no)
        AC_DEFINE(CURL_DISABLE_POP3, 1, [to disable POP3])
        AC_SUBST(CURL_DISABLE_POP3, [1])
        ;;
-  *)   AC_MSG_RESULT(yes)
-       ;;
   esac ],
-       AC_MSG_RESULT(yes)
+       AC_MSG_RESULT(no)
+       AC_DEFINE(CURL_DISABLE_POP3, 1, [to disable POP3])
+       AC_SUBST(CURL_DISABLE_POP3, [1])
 )
 
 
@@ -576,15 +569,15 @@ AC_ARG_ENABLE(imap,
 AC_HELP_STRING([--enable-imap],[Enable IMAP support])
 AC_HELP_STRING([--disable-imap],[Disable IMAP support]),
 [ case "$enableval" in
-  no)
+  *)
        AC_MSG_RESULT(no)
        AC_DEFINE(CURL_DISABLE_IMAP, 1, [to disable IMAP])
        AC_SUBST(CURL_DISABLE_IMAP, [1])
        ;;
-  *)   AC_MSG_RESULT(yes)
-       ;;
   esac ],
-       AC_MSG_RESULT(yes)
+       AC_MSG_RESULT(no)
+       AC_DEFINE(CURL_DISABLE_IMAP, 1, [to disable IMAP])
+       AC_SUBST(CURL_DISABLE_IMAP, [1])
 )
 
 
@@ -593,15 +586,15 @@ AC_ARG_ENABLE(smb,
 AC_HELP_STRING([--enable-smb],[Enable SMB/CIFS support])
 AC_HELP_STRING([--disable-smb],[Disable SMB/CIFS support]),
 [ case "$enableval" in
-  no)
+  *)
        AC_MSG_RESULT(no)
        AC_DEFINE(CURL_DISABLE_SMB, 1, [to disable SMB/CIFS])
        AC_SUBST(CURL_DISABLE_SMB, [1])
        ;;
-  *)   AC_MSG_RESULT(yes)
-       ;;
   esac ],
-       AC_MSG_RESULT(yes)
+       AC_MSG_RESULT(no)
+       AC_DEFINE(CURL_DISABLE_SMB, 1, [to disable SMB/CIFS])
+       AC_SUBST(CURL_DISABLE_SMB, [1])
 )
 
 AC_MSG_CHECKING([whether to support smtp])
@@ -609,15 +602,15 @@ AC_ARG_ENABLE(smtp,
 AC_HELP_STRING([--enable-smtp],[Enable SMTP support])
 AC_HELP_STRING([--disable-smtp],[Disable SMTP support]),
 [ case "$enableval" in
-  no)
+  *)
        AC_MSG_RESULT(no)
        AC_DEFINE(CURL_DISABLE_SMTP, 1, [to disable SMTP])
        AC_SUBST(CURL_DISABLE_SMTP, [1])
        ;;
-  *)   AC_MSG_RESULT(yes)
-       ;;
   esac ],
-       AC_MSG_RESULT(yes)
+       AC_MSG_RESULT(no)
+       AC_DEFINE(CURL_DISABLE_SMTP, 1, [to disable SMTP])
+       AC_SUBST(CURL_DISABLE_SMTP, [1])
 )
 
 AC_MSG_CHECKING([whether to support gopher])
@@ -625,15 +618,15 @@ AC_ARG_ENABLE(gopher,
 AC_HELP_STRING([--enable-gopher],[Enable Gopher support])
 AC_HELP_STRING([--disable-gopher],[Disable Gopher support]),
 [ case "$enableval" in
-  no)
+  *)
        AC_MSG_RESULT(no)
        AC_DEFINE(CURL_DISABLE_GOPHER, 1, [to disable Gopher])
        AC_SUBST(CURL_DISABLE_GOPHER, [1])
        ;;
-  *)   AC_MSG_RESULT(yes)
-       ;;
   esac ],
-       AC_MSG_RESULT(yes)
+       AC_MSG_RESULT(no)
+       AC_DEFINE(CURL_DISABLE_GOPHER, 1, [to disable Gopher])
+       AC_SUBST(CURL_DISABLE_GOPHER, [1])
 )
 
 
@@ -1288,7 +1281,7 @@ dnl **********************************************************************
 dnl Check for GSS-API libraries
 dnl **********************************************************************
 
-dnl check for GSS-API stuff in the /usr as default
+dnl check for GSS-API stuff in the /usr as default. Note: possible candidate for removal.
 
 GSSAPI_ROOT="/usr"
 AC_ARG_WITH(gssapi-includes,
@@ -1329,7 +1322,7 @@ if test x"$want_gss" = xyes; then
      if test -n "$host_alias" -a -f "$GSSAPI_ROOT/bin/$host_alias-krb5-config"; then
         GSSAPI_INCS=`$GSSAPI_ROOT/bin/$host_alias-krb5-config --cflags gssapi`
      elif test -f "$KRB5CONFIG"; then
-        GSSAPI_INCS=`$KRB5CONFIG --cflags gssapi`
+          GSSAPI_INCS=`$KRB5CONFIG --cflags gssapi`
      elif test "$GSSAPI_ROOT" != "yes"; then
         GSSAPI_INCS="-I$GSSAPI_ROOT/include"
      fi
@@ -1447,10 +1440,10 @@ if test x"$want_gss" = xyes; then
      LDFLAGS="$LDFLAGS $GSSAPI_LIB_DIR"
      case $host in
      *-hp-hpux*)
-        LIBS="-lgss $LIBS"
+        LIBS="lgss $LIBS"
         ;;
      *)
-        LIBS="-lgssapi $LIBS"
+        LIBS="-lgssapi -lkrb5 $LIBS"
         ;;
      esac
   fi
@@ -1498,70 +1491,6 @@ dnl check winssl option before other SSL libraries
 dnl -------------------------------------------------
 
 OPT_WINSSL=no
-AC_ARG_WITH(winssl,dnl
-AC_HELP_STRING([--with-winssl],[enable Windows native SSL/TLS])
-AC_HELP_STRING([--without-winssl], [disable Windows native SSL/TLS]),
-  OPT_WINSSL=$withval)
-
-AC_ARG_WITH(schannel,dnl
-AC_HELP_STRING([--with-schannel],[enable Windows native SSL/TLS])
-AC_HELP_STRING([--without-schannel], [disable Windows native SSL/TLS]),
-  OPT_WINSSL=$withval)
-
-AC_MSG_CHECKING([whether to enable Windows native SSL/TLS (Windows native builds only)])
-if test -z "$ssl_backends" -o "x$OPT_WINSSL" != xno; then
-  ssl_msg=
-  if test "x$OPT_WINSSL" != "xno"  &&
-     test "x$curl_cv_native_windows" = "xyes"; then
-    AC_MSG_RESULT(yes)
-    AC_DEFINE(USE_SCHANNEL, 1, [to enable Windows native SSL/TLS support])
-    AC_SUBST(USE_SCHANNEL, [1])
-    ssl_msg="Windows-native"
-    test schannel != "$DEFAULT_SSL_BACKEND" || VALID_DEFAULT_SSL_BACKEND=yes
-    WINSSL_ENABLED=1
-    # --with-winssl implies --enable-sspi
-    AC_DEFINE(USE_WINDOWS_SSPI, 1, [to enable SSPI support])
-    AC_SUBST(USE_WINDOWS_SSPI, [1])
-    curl_sspi_msg="enabled"
-    LIBS="-lcrypt32 $LIBS"
-  else
-    AC_MSG_RESULT(no)
-  fi
-  test -z "$ssl_msg" || ssl_backends="${ssl_backends:+$ssl_backends, }$ssl_msg"
-else
-  AC_MSG_RESULT(no)
-fi
-
-OPT_SECURETRANSPORT=no
-AC_ARG_WITH(darwinssl,dnl
-AC_HELP_STRING([--with-darwinssl],[enable Apple OS native SSL/TLS])
-AC_HELP_STRING([--without-darwinssl], [disable Apple OS native SSL/TLS]),
-  OPT_SECURETRANSPORT=$withval)
-
-AC_ARG_WITH(secure-transport,dnl
-AC_HELP_STRING([--with-secure-transport],[enable Apple OS native SSL/TLS])
-AC_HELP_STRING([--without-secure-transport], [disable Apple OS native SSL/TLS]),
-  OPT_SECURETRANSPORT=$withval)
-
-AC_MSG_CHECKING([whether to enable Secure Transport])
-if test -z "$ssl_backends" -o "x$OPT_SECURETRANSPORT" != xno; then
-  if test "x$OPT_SECURETRANSPORT" != "xno" &&
-     test -d "/System/Library/Frameworks/Security.framework"; then
-    AC_MSG_RESULT(yes)
-    AC_DEFINE(USE_SECTRANSP, 1, [enable Secure Transport])
-    AC_SUBST(USE_SECTRANSP, [1])
-    ssl_msg="Secure Transport"
-    test secure-transport != "$DEFAULT_SSL_BACKEND" || VALID_DEFAULT_SSL_BACKEND=yes
-    SECURETRANSPORT_ENABLED=1
-    LDFLAGS="$LDFLAGS -framework CoreFoundation -framework Security"
-  else
-    AC_MSG_RESULT(no)
-  fi
-  test -z "$ssl_msg" || ssl_backends="${ssl_backends:+$ssl_backends, }$ssl_msg"
-else
-  AC_MSG_RESULT(no)
-fi
-
 OPT_AMISSL=no
 AC_ARG_WITH(amissl,dnl
 AC_HELP_STRING([--with-amissl],[enable Amiga native SSL/TLS (AmiSSL)])
@@ -1599,295 +1528,6 @@ dnl Default to compiler & linker defaults for SSL files & libraries.
 OPT_SSL=off
 dnl Default to no CA bundle
 ca="no"
-AC_ARG_WITH(ssl,dnl
-AC_HELP_STRING([--with-ssl=PATH],[Where to look for OpenSSL, PATH points to the SSL installation (default: /usr/local/ssl); when possible, set the PKG_CONFIG_PATH environment variable instead of using this option])
-AC_HELP_STRING([--without-ssl], [disable OpenSSL]),
-  OPT_SSL=$withval)
-
-if test -z "$ssl_backends" -o "x$OPT_SSL" != xno &&
-   test X"$OPT_SSL" != Xno; then
-  ssl_msg=
-
-  dnl backup the pre-ssl variables
-  CLEANLDFLAGS="$LDFLAGS"
-  CLEANCPPFLAGS="$CPPFLAGS"
-  CLEANLIBS="$LIBS"
-
-  dnl This is for Msys/Mingw
-  case $host in
-    *-*-msys* | *-*-mingw*)
-      AC_MSG_CHECKING([for gdi32])
-      my_ac_save_LIBS=$LIBS
-      LIBS="-lgdi32 $LIBS"
-      AC_TRY_LINK([#include <windef.h>
-                   #include <wingdi.h>],
-                   [GdiFlush();],
-                   [ dnl worked!
-                   AC_MSG_RESULT([yes])],
-                   [ dnl failed, restore LIBS
-                   LIBS=$my_ac_save_LIBS
-                   AC_MSG_RESULT(no)]
-                  )
-      ;;
-  esac
-
-  case "$OPT_SSL" in
-  yes)
-    dnl --with-ssl (without path) used
-    if test x$cross_compiling != xyes; then
-      dnl only do pkg-config magic when not cross-compiling
-      PKGTEST="yes"
-    fi
-    PREFIX_OPENSSL=/usr/local/ssl
-    LIB_OPENSSL="$PREFIX_OPENSSL/lib$libsuff"
-    ;;
-  off)
-    dnl no --with-ssl option given, just check default places
-    if test x$cross_compiling != xyes; then
-      dnl only do pkg-config magic when not cross-compiling
-      PKGTEST="yes"
-    fi
-    PREFIX_OPENSSL=
-    ;;
-  *)
-    dnl check the given --with-ssl spot
-    PKGTEST="no"
-    PREFIX_OPENSSL=$OPT_SSL
-
-    dnl Try pkg-config even when cross-compiling.  Since we
-    dnl specify PKG_CONFIG_LIBDIR we're only looking where
-    dnl the user told us to look
-    OPENSSL_PCDIR="$OPT_SSL/lib/pkgconfig"
-    if test -f "$OPENSSL_PCDIR/openssl.pc"; then
-      AC_MSG_NOTICE([PKG_CONFIG_LIBDIR will be set to "$OPENSSL_PCDIR"])
-      PKGTEST="yes"
-    elif test ! -f "$PREFIX_OPENSSL/include/openssl/ssl.h"; then
-      AC_MSG_ERROR([$PREFIX_OPENSSL is a bad --with-ssl prefix!])
-    fi
-
-    dnl in case pkg-config comes up empty, use what we got
-    dnl via --with-ssl
-    LIB_OPENSSL="$PREFIX_OPENSSL/lib$libsuff"
-    if test "$PREFIX_OPENSSL" != "/usr" ; then
-      SSL_LDFLAGS="-L$LIB_OPENSSL"
-      SSL_CPPFLAGS="-I$PREFIX_OPENSSL/include"
-    fi
-    SSL_CPPFLAGS="$SSL_CPPFLAGS -I$PREFIX_OPENSSL/include/openssl"
-    ;;
-  esac
-
-  if test "$PKGTEST" = "yes"; then
-
-    CURL_CHECK_PKGCONFIG(openssl, [$OPENSSL_PCDIR])
-
-    if test "$PKGCONFIG" != "no" ; then
-      SSL_LIBS=`CURL_EXPORT_PCDIR([$OPENSSL_PCDIR]) dnl
-        $PKGCONFIG --libs-only-l --libs-only-other openssl 2>/dev/null`
-
-      SSL_LDFLAGS=`CURL_EXPORT_PCDIR([$OPENSSL_PCDIR]) dnl
-        $PKGCONFIG --libs-only-L openssl 2>/dev/null`
-
-      SSL_CPPFLAGS=`CURL_EXPORT_PCDIR([$OPENSSL_PCDIR]) dnl
-        $PKGCONFIG --cflags-only-I openssl 2>/dev/null`
-
-      AC_SUBST(SSL_LIBS)
-      AC_MSG_NOTICE([pkg-config: SSL_LIBS: "$SSL_LIBS"])
-      AC_MSG_NOTICE([pkg-config: SSL_LDFLAGS: "$SSL_LDFLAGS"])
-      AC_MSG_NOTICE([pkg-config: SSL_CPPFLAGS: "$SSL_CPPFLAGS"])
-
-      LIB_OPENSSL=`echo $SSL_LDFLAGS | sed -e 's/-L//g'`
-
-      dnl use the values pkg-config reported.  This is here
-      dnl instead of below with CPPFLAGS and LDFLAGS because we only
-      dnl learn about this via pkg-config.  If we only have
-      dnl the argument to --with-ssl we don't know what
-      dnl additional libs may be necessary.  Hope that we
-      dnl don't need any.
-      LIBS="$SSL_LIBS $LIBS"
-    fi
-  fi
-
-  dnl finally, set flags to use SSL
-  CPPFLAGS="$CPPFLAGS $SSL_CPPFLAGS"
-  LDFLAGS="$LDFLAGS $SSL_LDFLAGS"
-
-  AC_CHECK_LIB(crypto, HMAC_Update,[
-     HAVECRYPTO="yes"
-     LIBS="-lcrypto $LIBS"
-     ],[
-     LDFLAGS="$CLEANLDFLAGS -L$LIB_OPENSSL"
-     if test "$PKGCONFIG" = "no" ; then
-       # only set this if pkg-config wasn't used
-       CPPFLAGS="$CLEANCPPFLAGS -I$PREFIX_OPENSSL/include/openssl -I$PREFIX_OPENSSL/include"
-     fi
-     AC_CHECK_LIB(crypto, HMAC_Init_ex,[
-       HAVECRYPTO="yes"
-       LIBS="-lcrypto $LIBS"], [
-
-       dnl still no, but what about with -ldl?
-       AC_MSG_CHECKING([OpenSSL linking with -ldl])
-       LIBS="$CLEANLIBS -lcrypto -ldl"
-       AC_TRY_LINK(
-       [
-         #include <openssl/err.h>
-       ],
-       [
-         ERR_clear_error();
-       ],
-       [
-         AC_MSG_RESULT(yes)
-         HAVECRYPTO="yes"
-       ],
-       [
-         AC_MSG_RESULT(no)
-         dnl ok, so what about both -ldl and -lpthread?
-
-         AC_MSG_CHECKING([OpenSSL linking with -ldl and -lpthread])
-         LIBS="$CLEANLIBS -lcrypto -ldl -lpthread"
-         AC_TRY_LINK(
-         [
-           #include <openssl/err.h>
-         ],
-         [
-           ERR_clear_error();
-         ],
-         [
-           AC_MSG_RESULT(yes)
-           HAVECRYPTO="yes"
-         ],
-         [
-           AC_MSG_RESULT(no)
-           LDFLAGS="$CLEANLDFLAGS"
-           CPPFLAGS="$CLEANCPPFLAGS"
-           LIBS="$CLEANLIBS"
-
-         ])
-
-       ])
-
-     ])
-  ])
-
-  if test X"$HAVECRYPTO" = X"yes"; then
-    dnl This is only reasonable to do if crypto actually is there: check for
-    dnl SSL libs NOTE: it is important to do this AFTER the crypto lib
-
-    AC_CHECK_LIB(ssl, SSL_connect)
-
-    if test "$ac_cv_lib_ssl_SSL_connect" != yes; then
-        dnl we didn't find the SSL lib, try the RSAglue/rsaref stuff
-        AC_MSG_CHECKING(for ssl with RSAglue/rsaref libs in use);
-        OLIBS=$LIBS
-        LIBS="-lRSAglue -lrsaref $LIBS"
-        AC_CHECK_LIB(ssl, SSL_connect)
-        if test "$ac_cv_lib_ssl_SSL_connect" != yes; then
-            dnl still no SSL_connect
-            AC_MSG_RESULT(no)
-            LIBS=$OLIBS
-        else
-            AC_MSG_RESULT(yes)
-        fi
-
-    else
-
-      dnl Have the libraries--check for OpenSSL headers
-      AC_CHECK_HEADERS(openssl/x509.h openssl/rsa.h openssl/crypto.h \
-                       openssl/pem.h openssl/ssl.h openssl/err.h,
-        ssl_msg="OpenSSL"
-	test openssl != "$DEFAULT_SSL_BACKEND" || VALID_DEFAULT_SSL_BACKEND=yes
-        OPENSSL_ENABLED=1
-        AC_DEFINE(USE_OPENSSL, 1, [if OpenSSL is in use]))
-
-      if test $ac_cv_header_openssl_x509_h = no; then
-        dnl we don't use the "action" part of the AC_CHECK_HEADERS macro
-        dnl since 'err.h' might in fact find a krb4 header with the same
-        dnl name
-        AC_CHECK_HEADERS(x509.h rsa.h crypto.h pem.h ssl.h err.h)
-
-        if test $ac_cv_header_x509_h = yes &&
-           test $ac_cv_header_crypto_h = yes &&
-           test $ac_cv_header_ssl_h = yes; then
-          dnl three matches
-          ssl_msg="OpenSSL"
-          OPENSSL_ENABLED=1
-        fi
-      fi
-    fi
-
-    if test X"$OPENSSL_ENABLED" != X"1"; then
-       LIBS="$CLEANLIBS"
-    fi
-
-    if test X"$OPT_SSL" != Xoff &&
-       test "$OPENSSL_ENABLED" != "1"; then
-      AC_MSG_ERROR([OpenSSL libs and/or directories were not found where specified!])
-    fi
-  fi
-
-  if test X"$OPENSSL_ENABLED" = X"1"; then
-    dnl These can only exist if OpenSSL exists
-    dnl Older versions of Cyassl (some time before 2.9.4) don't have
-    dnl SSL_get_shutdown (but this check won't actually detect it there
-    dnl as it's a macro that needs the header files be included)
-    dnl OpenSSL_version is introduced in 3.0.0
-
-    AC_CHECK_FUNCS( RAND_egd \
-                    SSL_get_shutdown \
-                    SSLv2_client_method \
-                    OpenSSL_version )
-
-    AC_MSG_CHECKING([for BoringSSL])
-    AC_COMPILE_IFELSE([
-        AC_LANG_PROGRAM([[
-                #include <openssl/base.h>
-                ]],[[
-                #ifndef OPENSSL_IS_BORINGSSL
-                #error not boringssl
-                #endif
-       ]])
-    ],[
-        AC_MSG_RESULT([yes])
-        AC_DEFINE_UNQUOTED(HAVE_BORINGSSL, 1,
-                           [Define to 1 if using BoringSSL.])
-        ssl_msg="BoringSSL"
-    ],[
-        AC_MSG_RESULT([no])
-    ])
-
-    AC_MSG_CHECKING([for libressl])
-    AC_COMPILE_IFELSE([
-      AC_LANG_PROGRAM([[
-#include <openssl/opensslv.h>
-      ]],[[
-        int dummy = LIBRESSL_VERSION_NUMBER;
-      ]])
-    ],[
-      AC_MSG_RESULT([yes])
-      AC_DEFINE_UNQUOTED(HAVE_LIBRESSL, 1,
-        [Define to 1 if using libressl.])
-      ssl_msg="libressl"
-    ],[
-      AC_MSG_RESULT([no])
-    ])
-  fi
-
-  if test "$OPENSSL_ENABLED" = "1"; then
-    if test -n "$LIB_OPENSSL"; then
-       dnl when the ssl shared libs were found in a path that the run-time
-       dnl linker doesn't search through, we need to add it to CURL_LIBRARY_PATH
-       dnl to prevent further configure tests to fail due to this
-       if test "x$cross_compiling" != "xyes"; then
-         CURL_LIBRARY_PATH="$CURL_LIBRARY_PATH:$LIB_OPENSSL"
-         export CURL_LIBRARY_PATH
-         AC_MSG_NOTICE([Added $LIB_OPENSSL to CURL_LIBRARY_PATH])
-       fi
-    fi
-    CURL_CHECK_OPENSSL_API
-    check_for_ca_bundle=1
-  fi
-
-  test -z "$ssl_msg" || ssl_backends="${ssl_backends:+$ssl_backends, }$ssl_msg"
-fi
 
 dnl **********************************************************************
 dnl Check for the random seed preferences
@@ -1955,7 +1595,7 @@ dnl check for GnuTLS
 dnl ----------------------------------------------------
 
 dnl Default to compiler & linker defaults for GnuTLS files & libraries.
-OPT_GNUTLS=no
+OPT_GNUTLS=yes
 
 AC_ARG_WITH(gnutls,dnl
 AC_HELP_STRING([--with-gnutls=PATH],[where to look for GnuTLS, PATH points to the installation root])
@@ -2110,590 +1750,18 @@ if test "$GNUTLS_ENABLED" = "1"; then
    ])
 fi
 
-dnl ----------------------------------------------------
-dnl check for PolarSSL
-dnl ----------------------------------------------------
-
-dnl Default to compiler & linker defaults for PolarSSL files & libraries.
 OPT_POLARSSL=no
-
-_cppflags=$CPPFLAGS
-_ldflags=$LDFLAGS
-AC_ARG_WITH(polarssl,dnl
-AC_HELP_STRING([--with-polarssl=PATH],[where to look for PolarSSL, PATH points to the installation root])
-AC_HELP_STRING([--without-polarssl], [disable PolarSSL detection]),
-  OPT_POLARSSL=$withval)
-
-if test -z "$ssl_backends" -o "x$OPT_POLARSSL" != xno; then
-  ssl_msg=
-
-  if test X"$OPT_POLARSSL" != Xno; then
-
-    if test "$OPT_POLARSSL" = "yes"; then
-      OPT_POLARSSL=""
-    fi
-
-    if test -z "$OPT_POLARSSL" ; then
-      dnl check for lib first without setting any new path
-
-      AC_CHECK_LIB(polarssl, havege_init,
-      dnl libpolarssl found, set the variable
-       [
-         AC_DEFINE(USE_POLARSSL, 1, [if PolarSSL is enabled])
-         AC_SUBST(USE_POLARSSL, [1])
-         POLARSSL_ENABLED=1
-         USE_POLARSSL="yes"
-         ssl_msg="PolarSSL"
-	 test polarssl != "$DEFAULT_SSL_BACKEND" || VALID_DEFAULT_SSL_BACKEND=yes
-        ])
-    fi
-
-    addld=""
-    addlib=""
-    addcflags=""
-    polarssllib=""
-
-    if test "x$USE_POLARSSL" != "xyes"; then
-      dnl add the path and test again
-      addld=-L$OPT_POLARSSL/lib$libsuff
-      addcflags=-I$OPT_POLARSSL/include
-      polarssllib=$OPT_POLARSSL/lib$libsuff
-
-      LDFLAGS="$LDFLAGS $addld"
-      if test "$addcflags" != "-I/usr/include"; then
-         CPPFLAGS="$CPPFLAGS $addcflags"
-      fi
-
-      AC_CHECK_LIB(polarssl, ssl_init,
-       [
-       AC_DEFINE(USE_POLARSSL, 1, [if PolarSSL is enabled])
-       AC_SUBST(USE_POLARSSL, [1])
-       POLARSSL_ENABLED=1
-       USE_POLARSSL="yes"
-       ssl_msg="PolarSSL"
-       test polarssl != "$DEFAULT_SSL_BACKEND" || VALID_DEFAULT_SSL_BACKEND=yes
-       ],
-       [
-         CPPFLAGS=$_cppflags
-         LDFLAGS=$_ldflags
-       ])
-    fi
-
-    if test "x$USE_POLARSSL" = "xyes"; then
-      AC_MSG_NOTICE([detected PolarSSL])
-      check_for_ca_bundle=1
-      LIBS="-lpolarssl $LIBS"
-
-      if test -n "$polarssllib"; then
-        dnl when shared libs were found in a path that the run-time
-        dnl linker doesn't search through, we need to add it to
-        dnl CURL_LIBRARY_PATH to prevent further configure tests to fail
-        dnl due to this
-        if test "x$cross_compiling" != "xyes"; then
-          CURL_LIBRARY_PATH="$CURL_LIBRARY_PATH:$polarssllib"
-          export CURL_LIBRARY_PATH
-          AC_MSG_NOTICE([Added $polarssllib to CURL_LIBRARY_PATH])
-        fi
-      fi
-    fi
-
-  fi dnl PolarSSL not disabled
-
-  test -z "$ssl_msg" || ssl_backends="${ssl_backends:+$ssl_backends, }$ssl_msg"
-fi
-
-dnl ----------------------------------------------------
-dnl check for mbedTLS
-dnl ----------------------------------------------------
-
 OPT_MBEDTLS=no
-
-_cppflags=$CPPFLAGS
-_ldflags=$LDFLAGS
-AC_ARG_WITH(mbedtls,dnl
-AC_HELP_STRING([--with-mbedtls=PATH],[where to look for mbedTLS, PATH points to the installation root])
-AC_HELP_STRING([--without-mbedtls], [disable mbedTLS detection]),
-  OPT_MBEDTLS=$withval)
-
-if test -z "$ssl_backends" -o "x$OPT_MBEDTLS" != xno; then
-  ssl_msg=
-
-  if test X"$OPT_MBEDTLS" != Xno; then
-
-    if test "$OPT_MBEDTLS" = "yes"; then
-      OPT_MBEDTLS=""
-    fi
-
-    if test -z "$OPT_MBEDTLS" ; then
-      dnl check for lib first without setting any new path
-
-      AC_CHECK_LIB(mbedtls, mbedtls_havege_init,
-      dnl libmbedtls found, set the variable
-       [
-         AC_DEFINE(USE_MBEDTLS, 1, [if mbedTLS is enabled])
-         AC_SUBST(USE_MBEDTLS, [1])
-         MBEDTLS_ENABLED=1
-         USE_MBEDTLS="yes"
-         ssl_msg="mbedTLS"
-	 test mbedtls != "$DEFAULT_SSL_BACKEND" || VALID_DEFAULT_SSL_BACKEND=yes
-        ], [], -lmbedx509 -lmbedcrypto)
-    fi
-
-    addld=""
-    addlib=""
-    addcflags=""
-    mbedtlslib=""
-
-    if test "x$USE_MBEDTLS" != "xyes"; then
-      dnl add the path and test again
-      addld=-L$OPT_MBEDTLS/lib$libsuff
-      addcflags=-I$OPT_MBEDTLS/include
-      mbedtlslib=$OPT_MBEDTLS/lib$libsuff
-
-      LDFLAGS="$LDFLAGS $addld"
-      if test "$addcflags" != "-I/usr/include"; then
-         CPPFLAGS="$CPPFLAGS $addcflags"
-      fi
-
-      AC_CHECK_LIB(mbedtls, mbedtls_ssl_init,
-       [
-       AC_DEFINE(USE_MBEDTLS, 1, [if mbedTLS is enabled])
-       AC_SUBST(USE_MBEDTLS, [1])
-       MBEDTLS_ENABLED=1
-       USE_MBEDTLS="yes"
-       ssl_msg="mbedTLS"
-       test mbedtls != "$DEFAULT_SSL_BACKEND" || VALID_DEFAULT_SSL_BACKEND=yes
-       ],
-       [
-         CPPFLAGS=$_cppflags
-         LDFLAGS=$_ldflags
-       ], -lmbedx509 -lmbedcrypto)
-    fi
-
-    if test "x$USE_MBEDTLS" = "xyes"; then
-      AC_MSG_NOTICE([detected mbedTLS])
-      check_for_ca_bundle=1
-
-      LIBS="-lmbedtls -lmbedx509 -lmbedcrypto $LIBS"
-
-      if test -n "$mbedtlslib"; then
-        dnl when shared libs were found in a path that the run-time
-        dnl linker doesn't search through, we need to add it to
-        dnl CURL_LIBRARY_PATH to prevent further configure tests to fail
-        dnl due to this
-        if test "x$cross_compiling" != "xyes"; then
-          CURL_LIBRARY_PATH="$CURL_LIBRARY_PATH:$mbedtlslib"
-          export CURL_LIBRARY_PATH
-          AC_MSG_NOTICE([Added $mbedtlslib to CURL_LIBRARY_PATH])
-        fi
-      fi
-    fi
-
-  fi dnl mbedTLS not disabled
-
-  test -z "$ssl_msg" || ssl_backends="${ssl_backends:+$ssl_backends, }$ssl_msg"
-fi
-
-dnl ----------------------------------------------------
-dnl check for CyaSSL
-dnl ----------------------------------------------------
-
-dnl Default to compiler & linker defaults for CyaSSL files & libraries.
 OPT_CYASSL=no
-
-_cppflags=$CPPFLAGS
-_ldflags=$LDFLAGS
-AC_ARG_WITH(cyassl,dnl
-AC_HELP_STRING([--with-cyassl=PATH],[where to look for CyaSSL, PATH points to the installation root (default: system lib default)])
-AC_HELP_STRING([--without-cyassl], [disable CyaSSL detection]),
-  OPT_CYASSL=$withval)
-
-dnl provide --with-wolfssl as an alias for --with-cyassl
-AC_ARG_WITH(wolfssl,dnl
-AC_HELP_STRING([--with-wolfssl=PATH],[where to look for WolfSSL, PATH points to the installation root (default: system lib default)])
-AC_HELP_STRING([--without-wolfssl], [disable WolfSSL detection]),
-  OPT_CYASSL=$withval)
-
-if test -z "$ssl_backends" -o "x$OPT_CYASSL" != xno; then
-  ssl_msg=
-
-  if test X"$OPT_CYASSL" != Xno; then
-
-    if test "$OPT_CYASSL" = "yes"; then
-      OPT_CYASSL=""
-    fi
-
-    dnl This should be reworked to use pkg-config instead
-
-    cyassllibname=cyassl
-
-    if test -z "$OPT_CYASSL" ; then
-      dnl check for lib in system default first
-
-      AC_CHECK_LIB(cyassl, CyaSSL_Init,
-      dnl libcyassl found, set the variable
-       [
-         AC_DEFINE(USE_CYASSL, 1, [if CyaSSL is enabled])
-         AC_SUBST(USE_CYASSL, [1])
-         CYASSL_ENABLED=1
-         USE_CYASSL="yes"
-         ssl_msg="CyaSSL"
-	 test cyassl != "$DEFAULT_SSL_BACKEND" || VALID_DEFAULT_SSL_BACKEND=yes
-        ])
-    fi
-
-    addld=""
-    addlib=""
-    addcflags=""
-    cyassllib=""
-
-    if test "x$USE_CYASSL" != "xyes"; then
-      dnl add the path and test again
-      addld=-L$OPT_CYASSL/lib$libsuff
-      addcflags=-I$OPT_CYASSL/include
-      cyassllib=$OPT_CYASSL/lib$libsuff
-
-      LDFLAGS="$LDFLAGS $addld"
-      if test "$addcflags" != "-I/usr/include"; then
-         CPPFLAGS="$CPPFLAGS $addcflags"
-      fi
-
-      AC_CHECK_LIB(cyassl, CyaSSL_Init,
-       [
-       AC_DEFINE(USE_CYASSL, 1, [if CyaSSL is enabled])
-       AC_SUBST(USE_CYASSL, [1])
-       CYASSL_ENABLED=1
-       USE_CYASSL="yes"
-       ssl_msg="CyaSSL"
-       test cyassl != "$DEFAULT_SSL_BACKEND" || VALID_DEFAULT_SSL_BACKEND=yes
-       ],
-       [
-         CPPFLAGS=$_cppflags
-         LDFLAGS=$_ldflags
-         cyassllib=""
-       ])
-    fi
-
-    addld=""
-    addlib=""
-    addcflags=""
-
-    if test "x$USE_CYASSL" != "xyes"; then
-      dnl libcyassl renamed to libwolfssl as of 3.4.0
-      addld=-L$OPT_CYASSL/lib$libsuff
-      addcflags=-I$OPT_CYASSL/include
-      cyassllib=$OPT_CYASSL/lib$libsuff
-
-      LDFLAGS="$LDFLAGS $addld"
-      if test "$addcflags" != "-I/usr/include"; then
-         CPPFLAGS="$CPPFLAGS $addcflags"
-      fi
-
-      cyassllibname=wolfssl
-      my_ac_save_LIBS="$LIBS"
-      LIBS="-l$cyassllibname -lm $LIBS"
-
-      AC_MSG_CHECKING([for CyaSSL_Init in -lwolfssl])
-      AC_LINK_IFELSE([
-	AC_LANG_PROGRAM([[
-/* These aren't needed for detection and confuse WolfSSL.
-   They are set up properly later if it is detected.  */
-#undef SIZEOF_LONG
-#undef SIZEOF_LONG_LONG
-#include <cyassl/ssl.h>
-	]],[[
-	  return CyaSSL_Init();
-	]])
-      ],[
-         AC_MSG_RESULT(yes)
-         AC_DEFINE(USE_CYASSL, 1, [if CyaSSL/WolfSSL is enabled])
-         AC_SUBST(USE_CYASSL, [1])
-         CYASSL_ENABLED=1
-         USE_CYASSL="yes"
-         ssl_msg="WolfSSL"
-	 test cyassl != "$DEFAULT_SSL_BACKEND" || VALID_DEFAULT_SSL_BACKEND=yes
-       ],
-       [
-         AC_MSG_RESULT(no)
-         CPPFLAGS=$_cppflags
-         LDFLAGS=$_ldflags
-         cyassllib=""
-       ])
-      LIBS="$my_ac_save_LIBS"
-    fi
-
-    if test "x$USE_CYASSL" = "xyes"; then
-      AC_MSG_NOTICE([detected $cyassllibname])
-      check_for_ca_bundle=1
-
-      dnl cyassl/ctaocrypt/types.h needs SIZEOF_LONG_LONG defined!
-      AX_COMPILE_CHECK_SIZEOF(long long)
-
-      dnl Versions since at least 2.6.0 may have options.h
-      AC_CHECK_HEADERS(cyassl/options.h)
-
-      dnl Versions since at least 2.9.4 renamed error.h to error-ssl.h
-      AC_CHECK_HEADERS(cyassl/error-ssl.h)
-
-      LIBS="-l$cyassllibname -lm $LIBS"
-
-      if test "x$cyassllibname" = "xwolfssl"; then
-        dnl Recent WolfSSL versions build without SSLv3 by default
-        dnl WolfSSL needs configure --enable-opensslextra to have *get_peer*
-        AC_CHECK_FUNCS(wolfSSLv3_client_method \
-                       wolfSSL_get_peer_certificate \
-                       wolfSSL_UseALPN)
-      else
-        dnl Cyassl needs configure --enable-opensslextra to have *get_peer*
-        AC_CHECK_FUNCS(CyaSSL_CTX_UseSupportedCurve \
-                       CyaSSL_get_peer_certificate)
-      fi
-
-      if test -n "$cyassllib"; then
-        dnl when shared libs were found in a path that the run-time
-        dnl linker doesn't search through, we need to add it to
-        dnl CURL_LIBRARY_PATH to prevent further configure tests to fail
-        dnl due to this
-        if test "x$cross_compiling" != "xyes"; then
-          CURL_LIBRARY_PATH="$CURL_LIBRARY_PATH:$cyassllib"
-          export CURL_LIBRARY_PATH
-          AC_MSG_NOTICE([Added $cyassllib to CURL_LIBRARY_PATH])
-        fi
-      fi
-
-    fi
-
-  fi dnl CyaSSL not disabled
-
-  test -z "$ssl_msg" || ssl_backends="${ssl_backends:+$ssl_backends, }$ssl_msg"
-fi
-
-dnl ----------------------------------------------------
-dnl check for MesaLink
-dnl ----------------------------------------------------
-
-dnl Default to compiler & linker defaults for MesaLink files & libraries.
-OPT_MESALINK=no
-
-_cppflags=$CPPFLAGS
-_ldflags=$LDFLAGS
-AC_ARG_WITH(mesalink,dnl
-AC_HELP_STRING([--with-mesalink=PATH],[where to look for MesaLink, PATH points to the installation root])
-AC_HELP_STRING([--without-mesalink], [disable MesaLink detection]),
-  OPT_MESALINK=$withval)
-
-if test -z "$ssl_backends" -o "x$OPT_MESALINK" != xno; then
-  ssl_msg=
-
-  if test X"$OPT_MESALINK" != Xno; then
-
-    if test "$OPT_MESALINK" = "yes"; then
-      OPT_MESALINK=""
-    fi
-
-    if test -z "$OPT_MESALINK" ; then
-      dnl check for lib first without setting any new path
-
-      AC_CHECK_LIB(mesalink, mesalink_library_init,
-      dnl libmesalink found, set the variable
-       [
-         AC_DEFINE(USE_MESALINK, 1, [if MesaLink is enabled])
-         AC_SUBST(USE_MESALINK, [1])
-         MESALINK_ENABLED=1
-         USE_MESALINK="yes"
-         ssl_msg="MesaLink"
-	 test mesalink != "$DEFAULT_SSL_BACKEND" || VALID_DEFAULT_SSL_BACKEND=yes
-        ])
-    fi
-
-    addld=""
-    addlib=""
-    addcflags=""
-    mesalinklib=""
-
-    if test "x$USE_MESALINK" != "xyes"; then
-      dnl add the path and test again
-      addld=-L$OPT_MESALINK/lib$libsuff
-      addcflags=-I$OPT_MESALINK/include
-      mesalinklib=$OPT_MESALINK/lib$libsuff
-
-      LDFLAGS="$LDFLAGS $addld"
-      if test "$addcflags" != "-I/usr/include"; then
-         CPPFLAGS="$CPPFLAGS $addcflags"
-      fi
-
-      AC_CHECK_LIB(mesalink, mesalink_library_init,
-       [
-       AC_DEFINE(USE_MESALINK, 1, [if MesaLink is enabled])
-       AC_SUBST(USE_MESALINK, [1])
-       MESALINK_ENABLED=1
-       USE_MESALINK="yes"
-       ssl_msg="MesaLink"
-       test mesalink != "$DEFAULT_SSL_BACKEND" || VALID_DEFAULT_SSL_BACKEND=yes
-       ],
-       [
-         CPPFLAGS=$_cppflags
-         LDFLAGS=$_ldflags
-       ])
-    fi
-
-    if test "x$USE_MESALINK" = "xyes"; then
-      AC_MSG_NOTICE([detected MesaLink])
-
-      LIBS="-lmesalink $LIBS"
-
-      if test -n "$mesalinklib"; then
-        dnl when shared libs were found in a path that the run-time
-        dnl linker doesn't search through, we need to add it to
-        dnl LD_LIBRARY_PATH to prevent further configure tests to fail
-        dnl due to this
-        if test "x$cross_compiling" != "xyes"; then
-          LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$mesalinklib"
-          export LD_LIBRARY_PATH
-          AC_MSG_NOTICE([Added $mesalinklib to LD_LIBRARY_PATH])
-        fi
-      fi
-    fi
-
-  fi dnl MesaLink not disabled
-
-  test -z "$ssl_msg" || ssl_backends="${ssl_backends:+$ssl_backends, }$ssl_msg"
-fi
-
-dnl ----------------------------------------------------
 dnl NSS. Only check if GnuTLS and OpenSSL are not enabled
-dnl ----------------------------------------------------
-
-dnl Default to compiler & linker defaults for NSS files & libraries.
 OPT_NSS=no
+OPT_AXTLS=off
+OPT_MESALINK=no
 
-AC_ARG_WITH(nss,dnl
-AC_HELP_STRING([--with-nss=PATH],[where to look for NSS, PATH points to the installation root])
-AC_HELP_STRING([--without-nss], [disable NSS detection]),
-  OPT_NSS=$withval)
-
-if test -z "$ssl_backends" -o "x$OPT_NSS" != xno; then
-  ssl_msg=
-
-  if test X"$OPT_NSS" != Xno; then
-
-    addld=""
-    addlib=""
-    addcflags=""
-    nssprefix=""
-    version=""
-
-    if test "x$OPT_NSS" = "xyes"; then
-
-      CURL_CHECK_PKGCONFIG(nss)
-
-      if test "$PKGCONFIG" != "no" ; then
-        addlib=`$PKGCONFIG --libs nss`
-        addcflags=`$PKGCONFIG --cflags nss`
-        version=`$PKGCONFIG --modversion nss`
-        nssprefix=`$PKGCONFIG --variable=prefix nss`
-      else
-        dnl Without pkg-config, we check for nss-config
-
-        check=`nss-config --version 2>/dev/null`
-        if test -n "$check"; then
-          addlib=`nss-config --libs`
-          addcflags=`nss-config --cflags`
-          version=`nss-config --version`
-          nssprefix=`nss-config --prefix`
-        else
-          addlib="-lnss3"
-          addcflags=""
-          version="unknown"
-        fi
-      fi
-    else
-      NSS_PCDIR="$OPT_NSS/lib/pkgconfig"
-      if test -f "$NSS_PCDIR/nss.pc"; then
-        CURL_CHECK_PKGCONFIG(nss, [$NSS_PCDIR])
-        if test "$PKGCONFIG" != "no" ; then
-          addld=`CURL_EXPORT_PCDIR([$NSS_PCDIR]) $PKGCONFIG --libs-only-L nss`
-          addlib=`CURL_EXPORT_PCDIR([$NSS_PCDIR]) $PKGCONFIG --libs-only-l nss`
-          addcflags=`CURL_EXPORT_PCDIR([$NSS_PCDIR]) $PKGCONFIG --cflags nss`
-          version=`CURL_EXPORT_PCDIR([$NSS_PCDIR]) $PKGCONFIG --modversion nss`
-          nssprefix=`CURL_EXPORT_PCDIR([$NSS_PCDIR]) $PKGCONFIG --variable=prefix nss`
-        fi
-      fi
-    fi
-
-    if test -z "$addlib"; then
-      # Without pkg-config, we'll kludge in some defaults
-      AC_MSG_WARN([Using hard-wired libraries and compilation flags for NSS.])
-      addld="-L$OPT_NSS/lib"
-      addlib="-lssl3 -lsmime3 -lnss3 -lplds4 -lplc4 -lnspr4"
-      addcflags="-I$OPT_NSS/include"
-      version="unknown"
-      nssprefix=$OPT_NSS
-    fi
-
-    CLEANLDFLAGS="$LDFLAGS"
-    CLEANLIBS="$LIBS"
-    CLEANCPPFLAGS="$CPPFLAGS"
-
-    LDFLAGS="$addld $LDFLAGS"
-    LIBS="$addlib $LIBS"
-    if test "$addcflags" != "-I/usr/include"; then
-       CPPFLAGS="$CPPFLAGS $addcflags"
-    fi
-
-    dnl The function SSL_VersionRangeSet() is needed to enable TLS > 1.0
-    AC_CHECK_LIB(nss3, SSL_VersionRangeSet,
-     [
-     AC_DEFINE(USE_NSS, 1, [if NSS is enabled])
-     AC_SUBST(USE_NSS, [1])
-     USE_NSS="yes"
-     NSS_ENABLED=1
-     ssl_msg="NSS"
-     test nss != "$DEFAULT_SSL_BACKEND" || VALID_DEFAULT_SSL_BACKEND=yes
-     ],
-     [
-       LDFLAGS="$CLEANLDFLAGS"
-       LIBS="$CLEANLIBS"
-       CPPFLAGS="$CLEANCPPFLAGS"
-     ])
-
-    if test "x$USE_NSS" = "xyes"; then
-      AC_MSG_NOTICE([detected NSS version $version])
-
-      dnl PK11_CreateManagedGenericObject() was introduced in NSS 3.34 because
-      dnl PK11_DestroyGenericObject() does not release resources allocated by
-      dnl PK11_CreateGenericObject() early enough.
-      AC_CHECK_FUNC(PK11_CreateManagedGenericObject,
-        [
-          AC_DEFINE(HAVE_PK11_CREATEMANAGEDGENERICOBJECT, 1,
-                    [if you have the PK11_CreateManagedGenericObject function])
-        ])
-
-      dnl needed when linking the curl tool without USE_EXPLICIT_LIB_DEPS
-      NSS_LIBS=$addlib
-      AC_SUBST([NSS_LIBS])
-
-      dnl when shared libs were found in a path that the run-time
-      dnl linker doesn't search through, we need to add it to
-      dnl CURL_LIBRARY_PATH to prevent further configure tests to fail
-      dnl due to this
-      if test "x$cross_compiling" != "xyes"; then
-        CURL_LIBRARY_PATH="$CURL_LIBRARY_PATH:$nssprefix/lib$libsuff"
-        export CURL_LIBRARY_PATH
-        AC_MSG_NOTICE([Added $nssprefix/lib$libsuff to CURL_LIBRARY_PATH])
-      fi
-
-    fi dnl NSS found
-
-  fi dnl NSS not disabled
-
-  test -z "$ssl_msg" || ssl_backends="${ssl_backends:+$ssl_backends, }$ssl_msg"
-fi
-
-case "x$OPENSSL_ENABLED$GNUTLS_ENABLED$NSS_ENABLED$POLARSSL_ENABLED$MBEDTLS_ENABLED$CYASSL_ENABLED$WINSSL_ENABLED$SECURETRANSPORT_ENABLED$MESALINK_ENABLED$AMISSL_ENABLED" in
+case "x$OPENSSL_ENABLED$GNUTLS_ENABLED$NSS_ENABLED$POLARSSL_ENABLED$MBEDTLS_ENABLED$AXTLS_ENABLED$CYASSL_ENABLED$WINSSL_ENABLED$DARWINSSL_ENABLED$MESALINK_ENABLED" in
 x)
   AC_MSG_WARN([SSL disabled, you will not be able to use HTTPS, FTPS, NTLM and more.])
-  AC_MSG_WARN([Use --with-ssl, --with-gnutls, --with-polarssl, --with-cyassl, --with-nss, --with-schannel, --with-secure-transport, --with-mesalink or --with-amissl to address this.])
+  AC_MSG_WARN([Use --with-ssl, --with-gnutls, --with-polarssl, --with-cyassl, --with-nss, --with-axtls, --with-winssl, --with-darwinssl, or --with-mesalink to address this.])
   ;;
 x1)
   # one SSL backend is enabled
@@ -2822,7 +1890,7 @@ if test X"$OPT_LIBMETALINK" != Xno; then
       ]])
     ],[
       AC_MSG_RESULT([yes ($version)])
-      want_metalink="yes"
+      want_metalink="no"
     ],[
       AC_MSG_RESULT([no ($version)])
       AC_MSG_NOTICE([libmetalink library defective or too old])
@@ -2864,153 +1932,7 @@ AC_HELP_STRING([--with-libssh=PATH],[Where to look for libssh, PATH points to th
 AC_HELP_STRING([--with-libssh], [enable LIBSSH]),
   OPT_LIBSSH=$withval, OPT_LIBSSH=no)
 
-if test X"$OPT_LIBSSH2" != Xno; then
-  dnl backup the pre-libssh2 variables
-  CLEANLDFLAGS="$LDFLAGS"
-  CLEANCPPFLAGS="$CPPFLAGS"
-  CLEANLIBS="$LIBS"
-
-  case "$OPT_LIBSSH2" in
-  yes)
-    dnl --with-libssh2 (without path) used
-    CURL_CHECK_PKGCONFIG(libssh2)
-
-    if test "$PKGCONFIG" != "no" ; then
-      LIB_SSH2=`$PKGCONFIG --libs libssh2`
-      LD_SSH2=`$PKGCONFIG --libs-only-L libssh2`
-      CPP_SSH2=`$PKGCONFIG --cflags-only-I libssh2`
-      version=`$PKGCONFIG --modversion libssh2`
-      DIR_SSH2=`echo $LD_SSH2 | $SED -e 's/-L//'`
-    fi
-
-    ;;
-  off)
-    dnl no --with-libssh2 option given, just check default places
-    ;;
-  *)
-    dnl use the given --with-libssh2 spot
-    PREFIX_SSH2=$OPT_LIBSSH2
-    ;;
-  esac
-
-  dnl if given with a prefix, we set -L and -I based on that
-  if test -n "$PREFIX_SSH2"; then
-    LIB_SSH2="-lssh2"
-    LD_SSH2=-L${PREFIX_SSH2}/lib$libsuff
-    CPP_SSH2=-I${PREFIX_SSH2}/include
-    DIR_SSH2=${PREFIX_SSH2}/lib$libsuff
-  fi
-
-  LDFLAGS="$LDFLAGS $LD_SSH2"
-  CPPFLAGS="$CPPFLAGS $CPP_SSH2"
-  LIBS="$LIB_SSH2 $LIBS"
-
-  AC_CHECK_LIB(ssh2, libssh2_channel_open_ex)
-
-  AC_CHECK_HEADERS(libssh2.h,
-    curl_ssh_msg="enabled (libSSH2)"
-    LIBSSH2_ENABLED=1
-    AC_DEFINE(USE_LIBSSH2, 1, [if libSSH2 is in use])
-    AC_SUBST(USE_LIBSSH2, [1])
-  )
-
-  if test X"$OPT_LIBSSH2" != Xoff &&
-     test "$LIBSSH2_ENABLED" != "1"; then
-    AC_MSG_ERROR([libSSH2 libs and/or directories were not found where specified!])
-  fi
-
-  if test "$LIBSSH2_ENABLED" = "1"; then
-    if test -n "$DIR_SSH2"; then
-       dnl when the libssh2 shared libs were found in a path that the run-time
-       dnl linker doesn't search through, we need to add it to CURL_LIBRARY_PATH
-       dnl to prevent further configure tests to fail due to this
-
-       if test "x$cross_compiling" != "xyes"; then
-         CURL_LIBRARY_PATH="$CURL_LIBRARY_PATH:$DIR_SSH2"
-         export CURL_LIBRARY_PATH
-         AC_MSG_NOTICE([Added $DIR_SSH2 to CURL_LIBRARY_PATH])
-       fi
-    fi
-  else
-    dnl no libssh2, revert back to clean variables
-    LDFLAGS=$CLEANLDFLAGS
-    CPPFLAGS=$CLEANCPPFLAGS
-    LIBS=$CLEANLIBS
-  fi
-elif test X"$OPT_LIBSSH" != Xno; then
-  dnl backup the pre-libssh variables
-  CLEANLDFLAGS="$LDFLAGS"
-  CLEANCPPFLAGS="$CPPFLAGS"
-  CLEANLIBS="$LIBS"
-
-  case "$OPT_LIBSSH" in
-  yes)
-    dnl --with-libssh (without path) used
-    CURL_CHECK_PKGCONFIG(libssh)
-
-    if test "$PKGCONFIG" != "no" ; then
-      LIB_SSH=`$PKGCONFIG --libs-only-l libssh`
-      LD_SSH=`$PKGCONFIG --libs-only-L libssh`
-      CPP_SSH=`$PKGCONFIG --cflags-only-I libssh`
-      version=`$PKGCONFIG --modversion libssh`
-      DIR_SSH=`echo $LD_SSH | $SED -e 's/-L//'`
-    fi
-
-    ;;
-  off)
-    dnl no --with-libssh option given, just check default places
-    ;;
-  *)
-    dnl use the given --with-libssh spot
-    PREFIX_SSH=$OPT_LIBSSH
-    ;;
-  esac
-
-  dnl if given with a prefix, we set -L and -I based on that
-  if test -n "$PREFIX_SSH"; then
-    LIB_SSH="-lssh"
-    LD_SSH=-L${PREFIX_SSH}/lib$libsuff
-    CPP_SSH=-I${PREFIX_SSH}/include
-    DIR_SSH=${PREFIX_SSH}/lib$libsuff
-  fi
-
-  LDFLAGS="$LDFLAGS $LD_SSH"
-  CPPFLAGS="$CPPFLAGS $CPP_SSH"
-  LIBS="$LIB_SSH $LIBS"
-
-  AC_CHECK_LIB(ssh, ssh_new)
-
-  AC_CHECK_HEADERS(libssh/libssh.h,
-    curl_ssh_msg="enabled (libSSH)"
-    LIBSSH_ENABLED=1
-    AC_DEFINE(USE_LIBSSH, 1, [if libSSH is in use])
-    AC_SUBST(USE_LIBSSH, [1])
-  )
-
-  if test X"$OPT_LIBSSH" != Xoff &&
-     test "$LIBSSH_ENABLED" != "1"; then
-    AC_MSG_ERROR([libSSH libs and/or directories were not found where specified!])
-  fi
-
-  if test "$LIBSSH_ENABLED" = "1"; then
-    if test -n "$DIR_SSH"; then
-       dnl when the libssh shared libs were found in a path that the run-time
-       dnl linker doesn't search through, we need to add it to CURL_LIBRARY_PATH
-       dnl to prevent further configure tests to fail due to this
-
-       if test "x$cross_compiling" != "xyes"; then
-         CURL_LIBRARY_PATH="$CURL_LIBRARY_PATH:$DIR_SSH"
-         export CURL_LIBRARY_PATH
-         AC_MSG_NOTICE([Added $DIR_SSH to CURL_LIBRARY_PATH])
-       fi
-    fi
-  else
-    dnl no libssh, revert back to clean variables
-    LDFLAGS=$CLEANLDFLAGS
-    CPPFLAGS=$CLEANCPPFLAGS
-    LIBS=$CLEANLIBS
-  fi
-fi
+LIBSSH2_ENABLED="0"
 
 dnl **********************************************************************
 dnl Check for the presence of LIBRTMP libraries and headers
@@ -3023,73 +1945,7 @@ AC_HELP_STRING([--with-librtmp=PATH],[Where to look for librtmp, PATH points to
 AC_HELP_STRING([--without-librtmp], [disable LIBRTMP]),
   OPT_LIBRTMP=$withval)
 
-if test X"$OPT_LIBRTMP" != Xno; then
-  dnl backup the pre-librtmp variables
-  CLEANLDFLAGS="$LDFLAGS"
-  CLEANCPPFLAGS="$CPPFLAGS"
-  CLEANLIBS="$LIBS"
-
-  case "$OPT_LIBRTMP" in
-  yes)
-    dnl --with-librtmp (without path) used
-    CURL_CHECK_PKGCONFIG(librtmp)
-
-    if test "$PKGCONFIG" != "no" ; then
-      LIB_RTMP=`$PKGCONFIG --libs-only-l librtmp`
-      LD_RTMP=`$PKGCONFIG --libs-only-L librtmp`
-      CPP_RTMP=`$PKGCONFIG --cflags-only-I librtmp`
-      version=`$PKGCONFIG --modversion librtmp`
-      DIR_RTMP=`echo $LD_RTMP | $SED -e 's/-L//'`
-    else
-      dnl To avoid link errors, we do not allow --librtmp without
-      dnl a pkgconfig file
-      AC_MSG_ERROR([--librtmp was specified but could not find librtmp pkgconfig file.])
-    fi
-
-    ;;
-  off)
-    dnl no --with-librtmp option given, just check default places
-    LIB_RTMP="-lrtmp"
-    ;;
-  *)
-    dnl use the given --with-librtmp spot
-    LIB_RTMP="-lrtmp"
-    PREFIX_RTMP=$OPT_LIBRTMP
-    ;;
-  esac
-
-  dnl if given with a prefix, we set -L and -I based on that
-  if test -n "$PREFIX_RTMP"; then
-    LD_RTMP=-L${PREFIX_RTMP}/lib$libsuff
-    CPP_RTMP=-I${PREFIX_RTMP}/include
-    DIR_RTMP=${PREFIX_RTMP}/lib$libsuff
-  fi
-
-  LDFLAGS="$LDFLAGS $LD_RTMP"
-  CPPFLAGS="$CPPFLAGS $CPP_RTMP"
-  LIBS="$LIB_RTMP $LIBS"
-
-  AC_CHECK_LIB(rtmp, RTMP_Init,
-    [
-     AC_CHECK_HEADERS(librtmp/rtmp.h,
-        curl_rtmp_msg="enabled (librtmp)"
-        LIBRTMP_ENABLED=1
-        AC_DEFINE(USE_LIBRTMP, 1, [if librtmp is in use])
-        AC_SUBST(USE_LIBRTMP, [1])
-     )
-    ],
-      dnl not found, revert back to clean variables
-      LDFLAGS=$CLEANLDFLAGS
-      CPPFLAGS=$CLEANCPPFLAGS
-      LIBS=$CLEANLIBS
-  )
-
-  if test X"$OPT_LIBRTMP" != Xoff &&
-     test "$LIBRTMP_ENABLED" != "1"; then
-    AC_MSG_ERROR([librtmp libs and/or directories were not found where specified!])
-  fi
-
-fi
+LIBRTMP_ENABLED="0"
 
 dnl **********************************************************************
 dnl Check for linker switch for versioned symbols
@@ -3161,67 +2017,12 @@ case "$OPT_WINIDN" in
     want_winidn="no"
     AC_MSG_RESULT([no])
     ;;
-  yes)
-    dnl --with-winidn option used without path
-    want_winidn="yes"
-    want_winidn_path="default"
-    AC_MSG_RESULT([yes])
-    ;;
   *)
-    dnl --with-winidn option used with path
-    want_winidn="yes"
-    want_winidn_path="$withval"
-    AC_MSG_RESULT([yes ($withval)])
+    want_winidn="no"
+    AC_MSG_RESULT([no])
     ;;
 esac
 
-if test "$want_winidn" = "yes"; then
-  dnl winidn library support has been requested
-  clean_CPPFLAGS="$CPPFLAGS"
-  clean_LDFLAGS="$LDFLAGS"
-  clean_LIBS="$LIBS"
-  WINIDN_LIBS="-lnormaliz"
-  WINIDN_CPPFLAGS="-DWINVER=0x0600"
-  #
-  if test "$want_winidn_path" != "default"; then
-    dnl path has been specified
-    dnl pkg-config not available or provides no info
-    WINIDN_LDFLAGS="-L$want_winidn_path/lib$libsuff"
-    WINIDN_CPPFLAGS="-I$want_winidn_path/include"
-    WINIDN_DIR="$want_winidn_path/lib$libsuff"
-  fi
-  #
-  CPPFLAGS="$CPPFLAGS $WINIDN_CPPFLAGS"
-  LDFLAGS="$LDFLAGS $WINIDN_LDFLAGS"
-  LIBS="$WINIDN_LIBS $LIBS"
-  #
-  AC_MSG_CHECKING([if IdnToUnicode can be linked])
-  AC_LINK_IFELSE([
-    AC_LANG_PROGRAM([[
-      #include <windows.h>
-    ]],[[
-      IdnToUnicode(0, NULL, 0, NULL, 0);
-    ]])
-  ],[
-    AC_MSG_RESULT([yes])
-    tst_links_winidn="yes"
-  ],[
-    AC_MSG_RESULT([no])
-    tst_links_winidn="no"
-  ])
-  #
-  if test "$tst_links_winidn" = "yes"; then
-    AC_DEFINE(USE_WIN32_IDN, 1, [Define to 1 if you have the `normaliz' (WinIDN) library (-lnormaliz).])
-    AC_DEFINE(WANT_IDN_PROTOTYPES, 1, [Define to 1 to provide own prototypes.])
-    AC_SUBST([IDN_ENABLED], [1])
-    curl_idn_msg="enabled (Windows-native)"
-  else
-    AC_MSG_WARN([Cannot find libraries for IDN support: IDN disabled])
-    CPPFLAGS="$clean_CPPFLAGS"
-    LDFLAGS="$clean_LDFLAGS"
-    LIBS="$clean_LIBS"
-  fi
-fi
 
 dnl **********************************************************************
 dnl Check for the presence of IDN libraries and headers
@@ -3593,7 +2394,7 @@ AX_COMPILE_CHECK_SIZEOF(off_t)
 o=$CPPFLAGS
 CPPFLAGS="-I$srcdir/include $CPPFLAGS"
 AX_COMPILE_CHECK_SIZEOF(curl_off_t, [
-#include <curl/system.h>
+#include <gnurl/system.h>
 ])
 CPPFLAGS=$o
 
@@ -4172,7 +2973,6 @@ dnl to let curl-config output the static libraries correctly
 ENABLE_STATIC="$enable_static"
 AC_SUBST(ENABLE_STATIC)
 
-
 dnl
 dnl For keeping supported features and protocols also in pkg-config file
 dnl since it is more cross-compile friendly than curl-config
@@ -4379,7 +3179,7 @@ AC_CONFIG_FILES([Makefile \
            docs/libcurl/opts/Makefile \
            docs/cmdline-opts/Makefile \
            include/Makefile \
-           include/curl/Makefile \
+           include/gnurl/Makefile \
            src/Makefile \
            lib/Makefile \
            scripts/Makefile \
@@ -4393,8 +3193,8 @@ AC_CONFIG_FILES([Makefile \
            tests/unit/Makefile \
            packages/Makefile \
            packages/vms/Makefile \
-           curl-config \
-           libcurl.pc
+           gnurl-config \
+           libgnurl.pc
 ])
 AC_OUTPUT
 
@@ -4402,7 +3202,7 @@ CURL_GENERATE_CONFIGUREHELP_PM
 
 XC_AMEND_DISTCLEAN([lib src tests/unit tests/server tests/libtest docs/examples])
 
-AC_MSG_NOTICE([Configured to build curl/libcurl:
+AC_MSG_NOTICE([Configured to build gnurl/libgnurl:
 
   Host setup:       ${host}
   Install prefix:   ${prefix}
diff --git a/docs/Makefile.am b/docs/Makefile.am
index 8eeabd478..b020ccf70 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -24,12 +24,12 @@ AUTOMAKE_OPTIONS = foreign no-dependencies
 
 # EXTRA_DIST breaks with $(abs_builddir) so build it using this variable
 # but distribute it (using the relative file name) in the next variable
-man_MANS = $(abs_builddir)/curl.1
-noinst_man_MANS = curl.1 mk-ca-bundle.1
-dist_man_MANS = curl-config.1
-GENHTMLPAGES = curl.html curl-config.html mk-ca-bundle.html
-PDFPAGES = curl.pdf curl-config.pdf mk-ca-bundle.pdf
-MANDISTPAGES = curl.1.dist curl-config.1.dist
+man_MANS = $(abs_builddir)/gnurl.1
+noinst_man_MANS = gnurl.1 mk-ca-bundle.1
+dist_man_MANS = gnurl-config.1
+GENHTMLPAGES = gnurl.html gnurl-config.html mk-ca-bundle.html
+PDFPAGES = gnurl.pdf gnurl-config.pdf mk-ca-bundle.pdf
+MANDISTPAGES = gnurl.1.dist gnurl-config.1.dist
 
 HTMLPAGES = $(GENHTMLPAGES) index.html
 
@@ -38,7 +38,7 @@ HTMLPAGES = $(GENHTMLPAGES) index.html
 SUBDIRS = . cmdline-opts
 DIST_SUBDIRS = $(SUBDIRS) examples libcurl
 
-CLEANFILES = $(GENHTMLPAGES) $(PDFPAGES) $(MANDISTPAGES) curl.1
+CLEANFILES = $(GENHTMLPAGES) $(PDFPAGES) $(MANDISTPAGES) gnurl.1
 
 EXTRA_DIST =                                    \
  $(noinst_man_MANS)                             \
@@ -93,9 +93,9 @@ SUFFIXES = .1 .html .pdf
 # First, seed the used copy of curl.1 with the prebuilt copy (in an out-of-tree
 # build), then run make recursively to rebuild it only if its dependencies
 # have changed.
-$(abs_builddir)/curl.1:
-	if test "$(top_builddir)x" != "$(top_srcdir)x" -a -e "$(srcdir)/curl.1"; then \
-		$(INSTALL_DATA) "$(srcdir)/curl.1" $@; fi
+$(abs_builddir)/gnurl.1:
+	if test "$(top_builddir)x" != "$(top_srcdir)x" -a -e "$(srcdir)/gnurl.1"; then \
+		$(INSTALL_DATA) "$(srcdir)/gnurl.1" $@; fi
 	cd cmdline-opts && $(MAKE)
 
 html: $(HTMLPAGES)
diff --git a/docs/cmdline-opts/Makefile.am b/docs/cmdline-opts/Makefile.am
index e6ecf7a6b..4d75f06d3 100644
--- a/docs/cmdline-opts/Makefile.am
+++ b/docs/cmdline-opts/Makefile.am
@@ -22,7 +22,7 @@
 
 AUTOMAKE_OPTIONS = foreign no-dependencies
 
-MANPAGE = $(top_builddir)/docs/curl.1
+MANPAGE = $(top_builddir)/docs/gnurl.1
 
 include Makefile.inc
 
diff --git a/docs/cmdline-opts/gen.pl b/docs/cmdline-opts/gen.pl
index a921298a6..e930f0528 100755
--- a/docs/cmdline-opts/gen.pl
+++ b/docs/cmdline-opts/gen.pl
@@ -4,7 +4,7 @@
 
 This script generates the manpage.
 
-Example: gen.pl mainpage > curl.1
+Example: gen.pl mainpage > gnurl.1
 
 Dev notes:
 
@@ -92,7 +92,7 @@ sub protocols {
 sub added {
     my ($standalone, $data)=@_;
     if($standalone) {
-        return ".SH \"ADDED\"\nAdded in curl version $data\n";
+        return ".SH \"ADDED\"\nAdded in gnurl version $data\n";
     }
     else {
         return "Added in $data. ";
@@ -179,9 +179,9 @@ sub single {
     }
 
     if($standalone) {
-        print ".TH curl 1 \"30 Nov 2016\" \"curl 7.52.0\" \"curl manual\"\n";
+        print ".TH gnurl 1 \"30 Nov 2016\" \"gnurl 7.52.0\" \"gnurl manual\"\n";
         print ".SH OPTION\n";
-        print "curl $opt\n";
+        print "gnurl $opt\n";
     }
     else {
         print ".IP \"$opt\"\n";
@@ -212,7 +212,7 @@ sub single {
     }
     if($requires) {
         my $l = manpageify($long);
-        push @foot, "$l requires that the underlying libcurl".
+        push @foot, "$l requires that the underlying libgnurl".
             " was built to support $requires. ";
     }
     if($mutexed) {
diff --git a/docs/examples/10-at-a-time.c b/docs/examples/10-at-a-time.c
index b50eaa68e..12e5261fa 100644
--- a/docs/examples/10-at-a-time.c
+++ b/docs/examples/10-at-a-time.c
@@ -30,7 +30,7 @@
 #ifndef WIN32
 #  include <unistd.h>
 #endif
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 static const char *urls[] = {
   "https://www.microsoft.com",
diff --git a/docs/examples/Makefile.am b/docs/examples/Makefile.am
index 53867cb22..105f78b1d 100644
--- a/docs/examples/Makefile.am
+++ b/docs/examples/Makefile.am
@@ -48,9 +48,9 @@ LIBS = $(BLANK_AT_MAKETIME)
 
 # Dependencies
 if USE_EXPLICIT_LIB_DEPS
-LDADD = $(LIBDIR)/libcurl.la @LIBCURL_LIBS@
+LDADD = $(LIBDIR)/libgnurl.la @LIBCURL_LIBS@
 else
-LDADD = $(LIBDIR)/libcurl.la
+LDADD = $(LIBDIR)/libgnurl.la
 endif
 
 # This might hold -Werror
diff --git a/docs/examples/anyauthput.c b/docs/examples/anyauthput.c
index 14da10c3b..b70a43385 100644
--- a/docs/examples/anyauthput.c
+++ b/docs/examples/anyauthput.c
@@ -29,7 +29,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 #ifdef WIN32
 #  include <io.h>
diff --git a/docs/examples/asiohiper.cpp b/docs/examples/asiohiper.cpp
index de1480507..88eeafb59 100644
--- a/docs/examples/asiohiper.cpp
+++ b/docs/examples/asiohiper.cpp
@@ -55,7 +55,7 @@
  */
 
 
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 #include <boost/asio.hpp>
 #include <boost/bind.hpp>
 #include <iostream>
diff --git a/docs/examples/cacertinmem.c b/docs/examples/cacertinmem.c
index 9e15eb79d..5948ff039 100644
--- a/docs/examples/cacertinmem.c
+++ b/docs/examples/cacertinmem.c
@@ -26,7 +26,7 @@
 
 #include <openssl/err.h>
 #include <openssl/ssl.h>
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 #include <stdio.h>
 
 static size_t writefunction(void *ptr, size_t size, size_t nmemb, void *stream)
diff --git a/docs/examples/certinfo.c b/docs/examples/certinfo.c
index 1aee614ce..ee56f0e47 100644
--- a/docs/examples/certinfo.c
+++ b/docs/examples/certinfo.c
@@ -25,7 +25,7 @@
  */
 #include <stdio.h>
 
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 static size_t wrfu(void *ptr,  size_t  size,  size_t  nmemb,  void *stream)
 {
diff --git a/docs/examples/chkspeed.c b/docs/examples/chkspeed.c
index 0b0ba72a0..7a53ff3a4 100644
--- a/docs/examples/chkspeed.c
+++ b/docs/examples/chkspeed.c
@@ -38,7 +38,7 @@
 #include <string.h>
 #include <time.h>
 
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 #define URL_BASE "http://speedtest.your.domain/"
 #define URL_1M   URL_BASE "file_1M.bin"
diff --git a/docs/examples/cookie_interface.c b/docs/examples/cookie_interface.c
index 32e9a1d1e..f645f29e7 100644
--- a/docs/examples/cookie_interface.c
+++ b/docs/examples/cookie_interface.c
@@ -30,7 +30,7 @@
 #include <errno.h>
 #include <time.h>
 
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 static void
 print_cookies(CURL *curl)
diff --git a/docs/examples/crawler.c b/docs/examples/crawler.c
index 496d88c94..ec3c853fc 100644
--- a/docs/examples/crawler.c
+++ b/docs/examples/crawler.c
@@ -30,7 +30,7 @@ char *start_page = "https://www.reuters.com";
 #include <libxml/HTMLparser.h>
 #include <libxml/xpath.h>
 #include <libxml/uri.h>
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
diff --git a/docs/examples/curlgtk.c b/docs/examples/curlgtk.c
index 79e89acc6..eca0d659d 100644
--- a/docs/examples/curlgtk.c
+++ b/docs/examples/curlgtk.c
@@ -15,7 +15,7 @@
 #include <stdio.h>
 #include <gtk/gtk.h>
 
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 GtkWidget *Bar;
 
diff --git a/docs/examples/curlx.c b/docs/examples/curlx.c
index 49f52e614..73498272f 100644
--- a/docs/examples/curlx.c
+++ b/docs/examples/curlx.c
@@ -85,7 +85,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 #include <openssl/x509v3.h>
 #include <openssl/x509_vfy.h>
 #include <openssl/crypto.h>
diff --git a/docs/examples/debug.c b/docs/examples/debug.c
index 884184a5e..1a1c0c8cd 100644
--- a/docs/examples/debug.c
+++ b/docs/examples/debug.c
@@ -24,7 +24,7 @@
  * </DESC>
  */
 #include <stdio.h>
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 struct data {
   char trace_ascii; /* 1 or 0 */
diff --git a/docs/examples/ephiperfifo.c b/docs/examples/ephiperfifo.c
index 35991de77..9963399ac 100644
--- a/docs/examples/ephiperfifo.c
+++ b/docs/examples/ephiperfifo.c
@@ -71,7 +71,7 @@ callback.
 #include <time.h>
 #include <unistd.h>
 
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 #ifdef __GNUC__
 #define _Unused __attribute__((unused))
diff --git a/docs/examples/evhiperfifo.c b/docs/examples/evhiperfifo.c
index 6474e352c..5e0905560 100644
--- a/docs/examples/evhiperfifo.c
+++ b/docs/examples/evhiperfifo.c
@@ -67,7 +67,7 @@ callback.
 #include <time.h>
 #include <unistd.h>
 #include <sys/poll.h>
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 #include <ev.h>
 #include <fcntl.h>
 #include <sys/stat.h>
diff --git a/docs/examples/externalsocket.c b/docs/examples/externalsocket.c
index d89b041b4..516fa98b0 100644
--- a/docs/examples/externalsocket.c
+++ b/docs/examples/externalsocket.c
@@ -27,7 +27,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 #ifdef WIN32
 #include <windows.h>
diff --git a/docs/examples/fileupload.c b/docs/examples/fileupload.c
index 8128608c4..71692a524 100644
--- a/docs/examples/fileupload.c
+++ b/docs/examples/fileupload.c
@@ -24,7 +24,7 @@
  * </DESC>
  */
 #include <stdio.h>
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 
diff --git a/docs/examples/fopen.c b/docs/examples/fopen.c
index f1706fbe6..44be4618d 100644
--- a/docs/examples/fopen.c
+++ b/docs/examples/fopen.c
@@ -55,7 +55,7 @@
 #include <stdlib.h>
 #include <errno.h>
 
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 enum fcurl_type_e {
   CFTYPE_NONE = 0,
diff --git a/docs/examples/ftp-wildcard.c b/docs/examples/ftp-wildcard.c
index f249bc135..b10a0df74 100644
--- a/docs/examples/ftp-wildcard.c
+++ b/docs/examples/ftp-wildcard.c
@@ -23,7 +23,7 @@
  * FTP wildcard pattern matching
  * </DESC>
  */
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 #include <stdio.h>
 
 struct callback_data {
diff --git a/docs/examples/ftpget.c b/docs/examples/ftpget.c
index fc7ab4a39..68e655305 100644
--- a/docs/examples/ftpget.c
+++ b/docs/examples/ftpget.c
@@ -21,7 +21,7 @@
  ***************************************************************************/
 #include <stdio.h>
 
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 /* <DESC>
  * Get a single file from an FTP server.
diff --git a/docs/examples/ftpgetinfo.c b/docs/examples/ftpgetinfo.c
index 277e52b9d..aa3fe4c23 100644
--- a/docs/examples/ftpgetinfo.c
+++ b/docs/examples/ftpgetinfo.c
@@ -22,7 +22,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 /* <DESC>
  * Checks a single file's size and mtime from an FTP server.
diff --git a/docs/examples/ftpgetresp.c b/docs/examples/ftpgetresp.c
index 7dc344071..19723bc7b 100644
--- a/docs/examples/ftpgetresp.c
+++ b/docs/examples/ftpgetresp.c
@@ -21,7 +21,7 @@
  ***************************************************************************/
 #include <stdio.h>
 
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 /* <DESC>
  * Similar to ftpget.c but also stores the received response-lines
diff --git a/docs/examples/ftpsget.c b/docs/examples/ftpsget.c
index 91162e624..dedd347b1 100644
--- a/docs/examples/ftpsget.c
+++ b/docs/examples/ftpsget.c
@@ -22,7 +22,7 @@
 
 #include <stdio.h>
 
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 /* <DESC>
  * Get a single file from an FTPS server.
diff --git a/docs/examples/ftpupload.c b/docs/examples/ftpupload.c
index bd77bb1f3..3871f514a 100644
--- a/docs/examples/ftpupload.c
+++ b/docs/examples/ftpupload.c
@@ -22,7 +22,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
diff --git a/docs/examples/ftpuploadfrommem.c b/docs/examples/ftpuploadfrommem.c
index 134cda364..ed1ea80d5 100644
--- a/docs/examples/ftpuploadfrommem.c
+++ b/docs/examples/ftpuploadfrommem.c
@@ -25,7 +25,7 @@
  */
 #include <stdio.h>
 #include <string.h>
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 static const char data[]=
   "Lorem ipsum dolor sit amet, consectetur adipiscing elit. "
diff --git a/docs/examples/ftpuploadresume.c b/docs/examples/ftpuploadresume.c
index fc7f803d1..c966c76e9 100644
--- a/docs/examples/ftpuploadresume.c
+++ b/docs/examples/ftpuploadresume.c
@@ -26,7 +26,7 @@
 
 #include <stdlib.h>
 #include <stdio.h>
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 /* parse headers for Content-Length */
 static size_t getcontentlengthfunc(void *ptr, size_t size, size_t nmemb,
diff --git a/docs/examples/getinfo.c b/docs/examples/getinfo.c
index d5a820d1f..2438f2f97 100644
--- a/docs/examples/getinfo.c
+++ b/docs/examples/getinfo.c
@@ -24,7 +24,7 @@
  * </DESC>
  */
 #include <stdio.h>
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 int main(void)
 {
diff --git a/docs/examples/getinmemory.c b/docs/examples/getinmemory.c
index 130d821da..18c39f7b5 100644
--- a/docs/examples/getinmemory.c
+++ b/docs/examples/getinmemory.c
@@ -29,7 +29,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 struct MemoryStruct {
   char *memory;
diff --git a/docs/examples/getredirect.c b/docs/examples/getredirect.c
index 64157f9cd..a7f656d20 100644
--- a/docs/examples/getredirect.c
+++ b/docs/examples/getredirect.c
@@ -24,7 +24,7 @@
  * </DESC>
  */
 #include <stdio.h>
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 int main(void)
 {
diff --git a/docs/examples/ghiper.c b/docs/examples/ghiper.c
index cb013afd4..064b2fedb 100644
--- a/docs/examples/ghiper.c
+++ b/docs/examples/ghiper.c
@@ -61,7 +61,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <errno.h>
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 #define MSG_OUT g_print   /* Change to "g_error" to write to stderr */
 #define SHOW_VERBOSE 0    /* Set to non-zero for libcurl messages */
diff --git a/docs/examples/hiperfifo.c b/docs/examples/hiperfifo.c
index f3c1bbc73..bcdffa6d3 100644
--- a/docs/examples/hiperfifo.c
+++ b/docs/examples/hiperfifo.c
@@ -64,7 +64,7 @@ callback.
 #include <time.h>
 #include <unistd.h>
 #include <sys/poll.h>
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 #include <event2/event.h>
 #include <event2/event_struct.h>
 #include <fcntl.h>
diff --git a/docs/examples/href_extractor.c b/docs/examples/href_extractor.c
index aa2b43816..18c8ffdb2 100644
--- a/docs/examples/href_extractor.c
+++ b/docs/examples/href_extractor.c
@@ -30,7 +30,7 @@
  */
 
 #include <stdio.h>
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 #include <htmlstreamparser.h>
 
 
diff --git a/docs/examples/htmltidy.c b/docs/examples/htmltidy.c
index 2f4500f51..f1c636c58 100644
--- a/docs/examples/htmltidy.c
+++ b/docs/examples/htmltidy.c
@@ -30,7 +30,7 @@
 #include <stdio.h>
 #include <tidy.h>
 #include <tidybuffio.h>
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 /* curl write callback, to fill tidy's input buffer...  */
 uint write_cb(char *in, uint size, uint nmemb, TidyBuffer *out)
diff --git a/docs/examples/htmltitle.cpp b/docs/examples/htmltitle.cpp
index 8148888a4..33163fcd6 100644
--- a/docs/examples/htmltitle.cpp
+++ b/docs/examples/htmltitle.cpp
@@ -34,7 +34,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <string>
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 #include <libxml/HTMLparser.h>
 
 //
diff --git a/docs/examples/http-post.c b/docs/examples/http-post.c
index 017545271..bbcd5eb23 100644
--- a/docs/examples/http-post.c
+++ b/docs/examples/http-post.c
@@ -24,7 +24,7 @@
  * </DESC>
  */
 #include <stdio.h>
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 int main(void)
 {
diff --git a/docs/examples/http2-download.c b/docs/examples/http2-download.c
index b4358fb6e..febb89bb2 100644
--- a/docs/examples/http2-download.c
+++ b/docs/examples/http2-download.c
@@ -32,7 +32,7 @@
 #include <unistd.h>
 
 /* curl stuff */
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 #ifndef CURLPIPE_MULTIPLEX
 /* This little trick will just make sure that we don't enable pipelining for
diff --git a/docs/examples/http2-pushinmemory.c b/docs/examples/http2-pushinmemory.c
index 00406a8a5..b0e099bd8 100644
--- a/docs/examples/http2-pushinmemory.c
+++ b/docs/examples/http2-pushinmemory.c
@@ -32,7 +32,7 @@
 #include <unistd.h>
 
 /* curl stuff */
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 struct Memory {
   char *memory;
diff --git a/docs/examples/http2-serverpush.c b/docs/examples/http2-serverpush.c
index 63dff4cec..26d5a6927 100644
--- a/docs/examples/http2-serverpush.c
+++ b/docs/examples/http2-serverpush.c
@@ -32,7 +32,7 @@
 #include <unistd.h>
 
 /* curl stuff */
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 #ifndef CURLPIPE_MULTIPLEX
 #error "too old libcurl, can't do HTTP/2 server push!"
diff --git a/docs/examples/http2-upload.c b/docs/examples/http2-upload.c
index 45864cf3e..bdec19b4a 100644
--- a/docs/examples/http2-upload.c
+++ b/docs/examples/http2-upload.c
@@ -34,7 +34,7 @@
 #include <unistd.h>
 
 /* curl stuff */
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 #ifndef CURLPIPE_MULTIPLEX
 /* This little trick will just make sure that we don't enable pipelining for
diff --git a/docs/examples/httpcustomheader.c b/docs/examples/httpcustomheader.c
index 6712f8c66..d98aa7a5a 100644
--- a/docs/examples/httpcustomheader.c
+++ b/docs/examples/httpcustomheader.c
@@ -24,7 +24,7 @@
  * </DESC>
  */
 #include <stdio.h>
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 int main(void)
 {
diff --git a/docs/examples/httpput.c b/docs/examples/httpput.c
index 6be9b8dfe..8399dbfe7 100644
--- a/docs/examples/httpput.c
+++ b/docs/examples/httpput.c
@@ -26,7 +26,7 @@
 #include <stdio.h>
 #include <fcntl.h>
 #include <sys/stat.h>
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 /*
  * This example shows a HTTP PUT operation. PUTs a file given as a command
diff --git a/docs/examples/https.c b/docs/examples/https.c
index cca83fee5..342854467 100644
--- a/docs/examples/https.c
+++ b/docs/examples/https.c
@@ -24,7 +24,7 @@
  * </DESC>
  */
 #include <stdio.h>
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 int main(void)
 {
diff --git a/docs/examples/imap-append.c b/docs/examples/imap-append.c
index bbf9fe436..3cb3964e0 100644
--- a/docs/examples/imap-append.c
+++ b/docs/examples/imap-append.c
@@ -27,7 +27,7 @@
 
 #include <stdio.h>
 #include <string.h>
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 /* This is a simple example showing how to send mail using libcurl's IMAP
  * capabilities.
diff --git a/docs/examples/imap-copy.c b/docs/examples/imap-copy.c
index 1ef43f893..b24ffe026 100644
--- a/docs/examples/imap-copy.c
+++ b/docs/examples/imap-copy.c
@@ -26,7 +26,7 @@
  */
 
 #include <stdio.h>
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 /* This is a simple example showing how to copy a mail from one mailbox folder
  * to another using libcurl's IMAP capabilities.
diff --git a/docs/examples/imap-create.c b/docs/examples/imap-create.c
index 6f04453b2..caac825fa 100644
--- a/docs/examples/imap-create.c
+++ b/docs/examples/imap-create.c
@@ -26,7 +26,7 @@
  */
 
 #include <stdio.h>
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 /* This is a simple example showing how to create a new mailbox folder using
  * libcurl's IMAP capabilities.
diff --git a/docs/examples/imap-delete.c b/docs/examples/imap-delete.c
index cf1ae0bbf..a8066032c 100644
--- a/docs/examples/imap-delete.c
+++ b/docs/examples/imap-delete.c
@@ -26,7 +26,7 @@
  */
 
 #include <stdio.h>
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 /* This is a simple example showing how to delete an existing mailbox folder
  * using libcurl's IMAP capabilities.
diff --git a/docs/examples/imap-examine.c b/docs/examples/imap-examine.c
index b89e9dc6d..700943365 100644
--- a/docs/examples/imap-examine.c
+++ b/docs/examples/imap-examine.c
@@ -26,7 +26,7 @@
  */
 
 #include <stdio.h>
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 /* This is a simple example showing how to obtain information about a mailbox
  * folder using libcurl's IMAP capabilities via the EXAMINE command.
diff --git a/docs/examples/imap-fetch.c b/docs/examples/imap-fetch.c
index 192d2e9e8..30dfd39e4 100644
--- a/docs/examples/imap-fetch.c
+++ b/docs/examples/imap-fetch.c
@@ -26,7 +26,7 @@
  */
 
 #include <stdio.h>
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 /* This is a simple example showing how to fetch mail using libcurl's IMAP
  * capabilities.
diff --git a/docs/examples/imap-list.c b/docs/examples/imap-list.c
index 291e1e671..cdbb89fd3 100644
--- a/docs/examples/imap-list.c
+++ b/docs/examples/imap-list.c
@@ -26,7 +26,7 @@
  */
 
 #include <stdio.h>
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 /* This is a simple example showing how to list the folders within an IMAP
  * mailbox.
diff --git a/docs/examples/imap-lsub.c b/docs/examples/imap-lsub.c
index d130c3d51..3ad6157a0 100644
--- a/docs/examples/imap-lsub.c
+++ b/docs/examples/imap-lsub.c
@@ -26,7 +26,7 @@
  */
 
 #include <stdio.h>
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 /* This is a simple example showing how to list the subscribed folders within
  * an IMAP mailbox.
diff --git a/docs/examples/imap-multi.c b/docs/examples/imap-multi.c
index 07d1b8b5a..c1f429e14 100644
--- a/docs/examples/imap-multi.c
+++ b/docs/examples/imap-multi.c
@@ -27,7 +27,7 @@
 
 #include <stdio.h>
 #include <string.h>
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 /* This is a simple example showing how to fetch mail using libcurl's IMAP
  * capabilities. It builds on the imap-fetch.c example to demonstrate how to
diff --git a/docs/examples/imap-noop.c b/docs/examples/imap-noop.c
index 566890efa..098386657 100644
--- a/docs/examples/imap-noop.c
+++ b/docs/examples/imap-noop.c
@@ -26,7 +26,7 @@
  */
 
 #include <stdio.h>
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 /* This is a simple example showing how to perform a noop using libcurl's IMAP
  * capabilities.
diff --git a/docs/examples/imap-search.c b/docs/examples/imap-search.c
index 427dcc905..07f95d9a3 100644
--- a/docs/examples/imap-search.c
+++ b/docs/examples/imap-search.c
@@ -26,7 +26,7 @@
  */
 
 #include <stdio.h>
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 /* This is a simple example showing how to search for new messages using
  * libcurl's IMAP capabilities.
diff --git a/docs/examples/imap-ssl.c b/docs/examples/imap-ssl.c
index 69839adbe..9e1ff3405 100644
--- a/docs/examples/imap-ssl.c
+++ b/docs/examples/imap-ssl.c
@@ -26,7 +26,7 @@
  */
 
 #include <stdio.h>
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 /* This is a simple example showing how to fetch mail using libcurl's IMAP
  * capabilities. It builds on the imap-fetch.c example adding transport
diff --git a/docs/examples/imap-store.c b/docs/examples/imap-store.c
index 8479457b1..8d3fba50d 100644
--- a/docs/examples/imap-store.c
+++ b/docs/examples/imap-store.c
@@ -26,7 +26,7 @@
  */
 
 #include <stdio.h>
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 /* This is a simple example showing how to modify an existing mail using
  * libcurl's IMAP capabilities with the STORE command.
diff --git a/docs/examples/imap-tls.c b/docs/examples/imap-tls.c
index 7daa0bf35..0df1e63f4 100644
--- a/docs/examples/imap-tls.c
+++ b/docs/examples/imap-tls.c
@@ -26,7 +26,7 @@
  */
 
 #include <stdio.h>
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 /* This is a simple example showing how to fetch mail using libcurl's IMAP
  * capabilities. It builds on the imap-fetch.c example adding transport
diff --git a/docs/examples/multi-app.c b/docs/examples/multi-app.c
index 78867d835..a6a721778 100644
--- a/docs/examples/multi-app.c
+++ b/docs/examples/multi-app.c
@@ -33,7 +33,7 @@
 #include <unistd.h>
 
 /* curl stuff */
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 /*
  * Download a HTTP file and upload an FTP file simultaneously.
diff --git a/docs/examples/multi-debugcallback.c b/docs/examples/multi-debugcallback.c
index 59f72442a..32ea91491 100644
--- a/docs/examples/multi-debugcallback.c
+++ b/docs/examples/multi-debugcallback.c
@@ -32,7 +32,7 @@
 #include <unistd.h>
 
 /* curl stuff */
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 typedef char bool;
 #define TRUE 1
diff --git a/docs/examples/multi-double.c b/docs/examples/multi-double.c
index 644e64b13..b389b2e70 100644
--- a/docs/examples/multi-double.c
+++ b/docs/examples/multi-double.c
@@ -31,7 +31,7 @@
 #include <unistd.h>
 
 /* curl stuff */
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 /*
  * Simply download two HTTP files!
diff --git a/docs/examples/multi-formadd.c b/docs/examples/multi-formadd.c
index c1bb13557..96e4495f3 100644
--- a/docs/examples/multi-formadd.c
+++ b/docs/examples/multi-formadd.c
@@ -28,7 +28,7 @@
 #include <string.h>
 #include <sys/time.h>
 
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 int main(void)
 {
diff --git a/docs/examples/multi-post.c b/docs/examples/multi-post.c
index fe66ca901..2e12315cd 100644
--- a/docs/examples/multi-post.c
+++ b/docs/examples/multi-post.c
@@ -28,7 +28,7 @@
 #include <string.h>
 #include <sys/time.h>
 
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 int main(void)
 {
diff --git a/docs/examples/multi-single.c b/docs/examples/multi-single.c
index 530a5f501..6d63c2d23 100644
--- a/docs/examples/multi-single.c
+++ b/docs/examples/multi-single.c
@@ -32,7 +32,7 @@
 #include <unistd.h>
 
 /* curl stuff */
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 #ifdef _WIN32
 #define WAITMS(x) Sleep(x)
diff --git a/docs/examples/multi-uv.c b/docs/examples/multi-uv.c
index 8ca4b9096..a76201496 100644
--- a/docs/examples/multi-uv.c
+++ b/docs/examples/multi-uv.c
@@ -35,7 +35,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <uv.h>
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 uv_loop_t *loop;
 CURLM *curl_handle;
diff --git a/docs/examples/multithread.c b/docs/examples/multithread.c
index 83ed3f589..96365cd39 100644
--- a/docs/examples/multithread.c
+++ b/docs/examples/multithread.c
@@ -26,7 +26,7 @@
 
 #include <stdio.h>
 #include <pthread.h>
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 #define NUMT 4
 
diff --git a/docs/examples/parseurl.c b/docs/examples/parseurl.c
index ee427768f..d14174678 100644
--- a/docs/examples/parseurl.c
+++ b/docs/examples/parseurl.c
@@ -24,7 +24,7 @@
  * </DESC>
  */
 #include <stdio.h>
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 #if !CURL_AT_LEAST_VERSION(7, 62, 0)
 #error "this example requires curl 7.62.0 or later"
diff --git a/docs/examples/persistent.c b/docs/examples/persistent.c
index 723b68b8b..c5b289a44 100644
--- a/docs/examples/persistent.c
+++ b/docs/examples/persistent.c
@@ -25,7 +25,7 @@
  */
 #include <stdio.h>
 #include <unistd.h>
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 int main(void)
 {
diff --git a/docs/examples/pop3-dele.c b/docs/examples/pop3-dele.c
index 144978353..e316e1bb0 100644
--- a/docs/examples/pop3-dele.c
+++ b/docs/examples/pop3-dele.c
@@ -26,7 +26,7 @@
  */
 
 #include <stdio.h>
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 /* This is a simple example showing how to delete an existing mail using
  * libcurl's POP3 capabilities.
diff --git a/docs/examples/pop3-list.c b/docs/examples/pop3-list.c
index b530a0446..3b7ed9e5c 100644
--- a/docs/examples/pop3-list.c
+++ b/docs/examples/pop3-list.c
@@ -26,7 +26,7 @@
  */
 
 #include <stdio.h>
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 /* This is a simple example using libcurl's POP3 capabilities to list the
  * contents of a mailbox.
diff --git a/docs/examples/pop3-multi.c b/docs/examples/pop3-multi.c
index 4b8788667..e86084394 100644
--- a/docs/examples/pop3-multi.c
+++ b/docs/examples/pop3-multi.c
@@ -27,7 +27,7 @@
 
 #include <stdio.h>
 #include <string.h>
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 /* This is a simple example showing how to retrieve mail using libcurl's POP3
  * capabilities. It builds on the pop3-retr.c example to demonstrate how to use
diff --git a/docs/examples/pop3-noop.c b/docs/examples/pop3-noop.c
index bc162d0c9..867ac3828 100644
--- a/docs/examples/pop3-noop.c
+++ b/docs/examples/pop3-noop.c
@@ -26,7 +26,7 @@
  */
 
 #include <stdio.h>
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 /* This is a simple example showing how to perform a noop using libcurl's POP3
  * capabilities.
diff --git a/docs/examples/pop3-retr.c b/docs/examples/pop3-retr.c
index b36ddb55c..98ab5321c 100644
--- a/docs/examples/pop3-retr.c
+++ b/docs/examples/pop3-retr.c
@@ -26,7 +26,7 @@
  */
 
 #include <stdio.h>
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 /* This is a simple example showing how to retrieve mail using libcurl's POP3
  * capabilities.
diff --git a/docs/examples/pop3-ssl.c b/docs/examples/pop3-ssl.c
index f0d4e269d..20389d732 100644
--- a/docs/examples/pop3-ssl.c
+++ b/docs/examples/pop3-ssl.c
@@ -26,7 +26,7 @@
  */
 
 #include <stdio.h>
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 /* This is a simple example showing how to retrieve mail using libcurl's POP3
  * capabilities. It builds on the pop3-retr.c example adding transport
diff --git a/docs/examples/pop3-stat.c b/docs/examples/pop3-stat.c
index 46a0a451c..d6dbe4b23 100644
--- a/docs/examples/pop3-stat.c
+++ b/docs/examples/pop3-stat.c
@@ -26,7 +26,7 @@
  */
 
 #include <stdio.h>
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 /* This is a simple example showing how to obtain message statistics using
  * libcurl's POP3 capabilities.
diff --git a/docs/examples/pop3-tls.c b/docs/examples/pop3-tls.c
index 1a6c447a5..381f94268 100644
--- a/docs/examples/pop3-tls.c
+++ b/docs/examples/pop3-tls.c
@@ -26,7 +26,7 @@
  */
 
 #include <stdio.h>
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 /* This is a simple example showing how to retrieve mail using libcurl's POP3
  * capabilities. It builds on the pop3-retr.c example adding transport
diff --git a/docs/examples/pop3-top.c b/docs/examples/pop3-top.c
index 4f5937fd4..c9ffd1f22 100644
--- a/docs/examples/pop3-top.c
+++ b/docs/examples/pop3-top.c
@@ -26,7 +26,7 @@
  */
 
 #include <stdio.h>
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 /* This is a simple example showing how to retrieve only the headers of a mail
  * using libcurl's POP3 capabilities.
diff --git a/docs/examples/pop3-uidl.c b/docs/examples/pop3-uidl.c
index f127120e4..7d87508d5 100644
--- a/docs/examples/pop3-uidl.c
+++ b/docs/examples/pop3-uidl.c
@@ -26,7 +26,7 @@
  */
 
 #include <stdio.h>
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 /* This is a simple example using libcurl's POP3 capabilities to list the
  * contents of a mailbox by unique ID.
diff --git a/docs/examples/post-callback.c b/docs/examples/post-callback.c
index ebb4e2a25..324767bc1 100644
--- a/docs/examples/post-callback.c
+++ b/docs/examples/post-callback.c
@@ -25,7 +25,7 @@
  */
 #include <stdio.h>
 #include <string.h>
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 /* silly test data to POST */
 static const char data[]="Lorem ipsum dolor sit amet, consectetur adipiscing "
diff --git a/docs/examples/postinmemory.c b/docs/examples/postinmemory.c
index 376f33450..22014abc9 100644
--- a/docs/examples/postinmemory.c
+++ b/docs/examples/postinmemory.c
@@ -26,7 +26,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 struct MemoryStruct {
   char *memory;
diff --git a/docs/examples/postit2-formadd.c b/docs/examples/postit2-formadd.c
index a501ce964..dd2bd9660 100644
--- a/docs/examples/postit2-formadd.c
+++ b/docs/examples/postit2-formadd.c
@@ -40,7 +40,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 int main(int argc, char *argv[])
 {
diff --git a/docs/examples/postit2.c b/docs/examples/postit2.c
index 2808f7a4e..81d61c489 100644
--- a/docs/examples/postit2.c
+++ b/docs/examples/postit2.c
@@ -40,7 +40,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 int main(int argc, char *argv[])
 {
diff --git a/docs/examples/progressfunc.c b/docs/examples/progressfunc.c
index 86ad0d9ca..fd366cf2f 100644
--- a/docs/examples/progressfunc.c
+++ b/docs/examples/progressfunc.c
@@ -25,7 +25,7 @@
  * </DESC>
  */
 #include <stdio.h>
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 #if LIBCURL_VERSION_NUM >= 0x073d00
 /* In libcurl 7.61.0, support was added for extracting the time in plain
diff --git a/docs/examples/resolve.c b/docs/examples/resolve.c
index c3b52d6f0..5f9a58166 100644
--- a/docs/examples/resolve.c
+++ b/docs/examples/resolve.c
@@ -25,7 +25,7 @@
  * </DESC>
  */
 #include <stdio.h>
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 int main(void)
 {
diff --git a/docs/examples/rtsp.c b/docs/examples/rtsp.c
index 75b5d396c..bf4a219aa 100644
--- a/docs/examples/rtsp.c
+++ b/docs/examples/rtsp.c
@@ -56,7 +56,7 @@ static int _getch(void)
 }
 #endif
 
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 #define VERSION_STR  "V1.0"
 
diff --git a/docs/examples/sampleconv.c b/docs/examples/sampleconv.c
index 7bfaa51c6..e6272de19 100644
--- a/docs/examples/sampleconv.c
+++ b/docs/examples/sampleconv.c
@@ -40,7 +40,7 @@
  */
 
 #include <stdio.h>
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 static CURLcode my_conv_from_ascii_to_ebcdic(char *buffer, size_t length)
 {
diff --git a/docs/examples/sendrecv.c b/docs/examples/sendrecv.c
index cf764be43..d564c2532 100644
--- a/docs/examples/sendrecv.c
+++ b/docs/examples/sendrecv.c
@@ -26,7 +26,7 @@
 
 #include <stdio.h>
 #include <string.h>
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 /* Auxiliary function that waits on the socket. */
 static int wait_on_socket(curl_socket_t sockfd, int for_recv, long timeout_ms)
diff --git a/docs/examples/sepheaders.c b/docs/examples/sepheaders.c
index 8f3a5ff0f..548433135 100644
--- a/docs/examples/sepheaders.c
+++ b/docs/examples/sepheaders.c
@@ -27,7 +27,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 static size_t write_data(void *ptr, size_t size, size_t nmemb, void *stream)
 {
diff --git a/docs/examples/sessioninfo.c b/docs/examples/sessioninfo.c
index 86a813a04..b1dd94ed7 100644
--- a/docs/examples/sessioninfo.c
+++ b/docs/examples/sessioninfo.c
@@ -29,7 +29,7 @@
 
 #include <stdio.h>
 
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 #include <gnutls/gnutls.h>
 
 static CURL *curl;
diff --git a/docs/examples/sftpget.c b/docs/examples/sftpget.c
index e5a74b9ec..14230e95c 100644
--- a/docs/examples/sftpget.c
+++ b/docs/examples/sftpget.c
@@ -26,7 +26,7 @@
 
 #include <stdio.h>
 
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 /* define this to switch off the use of ssh-agent in this program */
 #undef DISABLE_SSH_AGENT
diff --git a/docs/examples/sftpuploadresume.c b/docs/examples/sftpuploadresume.c
index 98f3b62f0..4e070fb35 100644
--- a/docs/examples/sftpuploadresume.c
+++ b/docs/examples/sftpuploadresume.c
@@ -26,7 +26,7 @@
 
 #include <stdlib.h>
 #include <stdio.h>
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 /* read data to upload */
 static size_t readfunc(void *ptr, size_t size, size_t nmemb, void *stream)
diff --git a/docs/examples/shared-connection-cache.c b/docs/examples/shared-connection-cache.c
index 91864d9b2..da1270377 100644
--- a/docs/examples/shared-connection-cache.c
+++ b/docs/examples/shared-connection-cache.c
@@ -24,7 +24,7 @@
  * </DESC>
  */
 #include <stdio.h>
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 static void my_lock(CURL *handle, curl_lock_data data,
                     curl_lock_access laccess, void *useptr)
diff --git a/docs/examples/simple.c b/docs/examples/simple.c
index c61227054..6296b0ef0 100644
--- a/docs/examples/simple.c
+++ b/docs/examples/simple.c
@@ -24,7 +24,7 @@
  * </DESC>
  */
 #include <stdio.h>
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 int main(void)
 {
diff --git a/docs/examples/simplepost.c b/docs/examples/simplepost.c
index 8ec537b54..b4d3a0b9c 100644
--- a/docs/examples/simplepost.c
+++ b/docs/examples/simplepost.c
@@ -25,7 +25,7 @@
  */
 #include <stdio.h>
 #include <string.h>
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 int main(void)
 {
diff --git a/docs/examples/simplessl.c b/docs/examples/simplessl.c
index fdc7cf15c..7b6a2b71b 100644
--- a/docs/examples/simplessl.c
+++ b/docs/examples/simplessl.c
@@ -25,7 +25,7 @@
  */
 #include <stdio.h>
 
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 /* some requirements for this to work:
    1.   set pCertFile to the file with the client certificate
diff --git a/docs/examples/smooth-gtk-thread.c b/docs/examples/smooth-gtk-thread.c
index 5a4f18fd9..95478fd15 100644
--- a/docs/examples/smooth-gtk-thread.c
+++ b/docs/examples/smooth-gtk-thread.c
@@ -39,7 +39,7 @@
 #include <unistd.h>
 #include <pthread.h>
 
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 #define NUMT 4
 
diff --git a/docs/examples/smtp-expn.c b/docs/examples/smtp-expn.c
index fb0ed1d12..88383c669 100644
--- a/docs/examples/smtp-expn.c
+++ b/docs/examples/smtp-expn.c
@@ -27,7 +27,7 @@
 
 #include <stdio.h>
 #include <string.h>
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 /* This is a simple example showing how to expand an e-mail mailing list.
  *
diff --git a/docs/examples/smtp-mail.c b/docs/examples/smtp-mail.c
index 3285b3184..89a9fd5cd 100644
--- a/docs/examples/smtp-mail.c
+++ b/docs/examples/smtp-mail.c
@@ -27,7 +27,7 @@
 
 #include <stdio.h>
 #include <string.h>
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 /*
  * For an SMTP example using the multi interface please see smtp-multi.c.
diff --git a/docs/examples/smtp-mime.c b/docs/examples/smtp-mime.c
index 35997fa0e..38a0a06d7 100644
--- a/docs/examples/smtp-mime.c
+++ b/docs/examples/smtp-mime.c
@@ -27,7 +27,7 @@
 
 #include <stdio.h>
 #include <string.h>
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 /* This is a simple example showing how to send mime mail using libcurl's SMTP
  * capabilities. For an example of using the multi interface please see
diff --git a/docs/examples/smtp-multi.c b/docs/examples/smtp-multi.c
index bd70bdbc5..a58f3282f 100644
--- a/docs/examples/smtp-multi.c
+++ b/docs/examples/smtp-multi.c
@@ -26,7 +26,7 @@
  */
 
 #include <string.h>
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 /* This is an example showing how to send mail using libcurl's SMTP
  * capabilities. It builds on the smtp-mail.c example to demonstrate how to use
diff --git a/docs/examples/smtp-ssl.c b/docs/examples/smtp-ssl.c
index 019da7d09..dff450eea 100644
--- a/docs/examples/smtp-ssl.c
+++ b/docs/examples/smtp-ssl.c
@@ -27,7 +27,7 @@
 
 #include <stdio.h>
 #include <string.h>
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 /* This is a simple example showing how to send mail using libcurl's SMTP
  * capabilities. It builds on the smtp-mail.c example to add authentication
diff --git a/docs/examples/smtp-tls.c b/docs/examples/smtp-tls.c
index 671a80d09..ffc0e504b 100644
--- a/docs/examples/smtp-tls.c
+++ b/docs/examples/smtp-tls.c
@@ -27,7 +27,7 @@
 
 #include <stdio.h>
 #include <string.h>
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 /* This is a simple example showing how to send mail using libcurl's SMTP
  * capabilities. It builds on the smtp-mail.c example to add authentication
diff --git a/docs/examples/smtp-vrfy.c b/docs/examples/smtp-vrfy.c
index 4e0623fb8..4f99d95be 100644
--- a/docs/examples/smtp-vrfy.c
+++ b/docs/examples/smtp-vrfy.c
@@ -27,7 +27,7 @@
 
 #include <stdio.h>
 #include <string.h>
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 /* This is a simple example showing how to verify an e-mail address from an
  * SMTP server.
diff --git a/docs/examples/sslbackend.c b/docs/examples/sslbackend.c
index c1489a9aa..6fc078181 100644
--- a/docs/examples/sslbackend.c
+++ b/docs/examples/sslbackend.c
@@ -29,7 +29,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 /*
  * An SSL-enabled libcurl is required for this sample to work (at least one
diff --git a/docs/examples/synctime.c b/docs/examples/synctime.c
index d84cea913..82a0742f4 100644
--- a/docs/examples/synctime.c
+++ b/docs/examples/synctime.c
@@ -93,7 +93,7 @@
 #include <winsock2.h>
 #include <windows.h>
 #endif
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 
 #define MAX_STRING              256
diff --git a/docs/examples/threaded-shared-conn.c b/docs/examples/threaded-shared-conn.c
index e238b952e..3babdaad5 100644
--- a/docs/examples/threaded-shared-conn.c
+++ b/docs/examples/threaded-shared-conn.c
@@ -35,7 +35,7 @@
 
 #include <stdio.h>
 #include <pthread.h>
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 /*
   URL to fetch. If you select HTTPS, you need to use a TLS backend with mutex
diff --git a/docs/examples/threaded-ssl.c b/docs/examples/threaded-ssl.c
index adf46292a..280e1c1af 100644
--- a/docs/examples/threaded-ssl.c
+++ b/docs/examples/threaded-ssl.c
@@ -38,7 +38,7 @@
 
 #include <stdio.h>
 #include <pthread.h>
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 #define NUMT 4
 
diff --git a/docs/examples/url2file.c b/docs/examples/url2file.c
index 1bede8c18..4d7511ba4 100644
--- a/docs/examples/url2file.c
+++ b/docs/examples/url2file.c
@@ -27,7 +27,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 static size_t write_data(void *ptr, size_t size, size_t nmemb, void *stream)
 {
diff --git a/docs/examples/urlapi.c b/docs/examples/urlapi.c
index 594f9420d..fcddfda57 100644
--- a/docs/examples/urlapi.c
+++ b/docs/examples/urlapi.c
@@ -24,7 +24,7 @@
  * </DESC>
  */
 #include <stdio.h>
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 #if !CURL_AT_LEAST_VERSION(7, 62, 0)
 #error "this example requires curl 7.62.0 or later"
diff --git a/docs/examples/usercertinmem.c b/docs/examples/usercertinmem.c
index 40505b0c0..47740dc65 100644
--- a/docs/examples/usercertinmem.c
+++ b/docs/examples/usercertinmem.c
@@ -32,7 +32,7 @@
 #include <openssl/ssl.h>
 #include <openssl/x509.h>
 #include <openssl/pem.h>
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 #include <stdio.h>
 
 static size_t writefunction(void *ptr, size_t size, size_t nmemb, void *stream)
diff --git a/docs/examples/version-check.pl b/docs/examples/version-check.pl
index 8f734fc75..a6e7874e3 100755
--- a/docs/examples/version-check.pl
+++ b/docs/examples/version-check.pl
@@ -36,7 +36,7 @@
 #    version-check.pl [source file]
 #
 
-open(S, "<../libcurl/symbols-in-versions") || die;
+open(S, "<../libgnurl/symbols-in-versions") || die;
 
 my %doc;
 my %rem;
diff --git a/docs/examples/xmlstream.c b/docs/examples/xmlstream.c
index 8036e480d..8b5b29e79 100644
--- a/docs/examples/xmlstream.c
+++ b/docs/examples/xmlstream.c
@@ -37,7 +37,7 @@
 #include <assert.h>
 
 #include <expat.h>
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 struct MemoryStruct {
   char *memory;
diff --git a/docs/curl-config.1 b/docs/gnurl-config.1
index 4a23e6a92..4a23e6a92 100644
--- a/docs/curl-config.1
+++ b/docs/gnurl-config.1
diff --git a/docs/gnurl.1 b/docs/gnurl.1
new file mode 100644
index 000000000..797b848f0
--- /dev/null
+++ b/docs/gnurl.1
@@ -0,0 +1,2700 @@
+.\" **************************************************************************
+.\" *                                  _   _ ____  _
+.\" *  Project                     ___| | | |  _ \| |
+.\" *                             / __| | | | |_) | |
+.\" *                            | (__| |_| |  _ <| |___
+.\" *                             \___|\___/|_| \_\_____|
+.\" *
+.\" * Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al.
+.\" *
+.\" * This software is licensed as described in the file COPYING, which
+.\" * you should have received as part of this distribution. The terms
+.\" * are also available at https://curl.haxx.se/docs/copyright.html.
+.\" *
+.\" * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+.\" * copies of the Software, and permit persons to whom the Software is
+.\" * furnished to do so, under the terms of the COPYING file.
+.\" *
+.\" * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+.\" * KIND, either express or implied.
+.\" *
+.\" **************************************************************************
+.\"
+.\" DO NOT EDIT. Generated by the curl project gen.pl man page generator.
+.\"
+.TH curl 1 "16 Dec 2016" "Curl 7.52.0" "Curl Manual"
+.SH NAME
+curl \- transfer a URL
+.SH SYNOPSIS
+.B curl [options]
+.I [URL...]
+.SH DESCRIPTION
+.B curl
+is a tool to transfer data from or to a server, using one of the supported
+protocols (DICT, FILE, FTP, FTPS, GOPHER, HTTP, HTTPS, IMAP, IMAPS, LDAP,
+LDAPS, POP3, POP3S, RTMP, RTSP, SCP, SFTP, SMB, SMBS, SMTP, SMTPS, TELNET
+and TFTP). The command is designed to work without user interaction.
+
+curl offers a busload of useful tricks like proxy support, user
+authentication, FTP upload, HTTP post, SSL connections, cookies, file transfer
+resume, Metalink, and more. As you will see below, the number of features will
+make your head spin!
+
+curl is powered by libcurl for all transfer-related features. See
+\fIlibcurl(3)\fP for details.
+.SH URL
+The URL syntax is protocol-dependent. You'll find a detailed description in
+RFC 3986.
+
+You can specify multiple URLs or parts of URLs by writing part sets within
+braces as in:
+
+  http://site.{one,two,three}.com
+
+or you can get sequences of alphanumeric series by using [] as in:
+
+  ftp://ftp.example.com/file[1-100].txt
+
+  ftp://ftp.example.com/file[001-100].txt    (with leading zeros)
+
+  ftp://ftp.example.com/file[a-z].txt
+
+Nested sequences are not supported, but you can use several ones next to each
+other:
+
+  http://example.com/archive[1996-1999]/vol[1-4]/part{a,b,c}.html
+
+You can specify any amount of URLs on the command line. They will be fetched
+in a sequential manner in the specified order.
+
+You can specify a step counter for the ranges to get every Nth number or
+letter:
+
+  http://example.com/file[1-100:10].txt
+
+  http://example.com/file[a-z:2].txt
+
+When using [] or {} sequences when invoked from a command line prompt, you
+probably have to put the full URL within double quotes to avoid the shell from
+interfering with it. This also goes for other characters treated special, like
+for example '&', '?' and '*'.
+
+Provide the IPv6 zone index in the URL with an escaped percentage sign and the
+interface name. Like in
+
+  http://[fe80::3%25eth0]/
+
+If you specify URL without protocol:// prefix, curl will attempt to guess what
+protocol you might want. It will then default to HTTP but try other protocols
+based on often-used host name prefixes. For example, for host names starting
+with "ftp." curl will assume you want to speak FTP.
+
+curl will do its best to use what you pass to it as a URL. It is not trying to
+validate it as a syntactically correct URL by any means but is instead
+\fBvery\fP liberal with what it accepts.
+
+curl will attempt to re-use connections for multiple file transfers, so that
+getting many files from the same server will not do multiple connects /
+handshakes. This improves speed. Of course this is only done on files
+specified on a single command line and cannot be used between separate curl
+invokes.
+.SH "PROGRESS METER"
+curl normally displays a progress meter during operations, indicating the
+amount of transferred data, transfer speeds and estimated time left, etc. The
+progress meter displays number of bytes and the speeds are in bytes per
+second. The suffixes (k, M, G, T, P) are 1024 based. For example 1k is 1024
+bytes. 1M is 1048576 bytes.
+
+curl displays this data to the terminal by default, so if you invoke curl to
+do an operation and it is about to write data to the terminal, it
+\fIdisables\fP the progress meter as otherwise it would mess up the output
+mixing progress meter and response data.
+
+If you want a progress meter for HTTP POST or PUT requests, you need to
+redirect the response output to a file, using shell redirect (>), \fI-o, --output\fP or
+similar.
+
+It is not the same case for FTP upload as that operation does not spit out
+any response data to the terminal.
+
+If you prefer a progress "bar" instead of the regular meter, \fI-#, --progress-bar\fP is
+your friend. You can also disable the progress meter completely with the
+\fI-s, --silent\fP option.
+.SH OPTIONS
+Options start with one or two dashes. Many of the options require an
+additional value next to them.
+
+The short "single-dash" form of the options, -d for example, may be used with
+or without a space between it and its value, although a space is a recommended
+separator. The long "double-dash" form, \fI-d, --data\fP for example, requires a space
+between it and its value.
+
+Short version options that don't need any additional values can be used
+immediately next to each other, like for example you can specify all the
+options -O, -L and -v at once as -OLv.
+
+In general, all boolean options are enabled with --\fBoption\fP and yet again
+disabled with --\fBno-\fPoption. That is, you use the exact same option name
+but prefix it with "no-". However, in this list we mostly only list and show
+the --option version of them. (This concept with --no options was added in
+7.19.0. Previously most options were toggled on/off on repeated use of the
+same command line option.)
+.IP "--abstract-unix-socket <path>"
+(HTTP) Connect through an abstract Unix domain socket, instead of using the network.
+Note: netstat shows the path of an abstract socket prefixed with '@', however
+the <path> argument should not have this leading character.
+
+Added in 7.53.0.
+.IP "--anyauth"
+(HTTP) Tells curl to figure out authentication method by itself, and use the most
+secure one the remote site claims to support. This is done by first doing a
+request and checking the response-headers, thus possibly inducing an extra
+network round-trip. This is used instead of setting a specific authentication
+method, which you can do with \fI--basic\fP, \fI--digest\fP, \fI--ntlm\fP, and \fI--negotiate\fP.
+
+Using \fI--anyauth\fP is not recommended if you do uploads from stdin, since it may
+require data to be sent twice and then the client must be able to rewind. If
+the need should arise when uploading from stdin, the upload operation will
+fail.
+
+Used together with \fI-u, --user\fP.
+
+See also \fI--proxy-anyauth\fP and \fI--basic\fP and \fI--digest\fP.
+.IP "-a, --append"
+(FTP SFTP) When used in an upload, this makes curl append to the target file instead of
+overwriting it. If the remote file doesn't exist, it will be created.  Note
+that this flag is ignored by some SFTP servers (including OpenSSH).
+.IP "--basic"
+(HTTP) Tells curl to use HTTP Basic authentication with the remote host. This is the
+default and this option is usually pointless, unless you use it to override a
+previously set option that sets a different authentication method (such as
+\fI--ntlm\fP, \fI--digest\fP, or \fI--negotiate\fP).
+
+Used together with \fI-u, --user\fP.
+
+See also \fI--proxy-basic\fP.
+.IP "--cacert <CA certificate>"
+(TLS) Tells curl to use the specified certificate file to verify the peer. The file
+may contain multiple CA certificates. The certificate(s) must be in PEM
+format. Normally curl is built to use a default file for this, so this option
+is typically used to alter that default file.
+
+curl recognizes the environment variable named 'CURL_CA_BUNDLE' if it is
+set, and uses the given path as a path to a CA cert bundle. This option
+overrides that variable.
+
+The windows version of curl will automatically look for a CA certs file named
+\'curl-ca-bundle.crt\', either in the same directory as curl.exe, or in the
+Current Working Directory, or in any folder along your PATH.
+
+If curl is built against the NSS SSL library, the NSS PEM PKCS#11 module
+(libnsspem.so) needs to be available for this option to work properly.
+
+(iOS and macOS only) If curl is built against Secure Transport, then this
+option is supported for backward compatibility with other SSL engines, but it
+should not be set. If the option is not set, then curl will use the
+certificates in the system and user Keychain to verify the peer, which is the
+preferred method of verifying the peer's certificate chain.
+
+If this option is used several times, the last one will be used.
+.IP "--capath <dir>"
+(TLS) Tells curl to use the specified certificate directory to verify the
+peer. Multiple paths can be provided by separating them with ":" (e.g.
+\&"path1:path2:path3"). The certificates must be in PEM format, and if curl is
+built against OpenSSL, the directory must have been processed using the
+c_rehash utility supplied with OpenSSL. Using \fI--capath\fP can allow
+OpenSSL-powered curl to make SSL-connections much more efficiently than using
+\fI--cacert\fP if the --cacert file contains many CA certificates.
+
+If this option is set, the default capath value will be ignored, and if it is
+used several times, the last one will be used.
+.IP "--cert-status"
+(TLS) Tells curl to verify the status of the server certificate by using the
+Certificate Status Request (aka. OCSP stapling) TLS extension.
+
+If this option is enabled and the server sends an invalid (e.g. expired)
+response, if the response suggests that the server certificate has been revoked,
+or no response at all is received, the verification fails.
+
+This is currently only implemented in the OpenSSL, GnuTLS and NSS backends.
+
+Added in 7.41.0.
+.IP "--cert-type <type>"
+(TLS) Tells curl what certificate type the provided certificate is in. PEM, DER and
+ENG are recognized types.  If not specified, PEM is assumed.
+
+If this option is used several times, the last one will be used.
+
+See also \fI-E, --cert\fP and \fI--key\fP and \fI--key-type\fP.
+.IP "-E, --cert <certificate[:password]>"
+(TLS) Tells curl to use the specified client certificate file when getting a file
+with HTTPS, FTPS or another SSL-based protocol. The certificate must be in
+PKCS#12 format if using Secure Transport, or PEM format if using any other
+engine.  If the optional password isn't specified, it will be queried for on
+the terminal. Note that this option assumes a \&"certificate" file that is the
+private key and the client certificate concatenated! See \fI-E, --cert\fP and \fI--key\fP to
+specify them independently.
+
+If curl is built against the NSS SSL library then this option can tell
+curl the nickname of the certificate to use within the NSS database defined
+by the environment variable SSL_DIR (or by default /etc/pki/nssdb). If the
+NSS PEM PKCS#11 module (libnsspem.so) is available then PEM files may be
+loaded. If you want to use a file from the current directory, please precede
+it with "./" prefix, in order to avoid confusion with a nickname.  If the
+nickname contains ":", it needs to be preceded by "\\" so that it is not
+recognized as password delimiter.  If the nickname contains "\\", it needs to
+be escaped as "\\\\" so that it is not recognized as an escape character.
+
+(iOS and macOS only) If curl is built against Secure Transport, then the
+certificate string can either be the name of a certificate/private key in the
+system or user keychain, or the path to a PKCS#12-encoded certificate and
+private key. If you want to use a file from the current directory, please
+precede it with "./" prefix, in order to avoid confusion with a nickname.
+
+If this option is used several times, the last one will be used.
+
+See also \fI--cert-type\fP and \fI--key\fP and \fI--key-type\fP.
+.IP "--ciphers <list of ciphers>"
+(TLS) Specifies which ciphers to use in the connection. The list of ciphers must
+specify valid ciphers. Read up on SSL cipher list details on this URL:
+
+
+ https://curl.haxx.se/docs/ssl-ciphers.html
+
+If this option is used several times, the last one will be used.
+.IP "--compressed"
+(HTTP) Request a compressed response using one of the algorithms curl supports, and
+save the uncompressed document.  If this option is used and the server sends
+an unsupported encoding, curl will report an error.
+.IP "-K, --config <file>"
+Specify which config file to read curl arguments from. The config file is a
+text file in which command line arguments can be written which then will be
+used as if they were written on the actual command line.
+
+Options and their parameters must be specified on the same config file line,
+separated by whitespace, colon, or the equals sign. Long option names can
+optionally be given in the config file without the initial double dashes and
+if so, the colon or equals characters can be used as separators. If the option
+is specified with one or two dashes, there can be no colon or equals character
+between the option and its parameter.
+
+If the parameter is to contain whitespace, the parameter must be enclosed
+within quotes. Within double quotes, the following escape sequences are
+available: \\\\, \\", \\t, \\n, \\r and \\v. A backslash preceding any other
+letter is ignored. If the first column of a config line is a '#' character,
+the rest of the line will be treated as a comment. Only write one option per
+physical line in the config file.
+
+Specify the filename to \fI-K, --config\fP as '-' to make curl read the file from stdin.
+
+Note that to be able to specify a URL in the config file, you need to specify
+it using the \fI--url\fP option, and not by simply writing the URL on its own
+line. So, it could look similar to this:
+
+url = "https://curl.haxx.se/docs/"
+
+When curl is invoked, it always (unless \fI-q, --disable\fP is used) checks for a
+default config file and uses it if found. The default config file is checked
+for in the following places in this order:
+
+1) curl tries to find the "home dir": It first checks for the CURL_HOME and
+then the HOME environment variables. Failing that, it uses getpwuid() on
+Unix-like systems (which returns the home dir given the current user in your
+system). On Windows, it then checks for the APPDATA variable, or as a last
+resort the '%USERPROFILE%\\Application Data'.
+
+2) On windows, if there is no _curlrc file in the home dir, it checks for one
+in the same dir the curl executable is placed. On Unix-like systems, it will
+simply try to load .curlrc from the determined home dir.
+
+.nf
+# --- Example file ---
+# this is a comment
+url = "example.com"
+output = "curlhere.html"
+user-agent = "superagent/1.0"
+
+# and fetch another URL too
+url = "example.com/docs/manpage.html"
+-O
+referer = "http://nowhereatall.example.com/"
+# --- End of example file ---
+.fi
+
+This option can be used multiple times to load multiple config files.
+.IP "--connect-timeout <seconds>"
+Maximum time in seconds that you allow curl's connection to take.  This only
+limits the connection phase, so if curl connects within the given period it
+will continue - if not it will exit.  Since version 7.32.0, this option
+accepts decimal values.
+
+If this option is used several times, the last one will be used.
+
+See also \fI-m, --max-time\fP.
+.IP "--connect-to <HOST1:PORT1:HOST2:PORT2>"
+
+For a request to the given HOST:PORT pair, connect to
+CONNECT-TO-HOST:CONNECT-TO-PORT instead.  This option is suitable to direct
+requests at a specific server, e.g. at a specific cluster node in a cluster of
+servers.  This option is only used to establish the network connection. It
+does NOT affect the hostname/port that is used for TLS/SSL (e.g. SNI,
+certificate verification) or for the application protocols.  "host" and "port"
+may be the empty string, meaning "any host/port".  "connect-to-host" and
+"connect-to-port" may also be the empty string, meaning "use the request's
+original host/port".
+
+This option can be used many times to add many connect rules.
+
+See also \fI--resolve\fP and \fI-H, --header\fP. Added in 7.49.0.
+.IP "-C, --continue-at <offset>"
+Continue/Resume a previous file transfer at the given offset. The given offset
+is the exact number of bytes that will be skipped, counting from the beginning
+of the source file before it is transferred to the destination.  If used with
+uploads, the FTP server command SIZE will not be used by curl.
+
+Use "-C -" to tell curl to automatically find out where/how to resume the
+transfer. It then uses the given output/input files to figure that out.
+
+If this option is used several times, the last one will be used.
+
+See also \fI-r, --range\fP.
+.IP "-c, --cookie-jar <filename>"
+(HTTP) Specify to which file you want curl to write all cookies after a completed
+operation. Curl writes all cookies from its in-memory cookie storage to the
+given file at the end of operations. If no cookies are known, no data will be
+written. The file will be written using the Netscape cookie file format. If
+you set the file name to a single dash, "-", the cookies will be written to
+stdout.
+
+This command line option will activate the cookie engine that makes curl
+record and use cookies. Another way to activate it is to use the \fI-b, --cookie\fP
+option.
+
+If the cookie jar can't be created or written to, the whole curl operation
+won't fail or even report an error clearly. Using \fI-v, --verbose\fP will get a warning
+displayed, but that is the only visible feedback you get about this possibly
+lethal situation.
+
+If this option is used several times, the last specified file name will be
+used.
+.IP "-b, --cookie <data>"
+(HTTP) Pass the data to the HTTP server in the Cookie header. It is supposedly
+the data previously received from the server in a "Set-Cookie:" line.  The
+data should be in the format "NAME1=VALUE1; NAME2=VALUE2".
+
+If no '=' symbol is used in the argument, it is instead treated as a filename
+to read previously stored cookie from. This option also activates the cookie
+engine which will make curl record incoming cookies, which may be handy if
+you're using this in combination with the \fI-L, --location\fP option or do multiple URL
+transfers on the same invoke.
+
+The file format of the file to read cookies from should be plain HTTP headers
+(Set-Cookie style) or the Netscape/Mozilla cookie file format.
+
+The file specified with \fI-b, --cookie\fP is only used as input. No cookies will be
+written to the file. To store cookies, use the \fI-c, --cookie-jar\fP option.
+
+Exercise caution if you are using this option and multiple transfers may
+occur.  If you use the NAME1=VALUE1; format, or in a file use the Set-Cookie
+format and don't specify a domain, then the cookie is sent for any domain
+(even after redirects are followed) and cannot be modified by a server-set
+cookie. If the cookie engine is enabled and a server sets a cookie of the same
+name then both will be sent on a future transfer to that server, likely not
+what you intended.  To address these issues set a domain in Set-Cookie (doing
+that will include sub domains) or use the Netscape format.
+
+If this option is used several times, the last one will be used.
+
+Users very often want to both read cookies from a file and write updated
+cookies back to a file, so using both \fI-b, --cookie\fP and \fI-c, --cookie-jar\fP in the same
+command line is common.
+.IP "--create-dirs"
+When used in conjunction with the \fI-o, --output\fP option, curl will create the
+necessary local directory hierarchy as needed. This option creates the dirs
+mentioned with the \fI-o, --output\fP option, nothing else. If the --output file name
+uses no dir or if the dirs it mentions already exist, no dir will be created.
+
+To create remote directories when using FTP or SFTP, try \fI--ftp-create-dirs\fP.
+.IP "--crlf"
+(FTP SMTP) Convert LF to CRLF in upload. Useful for MVS (OS/390).
+
+(SMTP added in 7.40.0)
+.IP "--crlfile <file>"
+(TLS) Provide a file using PEM format with a Certificate Revocation List that may
+specify peer certificates that are to be considered revoked.
+
+If this option is used several times, the last one will be used.
+
+Added in 7.19.7.
+.IP "--data-ascii <data>"
+(HTTP) This is just an alias for \fI-d, --data\fP.
+.IP "--data-binary <data>"
+(HTTP) This posts data exactly as specified with no extra processing whatsoever.
+
+If you start the data with the letter @, the rest should be a filename.  Data
+is posted in a similar manner as \fI-d, --data\fP does, except that newlines and
+carriage returns are preserved and conversions are never done.
+
+If this option is used several times, the ones following the first will append
+data as described in \fI-d, --data\fP.
+.IP "--data-raw <data>"
+(HTTP) This posts data similarly to \fI-d, --data\fP but without the special
+interpretation of the @ character.
+
+See also \fI-d, --data\fP. Added in 7.43.0.
+.IP "--data-urlencode <data>"
+(HTTP) This posts data, similar to the other \fI-d, --data\fP options with the exception
+that this performs URL-encoding.
+
+To be CGI-compliant, the <data> part should begin with a \fIname\fP followed
+by a separator and a content specification. The <data> part can be passed to
+curl using one of the following syntaxes:
+.RS
+.IP "content"
+This will make curl URL-encode the content and pass that on. Just be careful
+so that the content doesn't contain any = or @ symbols, as that will then make
+the syntax match one of the other cases below!
+.IP "=content"
+This will make curl URL-encode the content and pass that on. The preceding =
+symbol is not included in the data.
+.IP "name=content"
+This will make curl URL-encode the content part and pass that on. Note that
+the name part is expected to be URL-encoded already.
+.IP "@filename"
+This will make curl load data from the given file (including any newlines),
+URL-encode that data and pass it on in the POST.
+.IP "name@filename"
+This will make curl load data from the given file (including any newlines),
+URL-encode that data and pass it on in the POST. The name part gets an equal
+sign appended, resulting in \fIname=urlencoded-file-content\fP. Note that the
+name is expected to be URL-encoded already.
+.RE
+
+See also \fI-d, --data\fP and \fI--data-raw\fP. Added in 7.18.0.
+.IP "-d, --data <data>"
+(HTTP) Sends the specified data in a POST request to the HTTP server, in the same way
+that a browser does when a user has filled in an HTML form and presses the
+submit button. This will cause curl to pass the data to the server using the
+content-type application/x-www-form-urlencoded.  Compare to \fI-F, --form\fP.
+
+\fI--data-raw\fP is almost the same but does not have a special interpretation of
+the @ character. To post data purely binary, you should instead use the
+\fI--data-binary\fP option.  To URL-encode the value of a form field you may use
+\fI--data-urlencode\fP.
+
+If any of these options is used more than once on the same command line, the
+data pieces specified will be merged together with a separating
+&-symbol. Thus, using '-d name=daniel -d skill=lousy' would generate a post
+chunk that looks like \&'name=daniel&skill=lousy'.
+
+If you start the data with the letter @, the rest should be a file name to
+read the data from, or - if you want curl to read the data from
+stdin. Multiple files can also be specified. Posting data from a file named
+'foobar' would thus be done with \fI-d, --data\fP @foobar. When --data is told to read
+from a file like that, carriage returns and newlines will be stripped out. If
+you don't want the @ character to have a special interpretation use \fI--data-raw\fP
+instead.
+
+See also \fI--data-binary\fP and \fI--data-urlencode\fP and \fI--data-raw\fP. This option overrides \fI-F, --form\fP and \fI-I, --head\fP and \fI--upload\fP.
+.IP "--delegation <LEVEL>"
+(GSS/kerberos) Set LEVEL to tell the server what it is allowed to delegate when it
+comes to user credentials.
+.RS
+.IP "none"
+Don't allow any delegation.
+.IP "policy"
+Delegates if and only if the OK-AS-DELEGATE flag is set in the Kerberos
+service ticket, which is a matter of realm policy.
+.IP "always"
+Unconditionally allow the server to delegate.
+.RE
+.IP "--digest"
+(HTTP) Enables HTTP Digest authentication. This is an authentication scheme that
+prevents the password from being sent over the wire in clear text. Use this in
+combination with the normal \fI-u, --user\fP option to set user name and password.
+
+If this option is used several times, only the first one is used.
+
+See also \fI-u, --user\fP and \fI--proxy-digest\fP and \fI--anyauth\fP. This option overrides \fI--basic\fP and \fI--ntlm\fP and \fI--negotiate\fP.
+.IP "--disable-eprt"
+(FTP) Tell curl to disable the use of the EPRT and LPRT commands when doing active
+FTP transfers. Curl will normally always first attempt to use EPRT, then LPRT
+before using PORT, but with this option, it will use PORT right away. EPRT and
+LPRT are extensions to the original FTP protocol, and may not work on all
+servers, but they enable more functionality in a better way than the
+traditional PORT command.
+
+--eprt can be used to explicitly enable EPRT again and --no-eprt is an alias
+for \fI--disable-eprt\fP.
+
+If the server is accessed using IPv6, this option will have no effect as EPRT
+is necessary then.
+
+Disabling EPRT only changes the active behavior. If you want to switch to
+passive mode you need to not use \fI-P, --ftp-port\fP or force it with \fI--ftp-pasv\fP.
+.IP "--disable-epsv"
+(FTP) (FTP) Tell curl to disable the use of the EPSV command when doing passive FTP
+transfers. Curl will normally always first attempt to use EPSV before PASV,
+but with this option, it will not try using EPSV.
+
+--epsv can be used to explicitly enable EPSV again and --no-epsv is an alias
+for \fI--disable-epsv\fP.
+
+If the server is an IPv6 host, this option will have no effect as EPSV is
+necessary then.
+
+Disabling EPSV only changes the passive behavior. If you want to switch to
+active mode you need to use \fI-P, --ftp-port\fP.
+.IP "-q, --disable"
+If used as the first parameter on the command line, the \fIcurlrc\fP config
+file will not be read and used. See the \fI-K, --config\fP for details on the default
+config file search path.
+.IP "--dns-interface <interface>"
+(DNS) Tell curl to send outgoing DNS requests through <interface>. This option is a
+counterpart to \fI--interface\fP (which does not affect DNS). The supplied string
+must be an interface name (not an address).
+
+See also \fI--dns-ipv4-addr\fP and \fI--dns-ipv6-addr\fP. \fI--dns-interface\fP requires that the underlying libcurl was built to support c-ares. Added in 7.33.0.
+.IP "--dns-ipv4-addr <address>"
+(DNS) Tell curl to bind to <ip-address> when making IPv4 DNS requests, so that
+the DNS requests originate from this address. The argument should be a
+single IPv4 address.
+
+See also \fI--dns-interface\fP and \fI--dns-ipv6-addr\fP. \fI--dns-ipv4-addr\fP requires that the underlying libcurl was built to support c-ares. Added in 7.33.0.
+.IP "--dns-ipv6-addr <address>"
+(DNS) Tell curl to bind to <ip-address> when making IPv6 DNS requests, so that
+the DNS requests originate from this address. The argument should be a
+single IPv6 address.
+
+See also \fI--dns-interface\fP and \fI--dns-ipv4-addr\fP. \fI--dns-ipv6-addr\fP requires that the underlying libcurl was built to support c-ares. Added in 7.33.0.
+.IP "--dns-servers <addresses>"
+Set the list of DNS servers to be used instead of the system default.
+The list of IP addresses should be separated with commas. Port numbers
+may also optionally be given as \fI:<port-number>\fP after each IP
+address.
+
+\fI--dns-servers\fP requires that the underlying libcurl was built to support c-ares. Added in 7.33.0.
+.IP "-D, --dump-header <filename>"
+(HTTP FTP) Write the received protocol headers to the specified file.
+
+This option is handy to use when you want to store the headers that an HTTP
+site sends to you. Cookies from the headers could then be read in a second
+curl invocation by using the \fI-b, --cookie\fP option! The \fI-c, --cookie-jar\fP option is a
+better way to store cookies.
+
+When used in FTP, the FTP server response lines are considered being "headers"
+and thus are saved there.
+
+If this option is used several times, the last one will be used.
+
+See also \fI-o, --output\fP.
+.IP "--egd-file <file>"
+(TLS) Specify the path name to the Entropy Gathering Daemon socket. The socket is
+used to seed the random engine for SSL connections.
+
+See also \fI--random-file\fP.
+.IP "--engine <name>"
+(TLS) Select the OpenSSL crypto engine to use for cipher operations. Use \fI--engine\fP
+list to print a list of build-time supported engines. Note that not all (or
+none) of the engines may be available at run-time.
+.IP "--environment"
+Sets a range of environment variables, using the names the \fI-w, --write-out\fP option
+supports, to allow easier extraction of useful information after having run
+curl.
+
+\fI--environment\fP requires that the underlying libcurl was built to support RISC OS.
+.IP "--expect100-timeout <seconds>"
+(HTTP) Maximum time in seconds that you allow curl to wait for a 100-continue
+response when curl emits an Expects: 100-continue header in its request. By
+default curl will wait one second. This option accepts decimal values! When
+curl stops waiting, it will continue as if the response has been received.
+
+See also \fI--connect-timeout\fP. Added in 7.47.0.
+.IP "--fail-early"
+Fail and exit on first detected error.
+
+When curl is used to do multiple transfers on the command line, it will
+attempt to operate on each given URL, one by one. By default, it will ignore
+errors if there are more URLs given and the last URL's success will determine
+the error code curl returns. So early failures will be "hidden" by subsequent
+successful transfers.
+
+Using this option, curl will instead return an error on the first transfers
+that fails, independent on the amount of more URLs that are given on the
+command line. This way, no transfer failures go undetected by scripts and
+similar.
+
+This option will apply for all given URLs even if you use \fI-:, --next\fP.
+
+Added in 7.52.0.
+.IP "-f, --fail"
+(HTTP) Fail silently (no output at all) on server errors. This is mostly done to
+better enable scripts etc to better deal with failed attempts. In normal cases
+when an HTTP server fails to deliver a document, it returns an HTML document
+stating so (which often also describes why and more). This flag will prevent
+curl from outputting that and return error 22.
+
+This method is not fail-safe and there are occasions where non-successful
+response codes will slip through, especially when authentication is involved
+(response codes 401 and 407).
+.IP "--false-start"
+(TLS) Tells curl to use false start during the TLS handshake. False start is a mode
+where a TLS client will start sending application data before verifying the
+server's Finished message, thus saving a round trip when performing a full
+handshake.
+
+This is currently only implemented in the NSS and Secure Transport (on iOS 7.0
+or later, or OS X 10.9 or later) backends.
+
+Added in 7.42.0.
+.IP "--form-string <name=string>"
+(HTTP) Similar to \fI-F, --form\fP except that the value string for the named parameter is used
+literally. Leading \&'@' and \&'<' characters, and the \&';type=' string in
+the value have no special meaning. Use this in preference to \fI-F, --form\fP if
+there's any possibility that the string value may accidentally trigger the
+\&'@' or \&'<' features of \fI-F, --form\fP.
+
+See also \fI-F, --form\fP.
+.IP "-F, --form <name=content>"
+(HTTP) This lets curl emulate a filled-in form in which a user has pressed the submit
+button. This causes curl to POST data using the Content-Type
+multipart/form-data according to RFC 2388. This enables uploading of binary
+files etc. To force the 'content' part to be a file, prefix the file name with
+an @ sign. To just get the content part from a file, prefix the file name with
+the symbol <. The difference between @ and < is then that @ makes a file get
+attached in the post as a file upload, while the < makes a text field and just
+get the contents for that text field from a file.
+
+Example: to send an image to a server, where \&'profile' is the name of the
+form-field to which portrait.jpg will be the input:
+
+ curl -F profile=@portrait.jpg https://example.com/upload.cgi
+
+To read content from stdin instead of a file, use - as the filename. This goes
+for both @ and < constructs. Unfortunately it does not support reading the
+file from a named pipe or similar, as it needs the full size before the
+transfer starts.
+
+You can also tell curl what Content-Type to use by using 'type=', in a manner
+similar to:
+
+ curl -F "web=@index.html;type=text/html" example.com
+
+or
+
+ curl -F "name=daniel;type=text/foo" example.com
+
+You can also explicitly change the name field of a file upload part by setting
+filename=, like this:
+
+ curl -F "file=@localfile;filename=nameinpost" example.com
+
+If filename/path contains ',' or ';', it must be quoted by double-quotes like:
+
+ curl -F "file=@\\"localfile\\";filename=\\"nameinpost\\"" example.com
+
+or
+
+ curl -F 'file=@"localfile";filename="nameinpost"' example.com
+
+Note that if a filename/path is quoted by double-quotes, any double-quote
+or backslash within the filename must be escaped by backslash.
+
+See further examples and details in the MANUAL.
+
+This option can be used multiple times.
+
+This option overrides \fI-d, --data\fP and \fI-I, --head\fP and \fI--upload\fP.
+.IP "--ftp-account <data>"
+(FTP) When an FTP server asks for "account data" after user name and password has
+been provided, this data is sent off using the ACCT command.
+
+If this option is used several times, the last one will be used.
+
+Added in 7.13.0.
+.IP "--ftp-alternative-to-user <command>"
+(FTP) If authenticating with the USER and PASS commands fails, send this command.
+When connecting to Tumbleweed's Secure Transport server over FTPS using a
+client certificate, using "SITE AUTH" will tell the server to retrieve the
+username from the certificate.
+
+Added in 7.15.5.
+.IP "--ftp-create-dirs"
+(FTP SFTP) When an FTP or SFTP URL/operation uses a path that doesn't currently exist on
+the server, the standard behavior of curl is to fail. Using this option, curl
+will instead attempt to create missing directories.
+
+See also \fI--create-dirs\fP.
+.IP "--ftp-method <method>"
+(FTP) Control what method curl should use to reach a file on an FTP(S)
+server. The method argument should be one of the following alternatives:
+.RS
+.IP multicwd
+curl does a single CWD operation for each path part in the given URL. For deep
+hierarchies this means very many commands. This is how RFC 1738 says it should
+be done. This is the default but the slowest behavior.
+.IP nocwd
+curl does no CWD at all. curl will do SIZE, RETR, STOR etc and give a full
+path to the server for all these commands. This is the fastest behavior.
+.IP singlecwd
+curl does one CWD with the full target directory and then operates on the file
+\&"normally" (like in the multicwd case). This is somewhat more standards
+compliant than 'nocwd' but without the full penalty of 'multicwd'.
+.RE
+
+Added in 7.15.1.
+.IP "--ftp-pasv"
+(FTP) Use passive mode for the data connection. Passive is the internal default
+behavior, but using this option can be used to override a previous \fI-P, --ftp-port\fP
+option.
+
+If this option is used several times, only the first one is used. Undoing an
+enforced passive really isn't doable but you must then instead enforce the
+correct \fI-P, --ftp-port\fP again.
+
+Passive mode means that curl will try the EPSV command first and then PASV,
+unless \fI--disable-epsv\fP is used.
+
+See also \fI--disable-epsv\fP. Added in 7.11.0.
+.IP "-P, --ftp-port <address>"
+(FTP) Reverses the default initiator/listener roles when connecting with FTP. This
+option makes curl use active mode. curl then tells the server to connect back
+to the client's specified address and port, while passive mode asks the server
+to setup an IP address and port for it to connect to. <address> should be one
+of:
+.RS
+.IP interface
+i.e "eth0" to specify which interface's IP address you want to use (Unix only)
+.IP "IP address"
+i.e "192.168.10.1" to specify the exact IP address
+.IP "host name"
+i.e "my.host.domain" to specify the machine
+.IP "-"
+make curl pick the same IP address that is already used for the control
+connection
+.RE
+
+If this option is used several times, the last one will be used. Disable the
+use of PORT with \fI--ftp-pasv\fP. Disable the attempt to use the EPRT command
+instead of PORT by using \fI--disable-eprt\fP. EPRT is really PORT++.
+
+Since 7.19.5, you can append \&":[start]-[end]\&" to the right of the address,
+to tell curl what TCP port range to use. That means you specify a port range,
+from a lower to a higher number. A single number works as well, but do note
+that it increases the risk of failure since the port may not be available.
+
+See also \fI--ftp-pasv\fP and \fI--disable-eprt\fP.
+.IP "--ftp-pret"
+(FTP) Tell curl to send a PRET command before PASV (and EPSV). Certain FTP servers,
+mainly drftpd, require this non-standard command for directory listings as
+well as up and downloads in PASV mode.
+
+Added in 7.20.0.
+.IP "--ftp-skip-pasv-ip"
+(FTP) Tell curl to not use the IP address the server suggests in its response
+to curl's PASV command when curl connects the data connection. Instead curl
+will re-use the same IP address it already uses for the control
+connection.
+
+This option has no effect if PORT, EPRT or EPSV is used instead of PASV.
+
+See also \fI--ftp-pasv\fP. Added in 7.14.2.
+.IP "--ftp-ssl-ccc-mode <active/passive>"
+(FTP) Sets the CCC mode. The passive mode will not initiate the shutdown, but
+instead wait for the server to do it, and will not reply to the shutdown from
+the server. The active mode initiates the shutdown and waits for a reply from
+the server.
+
+See also \fI--ftp-ssl-ccc\fP. Added in 7.16.2.
+.IP "--ftp-ssl-ccc"
+(FTP) Use CCC (Clear Command Channel) Shuts down the SSL/TLS layer after
+authenticating. The rest of the control channel communication will be
+unencrypted. This allows NAT routers to follow the FTP transaction. The
+default mode is passive.
+
+See also \fI--ssl\fP and \fI--ftp-ssl-ccc-mode\fP. Added in 7.16.1.
+.IP "--ftp-ssl-control"
+(FTP) Require SSL/TLS for the FTP login, clear for transfer.  Allows secure
+authentication, but non-encrypted data transfers for efficiency.  Fails the
+transfer if the server doesn't support SSL/TLS.
+
+Added in 7.16.0.
+.IP "-G, --get"
+When used, this option will make all data specified with \fI-d, --data\fP, \fI--data-binary\fP
+or \fI--data-urlencode\fP to be used in an HTTP GET request instead of the POST
+request that otherwise would be used. The data will be appended to the URL
+with a '?' separator.
+
+If used in combination with \fI-I, --head\fP, the POST data will instead be appended to
+the URL with a HEAD request.
+
+If this option is used several times, only the first one is used. This is
+because undoing a GET doesn't make sense, but you should then instead enforce
+the alternative method you prefer.
+.IP "-g, --globoff"
+This option switches off the "URL globbing parser". When you set this option,
+you can specify URLs that contain the letters {}[] without having them being
+interpreted by curl itself. Note that these letters are not normal legal URL
+contents but they should be encoded according to the URI standard.
+.IP "-I, --head"
+(HTTP FTP FILE) Fetch the headers only! HTTP-servers feature the command HEAD which this uses
+to get nothing but the header of a document. When used on an FTP or FILE file,
+curl displays the file size and last modification time only.
+.IP "-H, --header <header>"
+(HTTP) 
+Extra header to include in the request when sending HTTP to a server. You may
+specify any number of extra headers. Note that if you should add a custom
+header that has the same name as one of the internal ones curl would use, your
+externally set header will be used instead of the internal one. This allows
+you to make even trickier stuff than curl would normally do. You should not
+replace internally set headers without knowing perfectly well what you're
+doing. Remove an internal header by giving a replacement without content on
+the right side of the colon, as in: -H \&"Host:". If you send the custom
+header with no-value then its header must be terminated with a semicolon, such
+as \-H \&"X-Custom-Header;" to send "X-Custom-Header:".
+
+curl will make sure that each header you add/replace is sent with the proper
+end-of-line marker, you should thus \fBnot\fP add that as a part of the header
+content: do not add newlines or carriage returns, they will only mess things up
+for you.
+
+See also the \fI-A, --user-agent\fP and \fI-e, --referer\fP options.
+
+Starting in 7.37.0, you need \fI--proxy-header\fP to send custom headers intended
+for a proxy.
+
+Example:
+
+ curl -H "X-First-Name: Joe" http://example.com/
+
+\fBWARNING\fP: headers set with this option will be set in all requests - even
+after redirects are followed, like when told with \fI-L, --location\fP. This can lead to
+the header being sent to other hosts than the original host, so sensitive
+headers should be used with caution combined with following redirects.
+
+This option can be used multiple times to add/replace/remove multiple headers.
+.IP "-h, --help"
+Usage help. This lists all current command line options with a short
+description.
+.IP "--hostpubmd5 <md5>"
+(SFTP SCP) Pass a string containing 32 hexadecimal digits. The string should
+be the 128 bit MD5 checksum of the remote host's public key, curl will refuse
+the connection with the host unless the md5sums match.
+
+Added in 7.17.1.
+.IP "-0, --http1.0"
+(HTTP) Tells curl to use HTTP version 1.0 instead of using its internally preferred
+HTTP version.
+
+This option overrides \fI--http1.1\fP and \fI--http2\fP.
+.IP "--http1.1"
+(HTTP) Tells curl to use HTTP version 1.1.
+
+This option overrides \fI-0, --http1.0\fP and \fI--http2\fP. Added in 7.33.0.
+.IP "--http2-prior-knowledge"
+(HTTP) Tells curl to issue its non-TLS HTTP requests using HTTP/2 without HTTP/1.1
+Upgrade. It requires prior knowledge that the server supports HTTP/2 straight
+away. HTTPS requests will still do HTTP/2 the standard way with negotiated
+protocol version in the TLS handshake.
+
+\fI--http2-prior-knowledge\fP requires that the underlying libcurl was built to support HTTP/2. This option overrides \fI--http1.1\fP and \fI-0, --http1.0\fP and \fI--http2\fP. Added in 7.49.0.
+.IP "--http2"
+(HTTP) Tells curl to use HTTP version 2.
+
+See also \fI--no-alpn\fP. \fI--http2\fP requires that the underlying libcurl was built to support HTTP/2. This option overrides \fI--http1.1\fP and \fI-0, --http1.0\fP and \fI--http2-prior-knowledge\fP. Added in 7.33.0.
+.IP "--ignore-content-length"
+(FTP HTTP) For HTTP, Ignore the Content-Length header. This is particularly useful for
+servers running Apache 1.x, which will report incorrect Content-Length for
+files larger than 2 gigabytes.
+
+For FTP (since 7.46.0), skip the RETR command to figure out the size before
+downloading a file.
+.IP "-i, --include"
+Include the HTTP-header in the output. The HTTP-header includes things like
+server-name, date of the document, HTTP-version and more...
+
+See also \fI-v, --verbose\fP.
+.IP "-k, --insecure"
+(TLS) This option explicitly allows curl to perform "insecure" SSL connections and
+transfers. All SSL connections are attempted to be made secure by using the CA
+certificate bundle installed by default. This makes all connections considered
+\&"insecure" fail unless \fI-k, --insecure\fP is used.
+
+See this online resource for further details:
+ https://curl.haxx.se/docs/sslcerts.html
+.IP "--interface <name>"
+
+Perform an operation using a specified interface. You can enter interface
+name, IP address or host name. An example could look like:
+
+ curl --interface eth0:1 https://www.example.com/
+
+If this option is used several times, the last one will be used.
+
+See also \fI--dns-interface\fP.
+.IP "-4, --ipv4"
+This option tells curl to resolve names to IPv4 addresses only, and not for
+example try IPv6.
+
+See also \fI--http1.1\fP and \fI--http2\fP. This option overrides \fI-6, --ipv6\fP.
+.IP "-6, --ipv6"
+This option tells curl to resolve names to IPv6 addresses only, and not for
+example try IPv4.
+
+See also \fI--http1.1\fP and \fI--http2\fP. This option overrides \fI-6, --ipv6\fP.
+.IP "-j, --junk-session-cookies"
+(HTTP) When curl is told to read cookies from a given file, this option will make it
+discard all "session cookies". This will basically have the same effect as if
+a new session is started. Typical browsers always discard session cookies when
+they're closed down.
+
+See also \fI-b, --cookie\fP and \fI-c, --cookie-jar\fP.
+.IP "--keepalive-time <seconds>"
+This option sets the time a connection needs to remain idle before sending
+keepalive probes and the time between individual keepalive probes. It is
+currently effective on operating systems offering the TCP_KEEPIDLE and
+TCP_KEEPINTVL socket options (meaning Linux, recent AIX, HP-UX and more). This
+option has no effect if \fI--no-keepalive\fP is used.
+
+If this option is used several times, the last one will be used. If
+unspecified, the option defaults to 60 seconds.
+
+Added in 7.18.0.
+.IP "--key-type <type>"
+(TLS) Private key file type. Specify which type your \fI--key\fP provided private key
+is. DER, PEM, and ENG are supported. If not specified, PEM is assumed.
+
+If this option is used several times, the last one will be used.
+.IP "--key <key>"
+(TLS SSH) Private key file name. Allows you to provide your private key in this separate
+file. For SSH, if not specified, curl tries the following candidates in order:
+'~/.ssh/id_rsa', '~/.ssh/id_dsa', './id_rsa', './id_dsa'.
+
+If this option is used several times, the last one will be used.
+.IP "--krb <level>"
+(FTP) Enable Kerberos authentication and use. The level must be entered and should
+be one of 'clear', 'safe', 'confidential', or 'private'. Should you use a
+level that is not one of these, 'private' will instead be used.
+
+If this option is used several times, the last one will be used.
+
+\fI--krb\fP requires that the underlying libcurl was built to support Kerberos.
+.IP "--libcurl <file>"
+Append this option to any ordinary curl command line, and you will get a
+libcurl-using C source code written to the file that does the equivalent
+of what your command-line operation does!
+
+If this option is used several times, the last given file name will be
+used.
+
+Added in 7.16.1.
+.IP "--limit-rate <speed>"
+Specify the maximum transfer rate you want curl to use - for both downloads
+and uploads. This feature is useful if you have a limited pipe and you'd like
+your transfer not to use your entire bandwidth. To make it slower than it
+otherwise would be.
+
+The given speed is measured in bytes/second, unless a suffix is appended.
+Appending 'k' or 'K' will count the number as kilobytes, 'm' or M' makes it
+megabytes, while 'g' or 'G' makes it gigabytes. Examples: 200K, 3m and 1G.
+
+If you also use the \fI-Y, --speed-limit\fP option, that option will take precedence and
+might cripple the rate-limiting slightly, to help keeping the speed-limit
+logic working.
+
+If this option is used several times, the last one will be used.
+.IP "-l, --list-only"
+(FTP POP3) (FTP)
+When listing an FTP directory, this switch forces a name-only view. This is
+especially useful if the user wants to machine-parse the contents of an FTP
+directory since the normal directory view doesn't use a standard look or
+format. When used like this, the option causes a NLST command to be sent to
+the server instead of LIST.
+
+Note: Some FTP servers list only files in their response to NLST; they do not
+include sub-directories and symbolic links.
+
+(POP3)
+When retrieving a specific email from POP3, this switch forces a LIST command
+to be performed instead of RETR. This is particularly useful if the user wants
+to see if a specific message id exists on the server and what size it is.
+
+Note: When combined with \fI-X, --request\fP, this option can be used to send an UIDL
+command instead, so the user may use the email's unique identifier rather than
+it's message id to make the request.
+
+Added in 7.21.5.
+.IP "--local-port <num/range>"
+Set a preferred single number or range (FROM-TO) of local port numbers to use
+for the connection(s).  Note that port numbers by nature are a scarce resource
+that will be busy at times so setting this range to something too narrow might
+cause unnecessary connection setup failures.
+
+Added in 7.15.2.
+.IP "--location-trusted"
+(HTTP) Like \fI-L, --location\fP, but will allow sending the name + password to all hosts that
+the site may redirect to. This may or may not introduce a security breach if
+the site redirects you to a site to which you'll send your authentication info
+(which is plaintext in the case of HTTP Basic authentication).
+
+See also \fI-u, --user\fP.
+.IP "-L, --location"
+(HTTP) If the server reports that the requested page has moved to a different
+location (indicated with a Location: header and a 3XX response code), this
+option will make curl redo the request on the new place. If used together with
+\fI-i, --include\fP or \fI-I, --head\fP, headers from all requested pages will be shown. When
+authentication is used, curl only sends its credentials to the initial
+host. If a redirect takes curl to a different host, it won't be able to
+intercept the user+password. See also \fI--location-trusted\fP on how to change
+this. You can limit the amount of redirects to follow by using the
+\fI--max-redirs\fP option.
+
+When curl follows a redirect and the request is not a plain GET (for example
+POST or PUT), it will do the following request with a GET if the HTTP response
+was 301, 302, or 303. If the response code was any other 3xx code, curl will
+re-send the following request using the same unmodified method.
+
+You can tell curl to not change the non-GET request method to GET after a 30x
+response by using the dedicated options for that: \fI--post301\fP, \fI--post302\fP and
+\fI--post303\fP.
+.IP "--login-options <options>"
+(IMAP POP3 SMTP) Specify the login options to use during server authentication.
+
+You can use the login options to specify protocol specific options that may
+be used during authentication. At present only IMAP, POP3 and SMTP support
+login options. For more information about the login options please see
+RFC 2384, RFC 5092 and IETF draft draft-earhart-url-smtp-00.txt
+
+If this option is used several times, the last one will be used.
+
+Added in 7.34.0.
+.IP "--mail-auth <address>"
+(SMTP) Specify a single address. This will be used to specify the authentication
+address (identity) of a submitted message that is being relayed to another
+server.
+
+See also \fI--mail-rcpt\fP and \fI--mail-from\fP. Added in 7.25.0.
+.IP "--mail-from <address>"
+(SMTP) Specify a single address that the given mail should get sent from.
+
+See also \fI--mail-rcpt\fP and \fI--mail-auth\fP. Added in 7.20.0.
+.IP "--mail-rcpt <address>"
+(SMTP) Specify a single address, user name or mailing list name. Repeat this
+option several times to send to multiple recipients.
+
+When performing a mail transfer, the recipient should specify a valid email
+address to send the mail to.
+
+When performing an address verification (VRFY command), the recipient should be
+specified as the user name or user name and domain (as per Section 3.5 of
+RFC5321). (Added in 7.34.0)
+
+When performing a mailing list expand (EXPN command), the recipient should be
+specified using the mailing list name, such as "Friends" or "London-Office".
+(Added in 7.34.0)
+
+Added in 7.20.0.
+.IP "-M, --manual"
+Manual. Display the huge help text.
+.IP "--max-filesize <bytes>"
+Specify the maximum size (in bytes) of a file to download. If the file
+requested is larger than this value, the transfer will not start and curl will
+return with exit code 63.
+
+\fBNOTE:\fP The file size is not always known prior to download, and for such
+files this option has no effect even if the file transfer ends up being larger
+than this given limit. This concerns both FTP and HTTP transfers.
+
+See also \fI--limit-rate\fP.
+.IP "--max-redirs <num>"
+(HTTP) Set maximum number of redirection-followings allowed. When \fI-L, --location\fP is used,
+is used to prevent curl from following redirections \&"in absurdum". By
+default, the limit is set to 50 redirections. Set this option to -1 to make it
+unlimited.
+
+If this option is used several times, the last one will be used.
+.IP "-m, --max-time <time>"
+Maximum time in seconds that you allow the whole operation to take.  This is
+useful for preventing your batch jobs from hanging for hours due to slow
+networks or links going down.  Since 7.32.0, this option accepts decimal
+values, but the actual timeout will decrease in accuracy as the specified
+timeout increases in decimal precision.
+
+If this option is used several times, the last one will be used.
+
+See also \fI--connect-timeout\fP.
+.IP "--metalink"
+This option can tell curl to parse and process a given URI as Metalink file
+(both version 3 and 4 (RFC 5854) are supported) and make use of the mirrors
+listed within for failover if there are errors (such as the file or server not
+being available). It will also verify the hash of the file after the download
+completes. The Metalink file itself is downloaded and processed in memory and
+not stored in the local file system.
+
+Example to use a remote Metalink file:
+
+ curl --metalink http://www.example.com/example.metalink
+
+To use a Metalink file in the local file system, use FILE protocol (file://):
+
+ curl --metalink file://example.metalink
+
+Please note that if FILE protocol is disabled, there is no way to use a local
+Metalink file at the time of this writing. Also note that if \fI--metalink\fP and
+\fI-i, --include\fP are used together, --include will be ignored. This is because
+including headers in the response will break Metalink parser and if the
+headers are included in the file described in Metalink file, hash check will
+fail.
+
+
+\fI--metalink\fP requires that the underlying libcurl was built to support metalink. Added in 7.27.0.
+.IP "--negotiate"
+(HTTP) Enables Negotiate (SPNEGO) authentication.
+
+This option requires a library built with GSS-API or SSPI support. Use
+\fI-V, --version\fP to see if your curl supports GSS-API/SSPI or SPNEGO.
+
+When using this option, you must also provide a fake \fI-u, --user\fP option to activate
+the authentication code properly. Sending a '-u :' is enough as the user name
+and password from the \fI-u, --user\fP option aren't actually used.
+
+If this option is used several times, only the first one is used.
+
+See also \fI--basic\fP and \fI--ntlm\fP and \fI--anyauth\fP and \fI--proxy-negotiate\fP.
+.IP "--netrc-file <filemame>"
+This option is similar to \fI-n, --netrc\fP, except that you provide the path (absolute
+or relative) to the netrc file that Curl should use.  You can only specify one
+netrc file per invocation. If several \fI--netrc-file\fP options are provided,
+the last one will be used.
+
+It will abide by \fI--netrc-optional\fP if specified.
+
+This option overrides \fI-n, --netrc\fP. Added in 7.21.5.
+.IP "--netrc-optional"
+Very similar to \fI-n, --netrc\fP, but this option makes the .netrc usage \fBoptional\fP
+and not mandatory as the \fI-n, --netrc\fP option does.
+
+See also \fI--netrc-file\fP. This option overrides \fI-n, --netrc\fP.
+.IP "-n, --netrc"
+Makes curl scan the \fI.netrc\fP (\fI_netrc\fP on Windows) file in the user's
+home directory for login name and password. This is typically used for FTP on
+Unix. If used with HTTP, curl will enable user authentication. See
+\fInetrc(5)\fP \fIftp(1)\fP for details on the file format. Curl will not
+complain if that file doesn't have the right permissions (it should not be
+either world- or group-readable). The environment variable "HOME" is used to
+find the home directory.
+
+A quick and very simple example of how to setup a \fI.netrc\fP to allow curl
+to FTP to the machine host.domain.com with user name \&'myself' and password
+\&'secret' should look similar to:
+
+.B "machine host.domain.com login myself password secret"
+.IP "-:, --next"
+Tells curl to use a separate operation for the following URL and associated
+options. This allows you to send several URL requests, each with their own
+specific options, for example, such as different user names or custom requests
+for each.
+
+\fI-:, --next\fP will reset all local options and only global ones will have their
+values survive over to the operation following the \fI-:, --next\fP instruction. Global
+options include \fI-v, --verbose\fP, \fI--trace\fP, \fI--trace-ascii\fP and \fI--fail-early\fP.
+
+For example, you can do both a GET and a POST in a single command line:
+
+ curl www1.example.com --next -d postthis www2.example.com
+
+Added in 7.36.0.
+.IP "--no-alpn"
+(HTTPS) Disable the ALPN TLS extension. ALPN is enabled by default if libcurl was built
+with an SSL library that supports ALPN. ALPN is used by a libcurl that supports
+HTTP/2 to negotiate HTTP/2 support with the server during https sessions.
+
+See also \fI--no-npn\fP and \fI--http2\fP. \fI--no-alpn\fP requires that the underlying libcurl was built to support TLS. Added in 7.36.0.
+.IP "-N, --no-buffer"
+Disables the buffering of the output stream. In normal work situations, curl
+will use a standard buffered output stream that will have the effect that it
+will output the data in chunks, not necessarily exactly when the data arrives.
+Using this option will disable that buffering.
+
+Note that this is the negated option name documented. You can thus use
+--buffer to enforce the buffering.
+.IP "--no-keepalive"
+Disables the use of keepalive messages on the TCP connection. curl otherwis
+enables them by default.
+
+Note that this is the negated option name documented. You can thus use
+--keepalive to enforce keepalive.
+.IP "--no-npn"
+(HTTPS) Disable the NPN TLS extension. NPN is enabled by default if libcurl was built
+with an SSL library that supports NPN. NPN is used by a libcurl that supports
+HTTP/2 to negotiate HTTP/2 support with the server during https sessions.
+
+See also \fI--no-alpn\fP and \fI--http2\fP. \fI--no-npn\fP requires that the underlying libcurl was built to support TLS. Added in 7.36.0.
+.IP "--no-sessionid"
+(TLS) Disable curl's use of SSL session-ID caching.  By default all transfers are
+done using the cache. Note that while nothing should ever get hurt by
+attempting to reuse SSL session-IDs, there seem to be broken SSL
+implementations in the wild that may require you to disable this in order for
+you to succeed.
+
+Note that this is the negated option name documented. You can thus use
+--sessionid to enforce session-ID caching.
+
+Added in 7.16.0.
+.IP "--noproxy <no-proxy-list>"
+Comma-separated list of hosts which do not use a proxy, if one is specified.
+The only wildcard is a single * character, which matches all hosts, and
+effectively disables the proxy. Each name in this list is matched as either
+a domain which contains the hostname, or the hostname itself. For example,
+local.com would match local.com, local.com:80, and www.local.com, but not
+www.notlocal.com.
+
+Since 7.53.0, This option overrides the environment variables that disable the
+proxy. If there's an environment variable disabling a proxy, you can set
+noproxy list to \&"" to override it.
+
+Added in 7.19.4.
+.IP "--ntlm-wb"
+(HTTP) Enables NTLM much in the style \fI--ntlm\fP does, but hand over the authentication
+to the separate binary ntlmauth application that is executed when needed.
+
+See also \fI--ntlm\fP and \fI--proxy-ntlm\fP.
+.IP "--ntlm"
+(HTTP) Enables NTLM authentication. The NTLM authentication method was designed by
+Microsoft and is used by IIS web servers. It is a proprietary protocol,
+reverse-engineered by clever people and implemented in curl based on their
+efforts. This kind of behavior should not be endorsed, you should encourage
+everyone who uses NTLM to switch to a public and documented authentication
+method instead, such as Digest.
+
+If you want to enable NTLM for your proxy authentication, then use
+\fI--proxy-ntlm\fP.
+
+If this option is used several times, only the first one is used.
+
+See also \fI--proxy-ntlm\fP. \fI--ntlm\fP requires that the underlying libcurl was built to support TLS. This option overrides \fI--basic\fP and \fI--negotiated\fP and \fI--digest\fP and \fI--anyauth\fP.
+.IP "--oauth2-bearer"
+(IMAP POP3 SMTP) Specify the Bearer Token for OAUTH 2.0 server authentication. The Bearer Token
+is used in conjunction with the user name which can be specified as part of
+the \fI--url\fP or \fI-u, --user\fP options.
+
+The Bearer Token and user name are formatted according to RFC 6750.
+
+If this option is used several times, the last one will be used.
+.IP "-o, --output <file>"
+Write output to <file> instead of stdout. If you are using {} or [] to fetch
+multiple documents, you can use '#' followed by a number in the <file>
+specifier. That variable will be replaced with the current string for the URL
+being fetched. Like in:
+
+ curl http://{one,two}.example.com -o "file_#1.txt"
+
+or use several variables like:
+
+ curl http://{site,host}.host[1-5].com -o "#1_#2"
+
+You may use this option as many times as the number of URLs you have. For
+example, if you specify two URLs on the same command line, you can use it like
+this:
+
+  curl -o aa example.com -o bb example.net
+
+and the order of the -o options and the URLs doesn't matter, just that the
+first -o is for the first URL and so on, so the above command line can also be
+written as
+
+  curl example.com example.net -o aa -o bb
+
+See also the \fI--create-dirs\fP option to create the local directories
+dynamically. Specifying the output as '-' (a single dash) will force the
+output to be done to stdout.
+
+See also \fI-O, --remote-name\fP and \fI--remote-name-all\fP and \fI-J, --remote-header-name\fP.
+.IP "--pass <phrase>"
+(SSH TLS) Passphrase for the private key
+
+If this option is used several times, the last one will be used.
+.IP "--path-as-is"
+Tell curl to not handle sequences of /../ or /./ in the given URL
+path. Normally curl will squash or merge them according to standards but with
+this option set you tell it not to do that.
+
+Added in 7.42.0.
+.IP "--pinnedpubkey <hashes>"
+(TLS) Tells curl to use the specified public key file (or hashes) to verify the
+peer. This can be a path to a file which contains a single public key in PEM
+or DER format, or any number of base64 encoded sha256 hashes preceded by
+\'sha256//\' and separated by \';\'
+
+When negotiating a TLS or SSL connection, the server sends a certificate
+indicating its identity. A public key is extracted from this certificate and
+if it does not exactly match the public key provided to this option, curl will
+abort the connection before sending or receiving any data.
+
+PEM/DER support:
+  7.39.0: OpenSSL, GnuTLS and GSKit
+  7.43.0: NSS and wolfSSL/CyaSSL
+  7.47.0: mbedtls
+  7.49.0: PolarSSL
+sha256 support:
+  7.44.0: OpenSSL, GnuTLS, NSS and wolfSSL/CyaSSL.
+  7.47.0: mbedtls
+  7.49.0: PolarSSL
+Other SSL backends not supported.
+
+If this option is used several times, the last one will be used.
+.IP "--post301"
+(HTTP) Tells curl to respect RFC 7231/6.4.2 and not convert POST requests into GET
+requests when following a 301 redirection. The non-RFC behaviour is ubiquitous
+in web browsers, so curl does the conversion by default to maintain
+consistency. However, a server may require a POST to remain a POST after such
+a redirection. This option is meaningful only when using \fI-L, --location\fP.
+
+See also \fI--post302\fP and \fI--post303\fP and \fI-L, --location\fP. Added in 7.17.1.
+.IP "--post302"
+(HTTP) Tells curl to respect RFC 7231/6.4.3 and not convert POST requests into GET
+requests when following a 302 redirection. The non-RFC behaviour is ubiquitous
+in web browsers, so curl does the conversion by default to maintain
+consistency. However, a server may require a POST to remain a POST after such
+a redirection. This option is meaningful only when using \fI-L, --location\fP.
+
+See also \fI--post301\fP and \fI--post303\fP and \fI-L, --location\fP. Added in 7.19.1.
+.IP "--post303"
+(HTTP) Tells curl to respect RFC 7231/6.4.4 and not convert POST requests into GET
+requests when following a 303 redirection. The non-RFC behaviour is ubiquitous
+in web browsers, so curl does the conversion by default to maintain
+consistency. However, a server may require a POST to remain a POST after such
+a redirection. This option is meaningful only when using \fI-L, --location\fP.
+
+See also \fI--post302\fP and \fI--post301\fP and \fI-L, --location\fP. Added in 7.26.0.
+.IP "--preproxy [protocol://]host[:port]"
+Use the specified proxy before connecting to the ordinary proxy. Hence pre
+proxy. A pre proxy must be a SOCKS speaking proxy.
+
+The pre proxy string should be specified with a protocol:// prefix to specify
+alternative proxy protocols. Use socks4://, socks4a://, socks5:// or
+socks5h:// to request the specific SOCKS version to be used. No protocol
+specified will make curl default to SOCKS4.
+
+If the port number is not specified in the proxy string, it is assumed to be
+1080.
+
+User and password that might be provided in the proxy string are URL decoded
+by curl. This allows you to pass in special characters such as @ by using %40
+or pass in a colon with %3a.
+
+If this option is used several times, the last one will be used.
+
+Added in 7.52.0.
+.IP "-#, --progress-bar"
+Make curl display transfer progress as a simple progress bar instead of the
+standard, more informational, meter.
+
+This progress bar draws a single line of '#' characters across the screen and
+shows a percentage if the transfer size is known. For transfers without a
+known size, it will instead output one '#' character for every 1024 bytes
+transferred.
+.IP "--proto-default <protocol>"
+Tells curl to use \fIprotocol\fP for any URL missing a scheme name.
+
+Example:
+
+ curl --proto-default https ftp.mozilla.org
+
+An unknown or unsupported protocol causes error
+\fICURLE_UNSUPPORTED_PROTOCOL\fP (1).
+
+This option does not change the default proxy protocol (http).
+
+Without this option curl would make a guess based on the host, see \fI--url\fP for
+details.
+
+Added in 7.45.0.
+.IP "--proto-redir <protocols>"
+Tells curl to limit what protocols it may use on redirect. Protocols denied by
+\fI--proto\fP are not overridden by this option. See --proto for how protocols are
+represented.
+
+Example, allow only HTTP and HTTPS on redirect:
+
+ curl --proto-redir -all,http,https http://example.com
+
+By default curl will allow all protocols on redirect except several disabled
+for security reasons: Since 7.19.4 FILE and SCP are disabled, and since 7.40.0
+SMB and SMBS are also disabled. Specifying \fIall\fP or \fI+all\fP enables all
+protocols on redirect, including those disabled for security.
+
+Added in 7.20.2.
+.IP "--proto <protocols>"
+Tells curl to limit what protocols it may use in the transfer. Protocols are
+evaluated left to right, are comma separated, and are each a protocol name or
+'all', optionally prefixed by zero or more modifiers. Available modifiers are:
+.RS
+.TP 3
+.B +
+Permit this protocol in addition to protocols already permitted (this is
+the default if no modifier is used).
+.TP
+.B -
+Deny this protocol, removing it from the list of protocols already permitted.
+.TP
+.B =
+Permit only this protocol (ignoring the list already permitted), though
+subject to later modification by subsequent entries in the comma separated
+list.
+.RE
+.IP
+For example:
+.RS
+.TP 15
+.B \fI--proto\fP -ftps
+uses the default protocols, but disables ftps
+.TP
+.B  \fI--proto\fP -all,https,+http
+only enables http and https
+.TP
+.B \fI--proto\fP =http,https
+also only enables http and https
+.RE
+
+Unknown protocols produce a warning. This allows scripts to safely rely on
+being able to disable potentially dangerous protocols, without relying upon
+support for that protocol being built into curl to avoid an error.
+
+This option can be used multiple times, in which case the effect is the same
+as concatenating the protocols into one instance of the option.
+
+See also \fI--proto-redir\fP and \fI--proto-default\fP. Added in 7.20.2.
+.IP "--proxy-anyauth"
+Tells curl to pick a suitable authentication method when communicating with
+the given HTTP proxy. This might cause an extra request/response round-trip.
+
+See also \fI-x, --proxy\fP and \fI--proxy-basic\fP and \fI--proxy-digest\fP. Added in 7.13.2.
+.IP "--proxy-basic"
+Tells curl to use HTTP Basic authentication when communicating with the given
+proxy. Use \fI--basic\fP for enabling HTTP Basic with a remote host. Basic is the
+default authentication method curl uses with proxies.
+
+See also \fI-x, --proxy\fP and \fI--proxy-anyauth\fP and \fI--proxy-digest\fP.
+.IP "--proxy-cacert <file>"
+Same as \fI--cacert\fP but used in HTTPS proxy context.
+
+See also \fI--proxy-capath\fP and \fI--cacert\fP and \fI--capath\fP and \fI-x, --proxy\fP. Added in 7.52.0.
+.IP "--proxy-capath <dir>"
+Same as \fI--capath\fP but used in HTTPS proxy context.
+
+See also \fI--proxy-cacert\fP and \fI-x, --proxy\fP and \fI--capath\fP. Added in 7.52.0.
+.IP "--proxy-cert-type <type>"
+Same as \fI--cert-type\fP but used in HTTPS proxy context.
+
+Added in 7.52.0.
+.IP "--proxy-cert <cert[:passwd]>"
+Same as \fI-E, --cert\fP but used in HTTPS proxy context.
+
+Added in 7.52.0.
+.IP "--proxy-ciphers <list>"
+Same as \fI--ciphers\fP but used in HTTPS proxy context.
+
+Added in 7.52.0.
+.IP "--proxy-crlfile <file>"
+Same as \fI--crlfile\fP but used in HTTPS proxy context.
+
+Added in 7.52.0.
+.IP "--proxy-digest"
+Tells curl to use HTTP Digest authentication when communicating with the given
+proxy. Use \fI--digest\fP for enabling HTTP Digest with a remote host.
+
+See also \fI-x, --proxy\fP and \fI--proxy-anyauth\fP and \fI--proxy-basic\fP.
+.IP "--proxy-header <header>"
+(HTTP) Extra header to include in the request when sending HTTP to a proxy. You may
+specify any number of extra headers. This is the equivalent option to \fI-H, --header\fP
+but is for proxy communication only like in CONNECT requests when you want a
+separate header sent to the proxy to what is sent to the actual remote host.
+
+curl will make sure that each header you add/replace is sent with the proper
+end-of-line marker, you should thus \fBnot\fP add that as a part of the header
+content: do not add newlines or carriage returns, they will only mess things
+up for you.
+
+Headers specified with this option will not be included in requests that curl
+knows will not be sent to a proxy.
+
+This option can be used multiple times to add/replace/remove multiple headers.
+
+Added in 7.37.0.
+.IP "--proxy-insecure"
+Same as \fI-k, --insecure\fP but used in HTTPS proxy context.
+
+Added in 7.52.0.
+.IP "--proxy-key-type <type>"
+Same as \fI--key-type\fP but used in HTTPS proxy context.
+
+Added in 7.52.0.
+.IP "--proxy-key <key>"
+Same as \fI--key\fP but used in HTTPS proxy context.
+.IP "--proxy-negotiate"
+Tells curl to use HTTP Negotiate (SPNEGO) authentication when communicating
+with the given proxy. Use \fI--negotiate\fP for enabling HTTP Negotiate (SPNEGO)
+with a remote host.
+
+See also \fI--proxy-anyauth\fP and \fI--proxy-basic\fP. Added in 7.17.1.
+.IP "--proxy-ntlm"
+Tells curl to use HTTP NTLM authentication when communicating with the given
+proxy. Use \fI--ntlm\fP for enabling NTLM with a remote host.
+
+See also \fI--proxy-negotiate\fP and \fI--proxy-anyauth\fP.
+.IP "--proxy-pass <phrase>"
+Same as \fI--pass\fP but used in HTTPS proxy context.
+
+Added in 7.52.0.
+.IP "--proxy-service-name <name>"
+This option allows you to change the service name for proxy negotiation.
+
+Added in 7.43.0.
+.IP "--proxy-ssl-allow-beast"
+Same as \fI--ssl-allow-beast\fP but used in HTTPS proxy context.
+
+Added in 7.52.0.
+.IP "--proxy-tlsauthtype <type>"
+Same as \fI--tlsauthtype\fP but used in HTTPS proxy context.
+
+Added in 7.52.0.
+.IP "--proxy-tlspassword <string>"
+Same as \fI--tlspassword\fP but used in HTTPS proxy context.
+
+Added in 7.52.0.
+.IP "--proxy-tlsuser <name>"
+Same as \fI--tlsuser\fP but used in HTTPS proxy context.
+
+Added in 7.52.0.
+.IP "--proxy-tlsv1"
+Same as \fI-1, --tlsv1\fP but used in HTTPS proxy context.
+
+Added in 7.52.0.
+.IP "-U, --proxy-user <user:password>"
+Specify the user name and password to use for proxy authentication.
+
+If you use a Windows SSPI-enabled curl binary and do either Negotiate or NTLM
+authentication then you can tell curl to select the user name and password
+from your environment by specifying a single colon with this option: "-U :".
+
+If this option is used several times, the last one will be used.
+.IP "-x, --proxy [protocol://]host[:port]"
+Use the specified proxy.
+
+The proxy string can be specified with a protocol:// prefix to specify
+alternative proxy protocols. Use socks4://, socks4a://, socks5:// or
+socks5h:// to request the specific SOCKS version to be used. No protocol
+specified, http:// and all others will be treated as HTTP proxies. (The
+protocol support was added in curl 7.21.7)
+
+If the port number is not specified in the proxy string, it is assumed to be
+1080.
+
+This option overrides existing environment variables that set the proxy to
+use. If there's an environment variable setting a proxy, you can set proxy to
+\&"" to override it.
+
+All operations that are performed over an HTTP proxy will transparently be
+converted to HTTP. It means that certain protocol specific operations might
+not be available. This is not the case if you can tunnel through the proxy, as
+one with the \fI-p, --proxytunnel\fP option.
+
+User and password that might be provided in the proxy string are URL decoded
+by curl. This allows you to pass in special characters such as @ by using %40
+or pass in a colon with %3a.
+
+The proxy host can be specified the exact same way as the proxy environment
+variables, including the protocol prefix (http://) and the embedded user +
+password.
+
+If this option is used several times, the last one will be used.
+.IP "--proxy1.0 <host[:port]>"
+Use the specified HTTP 1.0 proxy. If the port number is not specified, it is
+assumed at port 1080.
+
+The only difference between this and the HTTP proxy option \fI-x, --proxy\fP, is that
+attempts to use CONNECT through the proxy will specify an HTTP 1.0 protocol
+instead of the default HTTP 1.1.
+.IP "-p, --proxytunnel"
+When an HTTP proxy is used \fI-x, --proxy\fP, this option will cause non-HTTP protocols
+to attempt to tunnel through the proxy instead of merely using it to do
+HTTP-like operations. The tunnel approach is made with the HTTP proxy CONNECT
+request and requires that the proxy allows direct connect to the remote port
+number curl wants to tunnel through to.
+
+See also \fI-x, --proxy\fP.
+.IP "--pubkey <key>"
+(SFTP SCP) Public key file name. Allows you to provide your public key in this separate
+file.
+
+If this option is used several times, the last one will be used.
+
+(As of 7.39.0, curl attempts to automatically extract the public key from the
+private key file, so passing this option is generally not required. Note that
+this public key extraction requires libcurl to be linked against a copy of
+libssh2 1.2.8 or higher that is itself linked against OpenSSL.)
+.IP "-Q, --quote"
+(FTP SFTP) 
+Send an arbitrary command to the remote FTP or SFTP server. Quote commands are
+sent BEFORE the transfer takes place (just after the initial PWD command in an
+FTP transfer, to be exact). To make commands take place after a successful
+transfer, prefix them with a dash '-'.  To make commands be sent after curl
+has changed the working directory, just before the transfer command(s), prefix
+the command with a '+' (this is only supported for FTP). You may specify any
+number of commands.
+
+If the server returns failure for one of the commands, the entire operation
+will be aborted. You must send syntactically correct FTP commands as RFC 959
+defines to FTP servers, or one of the commands listed below to SFTP servers.
+
+This option can be used multiple times. When speaking to an FTP server, prefix
+the command with an asterisk (*) to make curl continue even if the command
+fails as by default curl will stop at first failure.
+
+SFTP is a binary protocol. Unlike for FTP, curl interprets SFTP quote commands
+itself before sending them to the server.  File names may be quoted
+shell-style to embed spaces or special characters.  Following is the list of
+all supported SFTP quote commands:
+.RS
+.IP "chgrp group file"
+The chgrp command sets the group ID of the file named by the file operand to
+the group ID specified by the group operand. The group operand is a decimal
+integer group ID.
+.IP "chmod mode file"
+The chmod command modifies the file mode bits of the specified file. The
+mode operand is an octal integer mode number.
+.IP "chown user file"
+The chown command sets the owner of the file named by the file operand to the
+user ID specified by the user operand. The user operand is a decimal
+integer user ID.
+.IP "ln source_file target_file"
+The ln and symlink commands create a symbolic link at the target_file location
+pointing to the source_file location.
+.IP "mkdir directory_name"
+The mkdir command creates the directory named by the directory_name operand.
+.IP "pwd"
+The pwd command returns the absolute pathname of the current working directory.
+.IP "rename source target"
+The rename command renames the file or directory named by the source
+operand to the destination path named by the target operand.
+.IP "rm file"
+The rm command removes the file specified by the file operand.
+.IP "rmdir directory"
+The rmdir command removes the directory entry specified by the directory
+operand, provided it is empty.
+.IP "symlink source_file target_file"
+See ln.
+.RE
+.IP "--random-file <file>"
+Specify the path name to file containing what will be considered as random
+data. The data may be used to seed the random engine for SSL connections.  See
+also the \fI--egd-file\fP option.
+.IP "-r, --range <range>"
+(HTTP FTP SFTP FILE) Retrieve a byte range (i.e a partial document) from a HTTP/1.1, FTP or SFTP
+server or a local FILE. Ranges can be specified in a number of ways.
+.RS
+.TP 10
+.B 0-499
+specifies the first 500 bytes
+.TP
+.B 500-999
+specifies the second 500 bytes
+.TP
+.B -500
+specifies the last 500 bytes
+.TP
+.B 9500-
+specifies the bytes from offset 9500 and forward
+.TP
+.B 0-0,-1
+specifies the first and last byte only(*)(HTTP)
+.TP
+.B 100-199,500-599
+specifies two separate 100-byte ranges(*) (HTTP)
+.RE
+.IP
+(*) = NOTE that this will cause the server to reply with a multipart
+response!
+
+Only digit characters (0-9) are valid in the 'start' and 'stop' fields of the
+\&'start-stop' range syntax. If a non-digit character is given in the range,
+the server's response will be unspecified, depending on the server's
+configuration.
+
+You should also be aware that many HTTP/1.1 servers do not have this feature
+enabled, so that when you attempt to get a range, you'll instead get the whole
+document.
+
+FTP and SFTP range downloads only support the simple 'start-stop' syntax
+(optionally with one of the numbers omitted). FTP use depends on the extended
+FTP command SIZE.
+
+If this option is used several times, the last one will be used.
+.IP "--raw"
+(HTTP) When used, it disables all internal HTTP decoding of content or transfer
+encodings and instead makes them passed on unaltered, raw.
+
+Added in 7.16.2.
+.IP "-e, --referer <URL>"
+(HTTP) Sends the "Referrer Page" information to the HTTP server. This can also be set
+with the \fI-H, --header\fP flag of course.  When used with \fI-L, --location\fP you can append
+";auto" to the \fI-e, --referer\fP URL to make curl automatically set the previous URL
+when it follows a Location: header. The \&";auto" string can be used alone,
+even if you don't set an initial \fI-e, --referer\fP.
+
+If this option is used several times, the last one will be used.
+
+See also \fI-A, --user-agent\fP and \fI-H, --header\fP.
+.IP "-J, --remote-header-name"
+(HTTP) This option tells the \fI-O, --remote-name\fP option to use the server-specified
+Content-Disposition filename instead of extracting a filename from the URL.
+
+If the server specifies a file name and a file with that name already exists
+in the current working directory it will not be overwritten and an error will
+occur. If the server doesn't specify a file name then this option has no
+effect.
+
+There's no attempt to decode %-sequences (yet) in the provided file name, so
+this option may provide you with rather unexpected file names.
+
+\fBWARNING\fP: Exercise judicious use of this option, especially on Windows. A
+rogue server could send you the name of a DLL or other file that could possibly
+be loaded automatically by Windows or some third party software.
+.IP "--remote-name-all"
+This option changes the default action for all given URLs to be dealt with as
+if \fI-O, --remote-name\fP were used for each one. So if you want to disable that for a
+specific URL after \fI--remote-name-all\fP has been used, you must use "-o -" or
+--no-remote-name.
+
+Added in 7.19.0.
+.IP "-O, --remote-name"
+Write output to a local file named like the remote file we get. (Only the file
+part of the remote file is used, the path is cut off.)
+
+The file will be saved in the current working directory. If you want the file
+saved in a different directory, make sure you change the current working
+directory before invoking curl with this option.
+
+The remote file name to use for saving is extracted from the given URL,
+nothing else, and if it already exists it will be overwritten. If you want the
+server to be able to choose the file name refer to \fI-J, --remote-header-name\fP which
+can be used in addition to this option. If the server chooses a file name and
+that name already exists it will not be overwritten.
+
+There is no URL decoding done on the file name. If it has %20 or other URL
+encoded parts of the name, they will end up as-is as file name.
+
+You may use this option as many times as the number of URLs you have.
+.IP "-R, --remote-time"
+When used, this will make curl attempt to figure out the timestamp of the
+remote file, and if that is available make the local file get that same
+timestamp.
+.IP "-X, --request <command>"
+(HTTP) Specifies a custom request method to use when communicating with the
+HTTP server.  The specified request method will be used instead of the method
+otherwise used (which defaults to GET). Read the HTTP 1.1 specification for
+details and explanations. Common additional HTTP requests include PUT and
+DELETE, but related technologies like WebDAV offers PROPFIND, COPY, MOVE and
+more.
+
+Normally you don't need this option. All sorts of GET, HEAD, POST and PUT
+requests are rather invoked by using dedicated command line options.
+
+This option only changes the actual word used in the HTTP request, it does not
+alter the way curl behaves. So for example if you want to make a proper HEAD
+request, using -X HEAD will not suffice. You need to use the \fI-I, --head\fP option.
+
+The method string you set with \fI-X, --request\fP will be used for all requests, which
+if you for example use \fI-L, --location\fP may cause unintended side-effects when curl
+doesn't change request method according to the HTTP 30x response codes - and
+similar.
+
+(FTP)
+Specifies a custom FTP command to use instead of LIST when doing file lists
+with FTP.
+
+(POP3)
+Specifies a custom POP3 command to use instead of LIST or RETR. (Added in
+7.26.0)
+
+(IMAP)
+Specifies a custom IMAP command to use instead of LIST. (Added in 7.30.0)
+
+(SMTP)
+Specifies a custom SMTP command to use instead of HELP or VRFY. (Added in 7.34.0)
+
+If this option is used several times, the last one will be used.
+.IP "--resolve <host:port:address>"
+Provide a custom address for a specific host and port pair. Using this, you
+can make the curl requests(s) use a specified address and prevent the
+otherwise normally resolved address to be used. Consider it a sort of
+/etc/hosts alternative provided on the command line. The port number should be
+the number used for the specific protocol the host will be used for. It means
+you need several entries if you want to provide address for the same host but
+different ports.
+
+The provided address set by this option will be used even if \fI-4, --ipv4\fP or \fI-6, --ipv6\fP
+is set to make curl use another IP version.
+
+This option can be used many times to add many host names to resolve.
+
+Added in 7.21.3.
+.IP "--retry-connrefused"
+In addition to the other conditions, consider ECONNREFUSED as a transient
+error too for \fI--retry\fP. This option is used together with --retry.
+
+Added in 7.52.0.
+.IP "--retry-delay <seconds>"
+Make curl sleep this amount of time before each retry when a transfer has
+failed with a transient error (it changes the default backoff time algorithm
+between retries). This option is only interesting if \fI--retry\fP is also
+used. Setting this delay to zero will make curl use the default backoff time.
+
+If this option is used several times, the last one will be used.
+
+Added in 7.12.3.
+.IP "--retry-max-time <seconds>"
+The retry timer is reset before the first transfer attempt. Retries will be
+done as usual (see \fI--retry\fP) as long as the timer hasn't reached this given
+limit. Notice that if the timer hasn't reached the limit, the request will be
+made and while performing, it may take longer than this given time period. To
+limit a single request\'s maximum time, use \fI-m, --max-time\fP.  Set this option to
+zero to not timeout retries.
+
+If this option is used several times, the last one will be used.
+
+Added in 7.12.3.
+.IP "--retry <num>"
+If a transient error is returned when curl tries to perform a transfer, it
+will retry this number of times before giving up. Setting the number to 0
+makes curl do no retries (which is the default). Transient error means either:
+a timeout, an FTP 4xx response code or an HTTP 5xx response code.
+
+When curl is about to retry a transfer, it will first wait one second and then
+for all forthcoming retries it will double the waiting time until it reaches
+10 minutes which then will be the delay between the rest of the retries.  By
+using \fI--retry-delay\fP you disable this exponential backoff algorithm. See also
+\fI--retry-max-time\fP to limit the total time allowed for retries.
+
+If this option is used several times, the last one will be used.
+
+Added in 7.12.3.
+.IP "--sasl-ir"
+Enable initial response in SASL authentication.
+
+Added in 7.31.0.
+.IP "--service-name <name>"
+This option allows you to change the service name for SPNEGO.
+
+Examples: \fI--negotiate\fP \fI--service-name\fP sockd would use sockd/server-name.
+
+Added in 7.43.0.
+.IP "-S, --show-error"
+When used with \fI-s, --silent\fP, it makes curl show an error message if it fails.
+.IP "-s, --silent"
+Silent or quiet mode. Don't show progress meter or error messages.  Makes Curl
+mute. It will still output the data you ask for, potentially even to the
+terminal/stdout unless you redirect it.
+
+Use \fI-S, --show-error\fP in addition to this option to disable progress meter but
+still show error messages.
+
+See also \fI-v, --verbose\fP and \fI--stderr\fP.
+.IP "--socks4 <host[:port]>"
+Use the specified SOCKS4 proxy. If the port number is not specified, it is
+assumed at port 1080.
+
+This option overrides any previous use of \fI-x, --proxy\fP, as they are mutually
+exclusive.
+
+Since 7.21.7, this option is superfluous since you can specify a socks4 proxy
+with \fI-x, --proxy\fP using a socks4:// protocol prefix.
+
+If this option is used several times, the last one will be used.
+
+Added in 7.15.2.
+.IP "--socks4a <host[:port]>"
+Use the specified SOCKS4a proxy. If the port number is not specified, it is
+assumed at port 1080.
+
+This option overrides any previous use of \fI-x, --proxy\fP, as they are mutually
+exclusive.
+
+Since 7.21.7, this option is superfluous since you can specify a socks4a proxy
+with \fI-x, --proxy\fP using a socks4a:// protocol prefix.
+
+If this option is used several times, the last one will be used.
+
+Added in 7.18.0.
+.IP "--socks5-gssapi-nec"
+As part of the GSS-API negotiation a protection mode is negotiated. RFC 1961
+says in section 4.3/4.4 it should be protected, but the NEC reference
+implementation does not.  The option \fI--socks5-gssapi-nec\fP allows the
+unprotected exchange of the protection mode negotiation.
+
+Added in 7.19.4.
+.IP "--socks5-gssapi-service <name>"
+The default service name for a socks server is rcmd/server-fqdn. This option
+allows you to change it.
+
+Examples: \fI--socks5\fP proxy-name \fI--socks5-gssapi-service\fP sockd would use
+sockd/proxy-name \fI--socks5\fP proxy-name \fI--socks5-gssapi-service\fP sockd/real-name
+would use sockd/real-name for cases where the proxy-name does not match the
+principal name.
+
+Added in 7.19.4.
+.IP "--socks5-hostname <host[:port]>"
+Use the specified SOCKS5 proxy (and let the proxy resolve the host name). If
+the port number is not specified, it is assumed at port 1080.
+
+This option overrides any previous use of \fI-x, --proxy\fP, as they are mutually
+exclusive.
+
+Since 7.21.7, this option is superfluous since you can specify a socks5
+hostname proxy with \fI-x, --proxy\fP using a socks5h:// protocol prefix.
+
+If this option is used several times, the last one will be used.
+
+Added in 7.18.0.
+.IP "--socks5 <host[:port]>"
+Use the specified SOCKS5 proxy - but resolve the host name locally. If the
+port number is not specified, it is assumed at port 1080.
+
+This option overrides any previous use of \fI-x, --proxy\fP, as they are mutually
+exclusive.
+
+Since 7.21.7, this option is superfluous since you can specify a socks5 proxy
+with \fI-x, --proxy\fP using a socks5:// protocol prefix.
+
+If this option is used several times, the last one will be used.
+
+This option (as well as \fI--socks4\fP) does not work with IPV6, FTPS or LDAP.
+
+Added in 7.18.0.
+.IP "-Y, --speed-limit <speed>"
+If a download is slower than this given speed (in bytes per second) for
+speed-time seconds it gets aborted. speed-time is set with \fI-y, --speed-time\fP and is
+30 if not set.
+
+If this option is used several times, the last one will be used.
+.IP "-y, --speed-time <seconds>"
+If a download is slower than speed-limit bytes per second during a speed-time
+period, the download gets aborted. If speed-time is used, the default
+speed-limit will be 1 unless set with \fI-Y, --speed-limit\fP.
+
+This option controls transfers and thus will not affect slow connects etc. If
+this is a concern for you, try the \fI--connect-timeout\fP option.
+
+If this option is used several times, the last one will be used.
+.IP "--ssl-allow-beast"
+This option tells curl to not work around a security flaw in the SSL3 and
+TLS1.0 protocols known as BEAST.  If this option isn't used, the SSL layer may
+use workarounds known to cause interoperability problems with some older SSL
+implementations. WARNING: this option loosens the SSL security, and by using
+this flag you ask for exactly that.
+
+Added in 7.25.0.
+.IP "--ssl-no-revoke"
+(WinSSL) This option tells curl to disable certificate revocation checks.
+WARNING: this option loosens the SSL security, and by using this flag you ask
+for exactly that.
+
+Added in 7.44.0.
+.IP "--ssl-reqd"
+(FTP IMAP POP3 SMTP) Require SSL/TLS for the connection.  Terminates the connection if the server
+doesn't support SSL/TLS.
+
+This option was formerly known as --ftp-ssl-reqd.
+
+Added in 7.20.0.
+.IP "--ssl"
+(FTP IMAP POP3 SMTP) 
+Try to use SSL/TLS for the connection.  Reverts to a non-secure connection if
+the server doesn't support SSL/TLS.  See also \fI--ftp-ssl-control\fP and \fI--ssl-reqd\fP
+for different levels of encryption required.
+
+This option was formerly known as --ftp-ssl (Added in 7.11.0). That option
+name can still be used but will be removed in a future version.
+
+Added in 7.20.0.
+.IP "-2, --sslv2"
+(SSL) Forces curl to use SSL version 2 when negotiating with a remote SSL
+server. Sometimes curl is built without SSLv2 support. SSLv2 is widely
+considered insecure (see RFC 6176).
+
+See also \fI--http1.1\fP and \fI--http2\fP. \fI-2, --sslv2\fP requires that the underlying libcurl was built to support TLS. This option overrides \fI-3, --sslv3\fP and \fI-1, --tlsv1\fP and \fI--tlsv1.1\fP and \fI--tlsv1.2\fP.
+.IP "-3, --sslv3"
+(SSL) Forces curl to use SSL version 3 when negotiating with a remote SSL
+server. Sometimes curl is built without SSLv3 support. SSLv3 is widely
+considered insecure (see RFC 7568).
+
+See also \fI--http1.1\fP and \fI--http2\fP. \fI-3, --sslv3\fP requires that the underlying libcurl was built to support TLS. This option overrides \fI-2, --sslv2\fP and \fI-1, --tlsv1\fP and \fI--tlsv1.1\fP and \fI--tlsv1.2\fP.
+.IP "--stderr"
+Redirect all writes to stderr to the specified file instead. If the file name
+is a plain '-', it is instead written to stdout.
+
+If this option is used several times, the last one will be used.
+
+See also \fI-v, --verbose\fP and \fI-s, --silent\fP.
+.IP "--tcp-fastopen"
+Enable use of TCP Fast Open (RFC7413).
+
+Added in 7.49.0.
+.IP "--tcp-nodelay"
+Turn on the TCP_NODELAY option. See the \fIcurl_easy_setopt(3)\fP man page for
+details about this option.
+
+Since 7.50.2, curl sets this option by default and you need to explictitly
+switch it off if you don't want it on.
+
+Added in 7.11.2.
+.IP "-t, --telnet-option <opt=val>"
+Pass options to the telnet protocol. Supported options are:
+
+TTYPE=<term> Sets the terminal type.
+
+XDISPLOC=<X display> Sets the X display location.
+
+NEW_ENV=<var,val> Sets an environment variable.
+.IP "--tftp-blksize <value>"
+(TFTP) Set TFTP BLKSIZE option (must be >512). This is the block size that curl will
+try to use when transferring data to or from a TFTP server. By default 512
+bytes will be used.
+
+If this option is used several times, the last one will be used.
+
+Added in 7.20.0.
+.IP "--tftp-no-options"
+(TFTP) Tells curl not to send TFTP options requests.
+
+This option improves interop with some legacy servers that do not acknowledge
+or properly implement TFTP options. When this option is used \fI--tftp-blksize\fP is
+ignored.
+
+Added in 7.48.0.
+.IP "-z, --time-cond <time>"
+(HTTP FTP) Request a file that has been modified later than the given time and date, or
+one that has been modified before that time. The <date expression> can be all
+sorts of date strings or if it doesn't match any internal ones, it is taken as
+a filename and tries to get the modification date (mtime) from <file>
+instead. See the \fIcurl_getdate(3)\fP man pages for date expression details.
+
+Start the date expression with a dash (-) to make it request for a document
+that is older than the given date/time, default is a document that is newer
+than the specified date/time.
+
+If this option is used several times, the last one will be used.
+.IP "--tlsauthtype <type>"
+Set TLS authentication type. Currently, the only supported option is "SRP",
+for TLS-SRP (RFC 5054). If \fI--tlsuser\fP and \fI--tlspassword\fP are specified but
+\fI--tlsauthtype\fP is not, then this option defaults to "SRP".
+
+Added in 7.21.4.
+.IP "--tlspassword"
+Set password for use with the TLS authentication method specified with
+\fI--tlsauthtype\fP. Requires that \fI--tlsuser\fP also be set.
+
+Added in 7.21.4.
+.IP "--tlsuser <name>"
+Set username for use with the TLS authentication method specified with
+\fI--tlsauthtype\fP. Requires that \fI--tlspassword\fP also is set.
+
+Added in 7.21.4.
+.IP "--tlsv1.0"
+(TLS) Forces curl to use TLS version 1.0 when connecting to a remote TLS server.
+
+Added in 7.34.0.
+.IP "--tlsv1.1"
+(TLS) Forces curl to use TLS version 1.1 when connecting to a remote TLS server.
+
+Added in 7.34.0.
+.IP "--tlsv1.2"
+(TLS) Forces curl to use TLS version 1.2 when connecting to a remote TLS server.
+
+Added in 7.34.0.
+.IP "--tlsv1.3"
+(TLS) Forces curl to use TLS version 1.3 when connecting to a remote TLS server.
+
+Note that TLS 1.3 is only supported by a subset of TLS backends. At the time
+of writing this, those are BoringSSL and NSS only.
+
+Added in 7.52.0.
+.IP "-1, --tlsv1"
+(SSL) Tells curl to use TLS version 1.x when negotiating with a remote TLS
+server. That means TLS version 1.0, 1.1 or 1.2.
+
+See also \fI--http1.1\fP and \fI--http2\fP. \fI-1, --tlsv1\fP requires that the underlying libcurl was built to support TLS. This option overrides \fI--tlsv1.1\fP and \fI--tlsv1.2\fP and \fI--tlsv1.3\fP.
+.IP "--tr-encoding"
+(HTTP) Request a compressed Transfer-Encoding response using one of the algorithms
+curl supports, and uncompress the data while receiving it.
+
+Added in 7.21.6.
+.IP "--trace-ascii <file>"
+Enables a full trace dump of all incoming and outgoing data, including
+descriptive information, to the given output file. Use "-" as filename to have
+the output sent to stdout.
+
+This is very similar to \fI--trace\fP, but leaves out the hex part and only shows
+the ASCII part of the dump. It makes smaller output that might be easier to
+read for untrained humans.
+
+If this option is used several times, the last one will be used.
+
+This option overrides \fI--trace\fP and \fI-v, --verbose\fP.
+.IP "--trace-time"
+Prepends a time stamp to each trace or verbose line that curl displays.
+
+Added in 7.14.0.
+.IP "--trace <file>"
+Enables a full trace dump of all incoming and outgoing data, including
+descriptive information, to the given output file. Use "-" as filename to have
+the output sent to stdout. Use "%" as filename to have the output sent to
+stderr.
+
+If this option is used several times, the last one will be used.
+
+This option overrides \fI-v, --verbose\fP and \fI--trace-ascii\fP.
+.IP "--unix-socket <path>"
+(HTTP) Connect through this Unix domain socket, instead of using the network.
+
+Added in 7.40.0.
+.IP "-T, --upload-file <file>"
+This transfers the specified local file to the remote URL. If there is no file
+part in the specified URL, curl will append the local file name. NOTE that you
+must use a trailing / on the last directory to really prove to Curl that there
+is no file name or curl will think that your last directory name is the remote
+file name to use. That will most likely cause the upload operation to fail. If
+this is used on an HTTP(S) server, the PUT command will be used.
+
+Use the file name "-" (a single dash) to use stdin instead of a given file.
+Alternately, the file name "." (a single period) may be specified instead
+of "-" to use stdin in non-blocking mode to allow reading server output
+while stdin is being uploaded.
+
+You can specify one \fI-T, --upload-file\fP for each URL on the command line. Each
+\fI-T, --upload-file\fP + URL pair specifies what to upload and to where. curl also
+supports "globbing" of the \fI-T, --upload-file\fP argument, meaning that you can upload
+multiple files to a single URL by using the same URL globbing style supported
+in the URL, like this:
+
+ curl --upload-file "{file1,file2}" http://www.example.com
+
+or even
+
+ curl -T "img[1-1000].png" ftp://ftp.example.com/upload/
+
+When uploading to an SMTP server: the uploaded data is assumed to be RFC 5322
+formatted. It has to feature the necessary set of headers and mail body
+formatted correctly by the user as curl will not transcode nor encode it
+further in any way.
+.IP "--url <url>"
+Specify a URL to fetch. This option is mostly handy when you want to specify
+URL(s) in a config file.
+
+If the given URL is missing a scheme name (such as "http://" or "ftp://" etc)
+then curl will make a guess based on the host. If the outermost sub-domain
+name matches DICT, FTP, IMAP, LDAP, POP3 or SMTP then that protocol will be
+used, otherwise HTTP will be used. Since 7.45.0 guessing can be disabled by
+setting a default protocol, see \fI--proto-default\fP for details.
+
+This option may be used any number of times. To control where this URL is
+written, use the \fI-o, --output\fP or the \fI-O, --remote-name\fP options.
+.IP "-B, --use-ascii"
+(FTP LDAP) Enable ASCII transfer. For FTP, this can also be enforced by using an URL that
+ends with ";type=A". This option causes data sent to stdout to be in text mode
+for win32 systems.
+.IP "-A, --user-agent <name>"
+(HTTP) 
+Specify the User-Agent string to send to the HTTP server. To encode blanks in
+the string, surround the string with single quote marks. This can also be set
+with the \fI-H, --header\fP option of course.
+
+If this option is used several times, the last one will be used.
+.IP "-u, --user <user:password>"
+Specify the user name and password to use for server authentication. Overrides
+\fI-n, --netrc\fP and \fI--netrc-optional\fP.
+
+If you simply specify the user name, curl will prompt for a password.
+
+The user name and passwords are split up on the first colon, which makes it
+impossible to use a colon in the user name with this option. The password can,
+still.
+
+When using Kerberos V5 with a Windows based server you should include the
+Windows domain name in the user name, in order for the server to successfully
+obtain a Kerberos Ticket. If you don't then the initial authentication
+handshake may fail.
+
+When using NTLM, the user name can be specified simply as the user name,
+without the domain, if there is a single domain and forest in your setup
+for example.
+
+To specify the domain name use either Down-Level Logon Name or UPN (User
+Principal Name) formats. For example, EXAMPLE\\user and user@example.com
+respectively.
+
+If you use a Windows SSPI-enabled curl binary and perform Kerberos V5,
+Negotiate, NTLM or Digest authentication then you can tell curl to select
+the user name and password from your environment by specifying a single colon
+with this option: "-u :".
+
+If this option is used several times, the last one will be used.
+.IP "-v, --verbose"
+Makes curl verbose during the operation. Useful for debugging and seeing
+what's going on "under the hood". A line starting with '>' means "header data"
+sent by curl, '<' means "header data" received by curl that is hidden in
+normal cases, and a line starting with '*' means additional info provided by
+curl.
+
+If you only want HTTP headers in the output, \fI-i, --include\fP might be the option
+you're looking for.
+
+If you think this option still doesn't give you enough details, consider using
+\fI--trace\fP or \fI--trace-ascii\fP instead.
+
+Use \fI-s, --silent\fP to make curl really quiet.
+
+See also \fI-i, --include\fP. This option overrides \fI--trace\fP and \fI--trace-ascii\fP.
+.IP "-V, --version"
+Displays information about curl and the libcurl version it uses.
+
+The first line includes the full version of curl, libcurl and other 3rd party
+libraries linked with the executable.
+
+The second line (starts with "Protocols:") shows all protocols that libcurl
+reports to support.
+
+The third line (starts with "Features:") shows specific features libcurl
+reports to offer. Available features include:
+.RS
+.IP "IPv6"
+You can use IPv6 with this.
+.IP "krb4"
+Krb4 for FTP is supported.
+.IP "SSL"
+SSL versions of various protocols are supported, such as HTTPS, FTPS, POP3S
+and so on.
+.IP "libz"
+Automatic decompression of compressed files over HTTP is supported.
+.IP "NTLM"
+NTLM authentication is supported.
+.IP "Debug"
+This curl uses a libcurl built with Debug. This enables more error-tracking
+and memory debugging etc. For curl-developers only!
+.IP "AsynchDNS"
+This curl uses asynchronous name resolves. Asynchronous name resolves can be
+done using either the c-ares or the threaded resolver backends.
+.IP "SPNEGO"
+SPNEGO authentication is supported.
+.IP "Largefile"
+This curl supports transfers of large files, files larger than 2GB.
+.IP "IDN"
+This curl supports IDN - international domain names.
+.IP "GSS-API"
+GSS-API is supported.
+.IP "SSPI"
+SSPI is supported.
+.IP "TLS-SRP"
+SRP (Secure Remote Password) authentication is supported for TLS.
+.IP "HTTP2"
+HTTP/2 support has been built-in.
+.IP "UnixSockets"
+Unix sockets support is provided.
+.IP "HTTPS-proxy"
+This curl is built to support HTTPS proxy.
+.IP "Metalink"
+This curl supports Metalink (both version 3 and 4 (RFC 5854)), which
+describes mirrors and hashes.  curl will use mirrors for failover if
+there are errors (such as the file or server not being available).
+.IP "PSL"
+PSL is short for Public Suffix List and means that this curl has been built
+with knowledge about "public suffixes".
+.RE
+.IP "-w, --write-out <format>"
+Make curl display information on stdout after a completed transfer. The format
+is a string that may contain plain text mixed with any number of
+variables. The format can be specified as a literal "string", or you can have
+curl read the format from a file with "@filename" and to tell curl to read the
+format from stdin you write "@-".
+
+The variables present in the output format will be substituted by the value or
+text that curl thinks fit, as described below. All variables are specified as
+%{variable_name} and to output a normal % you just write them as %%. You can
+output a newline by using \\n, a carriage return with \\r and a tab space with
+\\t.
+
+.B NOTE:
+The %-symbol is a special symbol in the win32-environment, where all
+occurrences of % must be doubled when using this option.
+
+The variables available are:
+.RS
+.TP 15
+.B content_type
+The Content-Type of the requested document, if there was any.
+.TP
+.B filename_effective
+The ultimate filename that curl writes out to. This is only meaningful if curl
+is told to write to a file with the \fI-O, --remote-name\fP or \fI-o, --output\fP
+option. It's most useful in combination with the \fI-J, --remote-header-name\fP
+option. (Added in 7.26.0)
+.TP
+.B ftp_entry_path
+The initial path curl ended up in when logging on to the remote FTP
+server. (Added in 7.15.4)
+.TP
+.B http_code
+The numerical response code that was found in the last retrieved HTTP(S) or
+FTP(s) transfer. In 7.18.2 the alias \fBresponse_code\fP was added to show the
+same info.
+.TP
+.B http_connect
+The numerical code that was found in the last response (from a proxy) to a
+curl CONNECT request. (Added in 7.12.4)
+.TP
+.B http_version
+The http version that was effectively used. (Added in 7.50.0)
+.TP
+.B local_ip
+The IP address of the local end of the most recently done connection - can be
+either IPv4 or IPv6 (Added in 7.29.0)
+.TP
+.B local_port
+The local port number of the most recently done connection (Added in 7.29.0)
+.TP
+.B num_connects
+Number of new connects made in the recent transfer. (Added in 7.12.3)
+.TP
+.B num_redirects
+Number of redirects that were followed in the request. (Added in 7.12.3)
+.TP
+.B redirect_url
+When an HTTP request was made without -L to follow redirects, this variable
+will show the actual URL a redirect \fIwould\fP take you to. (Added in 7.18.2)
+.TP
+.B remote_ip
+The remote IP address of the most recently done connection - can be either
+IPv4 or IPv6 (Added in 7.29.0)
+.TP
+.B remote_port
+The remote port number of the most recently done connection (Added in 7.29.0)
+.TP
+.B scheme
+The URL scheme (sometimes called protocol) that was effectively used (Added in 7.52.0)
+.TP
+.B size_download
+The total amount of bytes that were downloaded.
+.TP
+.B size_header
+The total amount of bytes of the downloaded headers.
+.TP
+.B size_request
+The total amount of bytes that were sent in the HTTP request.
+.TP
+.B size_upload
+The total amount of bytes that were uploaded.
+.TP
+.B speed_download
+The average download speed that curl measured for the complete download. Bytes
+per second.
+.TP
+.B speed_upload
+The average upload speed that curl measured for the complete upload. Bytes per
+second.
+.TP
+.B ssl_verify_result
+The result of the SSL peer certificate verification that was requested. 0
+means the verification was successful. (Added in 7.19.0)
+.TP
+.B time_appconnect
+The time, in seconds, it took from the start until the SSL/SSH/etc
+connect/handshake to the remote host was completed. (Added in 7.19.0)
+.TP
+.B time_connect
+The time, in seconds, it took from the start until the TCP connect to the
+remote host (or proxy) was completed.
+.TP
+.B time_namelookup
+The time, in seconds, it took from the start until the name resolving was
+completed.
+.TP
+.B time_pretransfer
+The time, in seconds, it took from the start until the file transfer was just
+about to begin. This includes all pre-transfer commands and negotiations that
+are specific to the particular protocol(s) involved.
+.TP
+.B time_redirect
+The time, in seconds, it took for all redirection steps include name lookup,
+connect, pretransfer and transfer before the final transaction was
+started. time_redirect shows the complete execution time for multiple
+redirections. (Added in 7.12.3)
+.TP
+.B time_starttransfer
+The time, in seconds, it took from the start until the first byte was just
+about to be transferred. This includes time_pretransfer and also the time the
+server needed to calculate the result.
+.TP
+.B time_total
+The total time, in seconds, that the full operation lasted.
+.TP
+.B url_effective
+The URL that was fetched last. This is most meaningful if you've told curl
+to follow location: headers.
+.RE
+.IP
+If this option is used several times, the last one will be used.
+.IP "--xattr"
+When saving output to a file, this option tells curl to store certain file
+metadata in extended file attributes. Currently, the URL is stored in the
+xdg.origin.url attribute and, for HTTP, the content type is stored in
+the mime_type attribute. If the file system does not support extended
+attributes, a warning is issued.
+.SH FILES
+.I ~/.curlrc
+.RS
+Default config file, see \fI-K, --config\fP for details.
+.SH ENVIRONMENT
+The environment variables can be specified in lower case or upper case. The
+lower case version has precedence. http_proxy is an exception as it is only
+available in lower case.
+
+Using an environment variable to set the proxy has the same effect as using
+the \fI-x, --proxy\fP option.
+
+.IP "http_proxy [protocol://]<host>[:port]"
+Sets the proxy server to use for HTTP.
+.IP "HTTPS_PROXY [protocol://]<host>[:port]"
+Sets the proxy server to use for HTTPS.
+.IP "[url-protocol]_PROXY [protocol://]<host>[:port]"
+Sets the proxy server to use for [url-protocol], where the protocol is a
+protocol that curl supports and as specified in a URL. FTP, FTPS, POP3, IMAP,
+SMTP, LDAP etc.
+.IP "ALL_PROXY [protocol://]<host>[:port]"
+Sets the proxy server to use if no protocol-specific proxy is set.
+.IP "NO_PROXY <comma-separated list of hosts>"
+list of host names that shouldn't go through any proxy. If set to a asterisk
+\&'*' only, it matches all hosts.
+
+Since 7.53.0, this environment variable disable the proxy even if specify
+\fI-x, --proxy\fP option. That is
+.B NO_PROXY=direct.example.com curl -x http://proxy.example.com
+.B http://direct.example.com
+accesses the target URL directly, and
+.B NO_PROXY=direct.example.com curl -x http://proxy.example.com
+.B http://somewhere.example.com
+accesses the target URL through proxy.
+
+.SH "PROXY PROTOCOL PREFIXES"
+Since curl version 7.21.7, the proxy string may be specified with a
+protocol:// prefix to specify alternative proxy protocols.
+
+If no protocol is specified in the proxy string or if the string doesn't match
+a supported one, the proxy will be treated as an HTTP proxy.
+
+The supported proxy protocol prefixes are as follows:
+.IP "socks4://"
+Makes it the equivalent of \fI--socks4\fP
+.IP "socks4a://"
+Makes it the equivalent of \fI--socks4a\fP
+.IP "socks5://"
+Makes it the equivalent of \fI--socks5\fP
+.IP "socks5h://"
+Makes it the equivalent of \fI--socks5-hostname\fP
+.SH EXIT CODES
+There are a bunch of different error codes and their corresponding error
+messages that may appear during bad conditions. At the time of this writing,
+the exit codes are:
+.IP 1
+Unsupported protocol. This build of curl has no support for this protocol.
+.IP 2
+Failed to initialize.
+.IP 3
+URL malformed. The syntax was not correct.
+.IP 4
+A feature or option that was needed to perform the desired request was not
+enabled or was explicitly disabled at build-time. To make curl able to do
+this, you probably need another build of libcurl!
+.IP 5
+Couldn't resolve proxy. The given proxy host could not be resolved.
+.IP 6
+Couldn't resolve host. The given remote host was not resolved.
+.IP 7
+Failed to connect to host.
+.IP 8
+Weird server reply. The server sent data curl couldn't parse.
+.IP 9
+FTP access denied. The server denied login or denied access to the particular
+resource or directory you wanted to reach. Most often you tried to change to a
+directory that doesn't exist on the server.
+.IP 10
+FTP accept failed. While waiting for the server to connect back when an active
+FTP session is used, an error code was sent over the control connection or
+similar.
+.IP 11
+FTP weird PASS reply. Curl couldn't parse the reply sent to the PASS request.
+.IP 12
+During an active FTP session while waiting for the server to connect back to
+curl, the timeout expired.
+.IP 11
+FTP weird PASS reply. Curl couldn't parse the reply sent to the PASS request.
+.IP 13
+FTP weird PASV reply, Curl couldn't parse the reply sent to the PASV request.
+.IP 14
+FTP weird 227 format. Curl couldn't parse the 227-line the server sent.
+.IP 15
+FTP can't get host. Couldn't resolve the host IP we got in the 227-line.
+.IP 16
+HTTP/2 error. A problem was detected in the HTTP2 framing layer. This is
+somewhat generic and can be one out of several problems, see the error message
+for details.
+.IP 17
+FTP couldn't set binary. Couldn't change transfer method to binary.
+.IP 18
+Partial file. Only a part of the file was transferred.
+.IP 19
+FTP couldn't download/access the given file, the RETR (or similar) command
+failed.
+.IP 21
+FTP quote error. A quote command returned error from the server.
+.IP 22
+HTTP page not retrieved. The requested url was not found or returned another
+error with the HTTP error code being 400 or above. This return code only
+appears if \fI-f, --fail\fP is used.
+.IP 23
+Write error. Curl couldn't write data to a local filesystem or similar.
+.IP 25
+FTP couldn't STOR file. The server denied the STOR operation, used for FTP
+uploading.
+.IP 26
+Read error. Various reading problems.
+.IP 27
+Out of memory. A memory allocation request failed.
+.IP 28
+Operation timeout. The specified time-out period was reached according to the
+conditions.
+.IP 30
+FTP PORT failed. The PORT command failed. Not all FTP servers support the PORT
+command, try doing a transfer using PASV instead!
+.IP 31
+FTP couldn't use REST. The REST command failed. This command is used for
+resumed FTP transfers.
+.IP 33
+HTTP range error. The range "command" didn't work.
+.IP 34
+HTTP post error. Internal post-request generation error.
+.IP 35
+SSL connect error. The SSL handshaking failed.
+.IP 36
+Bad download resume. Couldn't continue an earlier aborted download.
+.IP 37
+FILE couldn't read file. Failed to open the file. Permissions?
+.IP 38
+LDAP cannot bind. LDAP bind operation failed.
+.IP 39
+LDAP search failed.
+.IP 41
+Function not found. A required LDAP function was not found.
+.IP 42
+Aborted by callback. An application told curl to abort the operation.
+.IP 43
+Internal error. A function was called with a bad parameter.
+.IP 45
+Interface error. A specified outgoing interface could not be used.
+.IP 47
+Too many redirects. When following redirects, curl hit the maximum amount.
+.IP 48
+Unknown option specified to libcurl. This indicates that you passed a weird
+option to curl that was passed on to libcurl and rejected. Read up in the
+manual!
+.IP 49
+Malformed telnet option.
+.IP 51
+The peer's SSL certificate or SSH MD5 fingerprint was not OK.
+.IP 52
+The server didn't reply anything, which here is considered an error.
+.IP 53
+SSL crypto engine not found.
+.IP 54
+Cannot set SSL crypto engine as default.
+.IP 55
+Failed sending network data.
+.IP 56
+Failure in receiving network data.
+.IP 58
+Problem with the local certificate.
+.IP 59
+Couldn't use specified SSL cipher.
+.IP 60
+Peer certificate cannot be authenticated with known CA certificates.
+.IP 61
+Unrecognized transfer encoding.
+.IP 62
+Invalid LDAP URL.
+.IP 63
+Maximum file size exceeded.
+.IP 64
+Requested FTP SSL level failed.
+.IP 65
+Sending the data requires a rewind that failed.
+.IP 66
+Failed to initialise SSL Engine.
+.IP 67
+The user name, password, or similar was not accepted and curl failed to log in.
+.IP 68
+File not found on TFTP server.
+.IP 69
+Permission problem on TFTP server.
+.IP 70
+Out of disk space on TFTP server.
+.IP 71
+Illegal TFTP operation.
+.IP 72
+Unknown TFTP transfer ID.
+.IP 73
+File already exists (TFTP).
+.IP 74
+No such user (TFTP).
+.IP 75
+Character conversion failed.
+.IP 76
+Character conversion functions required.
+.IP 77
+Problem with reading the SSL CA cert (path? access rights?).
+.IP 78
+The resource referenced in the URL does not exist.
+.IP 79
+An unspecified error occurred during the SSH session.
+.IP 80
+Failed to shut down the SSL connection.
+.IP 82
+Could not load CRL file, missing or wrong format (added in 7.19.0).
+.IP 83
+Issuer check failed (added in 7.19.0).
+.IP 84
+The FTP PRET command failed
+.IP 85
+RTSP: mismatch of CSeq numbers
+.IP 86
+RTSP: mismatch of Session Identifiers
+.IP 87
+unable to parse FTP file list
+.IP 88
+FTP chunk callback reported error
+.IP 89
+No connection available, the session will be queued
+.IP 90
+SSL public key does not matched pinned public key
+.IP XX
+More error codes will appear here in future releases. The existing ones
+are meant to never change.
+.SH AUTHORS / CONTRIBUTORS
+Daniel Stenberg is the main author, but the whole list of contributors is
+found in the separate THANKS file.
+.SH WWW
+https://curl.haxx.se
+.SH FTP
+ftp://ftp.sunet.se/pub/www/utilities/curl/
+.SH "SEE ALSO"
+.BR ftp (1),
+.BR wget (1)
diff --git a/docs/libcurl/.gitignore b/docs/libcurl/.gitignore
index 270b0531f..d50bd63a0 100644
--- a/docs/libcurl/.gitignore
+++ b/docs/libcurl/.gitignore
@@ -1,4 +1,4 @@
 *.html
 *.pdf
 *.3.dist
-libcurl-symbols.3
+libgnurl-symbols.3
diff --git a/docs/libcurl/CMakeLists.txt b/docs/libcurl/CMakeLists.txt
index 0b32c5054..0365405de 100644
--- a/docs/libcurl/CMakeLists.txt
+++ b/docs/libcurl/CMakeLists.txt
@@ -4,7 +4,7 @@ include("${CMAKE_CURRENT_BINARY_DIR}/Makefile.inc.cmake")
 
 function(add_manual_pages _listname)
   foreach(_file IN LISTS ${_listname})
-    if(_file STREQUAL "libcurl-symbols.3")
+    if(_file STREQUAL "libgnurl-symbols.3")
       # Special case, an auto-generated file.
       set(_srcfile "${CMAKE_CURRENT_BINARY_DIR}/${_file}")
     else()
@@ -34,11 +34,11 @@ function(add_manual_pages _listname)
   endforeach()
 endfunction()
 
-add_custom_command(OUTPUT libcurl-symbols.3
+add_custom_command(OUTPUT libgnurl-symbols.3
   COMMAND
     "${PERL_EXECUTABLE}"
     "${CMAKE_CURRENT_SOURCE_DIR}/mksymbolsmanpage.pl" <
-    "${CMAKE_CURRENT_SOURCE_DIR}/symbols-in-versions" > libcurl-symbols.3
+    "${CMAKE_CURRENT_SOURCE_DIR}/symbols-in-versions" > libgnurl-symbols.3
   DEPENDS
     "${CMAKE_CURRENT_SOURCE_DIR}/symbols-in-versions"
     "${CMAKE_CURRENT_SOURCE_DIR}/mksymbolsmanpage.pl"
diff --git a/docs/libcurl/Makefile.am b/docs/libcurl/Makefile.am
index 041f02ea4..f828db2b4 100644
--- a/docs/libcurl/Makefile.am
+++ b/docs/libcurl/Makefile.am
@@ -33,10 +33,10 @@ HTMLPAGES = $(man_MANS:.3=.html)
 PDFPAGES = $(man_MANS:.3=.pdf)
 
 m4macrodir = $(datadir)/aclocal
-dist_m4macro_DATA = libcurl.m4
+dist_m4macro_DATA = libgnurl.m4
 
 CLEANFILES = $(HTMLPAGES) $(PDFPAGES) $(TESTS) $(man_DISTMANS) \
-  libcurl-symbols.3
+  libgnurl-symbols.3
 
 EXTRA_DIST = $(man_MANS) ABI symbols-in-versions symbols.pl  \
   mksymbolsmanpage.pl CMakeLists.txt
@@ -44,7 +44,7 @@ MAN2HTML= roffit --mandir=. $< >$@
 
 SUFFIXES = .3 .html
 
-libcurl-symbols.3: $(srcdir)/symbols-in-versions $(srcdir)/mksymbolsmanpage.pl
+libgnurl-symbols.3: $(srcdir)/symbols-in-versions $(srcdir)/mksymbolsmanpage.pl
 	perl $(srcdir)/mksymbolsmanpage.pl < $(srcdir)/symbols-in-versions > $@
 
 html: $(HTMLPAGES)
@@ -64,15 +64,15 @@ pdf: $(PDFPAGES)
 	echo "converted $< to $@")
 
 # Make sure each option man page is referenced in the main man page
-TESTS = check-easy check-multi
+TESTS =
 LOG_COMPILER = $(PERL)
 # The test fails if the log file contains any text
 AM_LOG_FLAGS = -p -e 'die "$$_" if ($$_);'
 
-check-easy: $(srcdir)/curl_easy_setopt.3 $(srcdir)/opts/CURLOPT*.3
-	OPTS="$$(ls $(srcdir)/opts/CURLOPT*.3 | $(SED) -e 's,^.*/,,' -e 's,\.3$$,,')" && \
-	for opt in $$OPTS; do grep "^\.IP $$opt$$" $(srcdir)/curl_easy_setopt.3 >/dev/null || echo Missing $$opt; done > $@
+check-easy: $(srcdir)/gnurl_easy_setopt.3 $(srcdir)/opts/GNURLOPT*.3
+	OPTS="$$(ls $(srcdir)/opts/GNURLOPT*.3 | $(SED) -e 's,^.*/,,' -e 's,\.3$$,,')" && \
+	for opt in $$OPTS; do grep "^\.IP $$opt$$" $(srcdir)/gnurl_easy_setopt.3 >/dev/null || echo Missing $$opt; done > $@
 
-check-multi: $(srcdir)/curl_multi_setopt.3 $(srcdir)/opts/CURLMOPT*.3
-	OPTS="$$(ls $(srcdir)/opts/CURLMOPT*.3 | $(SED) -e 's,^.*/,,' -e 's,\.3$$,,')" && \
-	for opt in $$OPTS; do grep "^\.IP $$opt$$" $(srcdir)/curl_multi_setopt.3 >/dev/null || echo Missing $$opt; done > $@
+check-multi: $(srcdir)/gnurl_multi_setopt.3 $(srcdir)/opts/GNURLMOPT*.3
+	OPTS="$$(ls $(srcdir)/opts/GNURLMOPT*.3 | $(SED) -e 's,^.*/,,' -e 's,\.3$$,,')" && \
+	for opt in $$OPTS; do grep "^\.IP $$opt$$" $(srcdir)/gnurl_multi_setopt.3 >/dev/null || echo Missing $$opt; done > $@
diff --git a/docs/libcurl/Makefile.inc b/docs/libcurl/Makefile.inc
index b4ff45dde..e472ea37b 100644
--- a/docs/libcurl/Makefile.inc
+++ b/docs/libcurl/Makefile.inc
@@ -1,83 +1,83 @@
 # Shared between Makefile.am and CMakeLists.txt
 
 man_MANS = \
- curl_easy_cleanup.3 \
- curl_easy_duphandle.3 \
- curl_easy_escape.3 \
- curl_easy_getinfo.3 \
- curl_easy_init.3 \
- curl_easy_pause.3 \
- curl_easy_perform.3 \
- curl_easy_recv.3 \
- curl_easy_reset.3 \
- curl_easy_send.3 \
- curl_easy_setopt.3 \
- curl_easy_strerror.3 \
- curl_easy_unescape.3 \
- curl_easy_upkeep.3 \
- curl_escape.3 \
- curl_formadd.3 \
- curl_formfree.3 \
- curl_formget.3 \
- curl_free.3 \
- curl_getdate.3 \
- curl_getenv.3 \
- curl_global_cleanup.3 \
- curl_global_init.3 \
- curl_global_init_mem.3 \
- curl_global_sslset.3 \
- curl_mime_addpart.3 \
- curl_mime_data.3 \
- curl_mime_data_cb.3 \
- curl_mime_encoder.3 \
- curl_mime_filedata.3 \
- curl_mime_filename.3 \
- curl_mime_free.3 \
- curl_mime_headers.3 \
- curl_mime_init.3 \
- curl_mime_name.3 \
- curl_mime_subparts.3 \
- curl_mime_type.3 \
- curl_mprintf.3 \
- curl_multi_add_handle.3 \
- curl_multi_assign.3 \
- curl_multi_cleanup.3 \
- curl_multi_fdset.3 \
- curl_multi_info_read.3 \
- curl_multi_init.3 \
- curl_multi_perform.3 \
- curl_multi_remove_handle.3 \
- curl_multi_setopt.3 \
- curl_multi_socket.3 \
- curl_multi_socket_action.3 \
- curl_multi_socket_all.3 \
- curl_multi_strerror.3 \
- curl_multi_timeout.3 \
- curl_multi_wait.3 \
- curl_share_cleanup.3 \
- curl_share_init.3 \
- curl_share_setopt.3 \
- curl_share_strerror.3 \
- curl_slist_append.3 \
- curl_slist_free_all.3 \
- curl_strequal.3 \
- curl_strnequal.3 \
- curl_unescape.3 \
- curl_url.3 \
- curl_url_cleanup.3 \
- curl_url_dup.3 \
- curl_url_get.3 \
- curl_url_set.3 \
- curl_version.3 \
- curl_version_info.3 \
- libcurl-easy.3 \
- libcurl-env.3 \
- libcurl-errors.3 \
- libcurl-multi.3 \
- libcurl-security.3 \
- libcurl-share.3 \
- libcurl-symbols.3 \
- libcurl-thread.3 \
- libcurl-tutorial.3 \
- libcurl-url.3 \
- libcurl.3
+ gnurl_easy_cleanup.3 \
+ gnurl_easy_duphandle.3 \
+ gnurl_easy_escape.3 \
+ gnurl_easy_getinfo.3 \
+ gnurl_easy_init.3 \
+ gnurl_easy_pause.3 \
+ gnurl_easy_perform.3 \
+ gnurl_easy_recv.3 \
+ gnurl_easy_reset.3 \
+ gnurl_easy_send.3 \
+ gnurl_easy_setopt.3 \
+ gnurl_easy_strerror.3 \
+ gnurl_easy_unescape.3 \
+ gnurl_easy_upkeep.3 \
+ gnurl_escape.3 \
+ gnurl_formadd.3 \
+ gnurl_formfree.3 \
+ gnurl_formget.3 \
+ gnurl_free.3 \
+ gnurl_getdate.3 \
+ gnurl_getenv.3 \
+ gnurl_global_cleanup.3 \
+ gnurl_global_init.3 \
+ gnurl_global_init_mem.3 \
+ gnurl_global_sslset.3 \
+ gnurl_mime_addpart.3 \
+ gnurl_mime_data.3 \
+ gnurl_mime_data_cb.3 \
+ gnurl_mime_encoder.3 \
+ gnurl_mime_filedata.3 \
+ gnurl_mime_filename.3 \
+ gnurl_mime_free.3 \
+ gnurl_mime_headers.3 \
+ gnurl_mime_init.3 \
+ gnurl_mime_name.3 \
+ gnurl_mime_subparts.3 \
+ gnurl_mime_type.3 \
+ gnurl_mprintf.3 \
+ gnurl_multi_add_handle.3 \
+ gnurl_multi_assign.3 \
+ gnurl_multi_cleanup.3 \
+ gnurl_multi_fdset.3 \
+ gnurl_multi_info_read.3 \
+ gnurl_multi_init.3 \
+ gnurl_multi_perform.3 \
+ gnurl_multi_remove_handle.3 \
+ gnurl_multi_setopt.3 \
+ gnurl_multi_socket.3 \
+ gnurl_multi_socket_action.3 \
+ gnurl_multi_socket_all.3 \
+ gnurl_multi_strerror.3 \
+ gnurl_multi_timeout.3 \
+ gnurl_multi_wait.3 \
+ gnurl_share_cleanup.3 \
+ gnurl_share_init.3 \
+ gnurl_share_setopt.3 \
+ gnurl_share_strerror.3 \
+ gnurl_slist_append.3 \
+ gnurl_slist_free_all.3 \
+ gnurl_strequal.3 \
+ gnurl_strnequal.3 \
+ gnurl_unescape.3 \
+ gnurl_url.3 \
+ gnurl_url_cleanup.3 \
+ gnurl_url_dup.3 \
+ gnurl_url_get.3 \
+ gnurl_url_set.3 \
+ gnurl_version.3 \
+ gnurl_version_info.3 \
+ libgnurl-easy.3 \
+ libgnurl-env.3 \
+ libgnurl-errors.3 \
+ libgnurl-multi.3 \
+ libgnurl-security.3 \
+ libgnurl-share.3 \
+ libgnurl-symbols.3 \
+ libgnurl-thread.3 \
+ libgnurl-tutorial.3 \
+ libgnurl-url.3 \
+ libgnurl.3
diff --git a/docs/libcurl/curl_multi_socket_all.3 b/docs/libcurl/curl_multi_socket_all.3
deleted file mode 100644
index 428dd06f9..000000000
--- a/docs/libcurl/curl_multi_socket_all.3
+++ /dev/null
@@ -1 +0,0 @@
-.so man3/curl_multi_socket.3
diff --git a/docs/libcurl/curl_strnequal.3 b/docs/libcurl/curl_strnequal.3
deleted file mode 100644
index ce41d3e41..000000000
--- a/docs/libcurl/curl_strnequal.3
+++ /dev/null
@@ -1 +0,0 @@
-.so man3/curl_strequal.3
diff --git a/docs/libcurl/curl_easy_cleanup.3 b/docs/libcurl/gnurl_easy_cleanup.3
index 626d98c51..fd05f44fb 100644
--- a/docs/libcurl/curl_easy_cleanup.3
+++ b/docs/libcurl/gnurl_easy_cleanup.3
@@ -20,11 +20,11 @@
 .\" *
 .\" **************************************************************************
 .\"
-.TH curl_easy_cleanup 3 "22 Aug 2007" "libcurl 7.17.0" "libcurl Manual"
+.TH gnurl_easy_cleanup 3 "22 Aug 2007" "libcurl 7.17.0" "libgnurl Manual"
 .SH NAME
 curl_easy_cleanup - End a libcurl easy handle
 .SH SYNOPSIS
-.B #include <curl/curl.h>
+.B #include <gnurl/curl.h>
 
 .BI "void curl_easy_cleanup(CURL *" handle ");"
 .SH DESCRIPTION
diff --git a/docs/libcurl/curl_easy_duphandle.3 b/docs/libcurl/gnurl_easy_duphandle.3
index 97d04f740..bf413235c 100644
--- a/docs/libcurl/curl_easy_duphandle.3
+++ b/docs/libcurl/gnurl_easy_duphandle.3
@@ -19,11 +19,11 @@
 .\" * KIND, either express or implied.
 .\" *
 .\" **************************************************************************
-.TH curl_easy_duphandle 3 "19 Sep 2014" "libcurl" "libcurl Manual"
+.TH gnurl_easy_duphandle 3 "19 Sep 2014" "libcurl" "libgnurl Manual"
 .SH NAME
 curl_easy_duphandle - Clone a libcurl session handle
 .SH SYNOPSIS
-.B #include <curl/curl.h>
+.B #include <gnurl/curl.h>
 
 .BI "CURL *curl_easy_duphandle(CURL *"handle ");"
 
diff --git a/docs/libcurl/curl_easy_escape.3 b/docs/libcurl/gnurl_easy_escape.3
index 2f9192e10..1065a5c67 100644
--- a/docs/libcurl/curl_easy_escape.3
+++ b/docs/libcurl/gnurl_easy_escape.3
@@ -20,11 +20,11 @@
 .\" *
 .\" **************************************************************************
 .\"
-.TH curl_easy_escape 3 "7 April 2006" "libcurl 7.15.4" "libcurl Manual"
+.TH gnurl_easy_escape 3 "7 April 2006" "libcurl 7.15.4" "libgnurl Manual"
 .SH NAME
 curl_easy_escape - URL encodes the given string
 .SH SYNOPSIS
-.B #include <curl/curl.h>
+.B #include <gnurl/curl.h>
 .sp
 .BI "char *curl_easy_escape( CURL *" curl ", const char *" string
 .BI ", int "length " );"
diff --git a/docs/libcurl/curl_easy_getinfo.3 b/docs/libcurl/gnurl_easy_getinfo.3
index d41812f84..2746ea5cc 100644
--- a/docs/libcurl/curl_easy_getinfo.3
+++ b/docs/libcurl/gnurl_easy_getinfo.3
@@ -20,11 +20,11 @@
 .\" *
 .\" **************************************************************************
 .\"
-.TH curl_easy_getinfo 3 "11 Feb 2009" "libcurl 7.19.4" "libcurl Manual"
+.TH gnurl_easy_getinfo 3 "11 Feb 2009" "libcurl 7.19.4" "libgnurl Manual"
 .SH NAME
 curl_easy_getinfo - extract information from a curl handle
 .SH SYNOPSIS
-.B #include <curl/curl.h>
+.B #include <gnurl/curl.h>
 
 .B "CURLcode curl_easy_getinfo(CURL *curl, CURLINFO info, ... );"
 
diff --git a/docs/libcurl/curl_easy_init.3 b/docs/libcurl/gnurl_easy_init.3
index 371a3b81c..3253fe1c0 100644
--- a/docs/libcurl/curl_easy_init.3
+++ b/docs/libcurl/gnurl_easy_init.3
@@ -19,11 +19,11 @@
 .\" * KIND, either express or implied.
 .\" *
 .\" **************************************************************************
-.TH curl_easy_init 3 "4 March 2002" "libcurl 7.8.1" "libcurl Manual"
+.TH gnurl_easy_init 3 "4 March 2002" "libcurl 7.8.1" "libgnurl Manual"
 .SH NAME
 curl_easy_init - Start a libcurl easy session
 .SH SYNOPSIS
-.B #include <curl/curl.h>
+.B #include <gnurl/curl.h>
 
 .BI "CURL *curl_easy_init( );"
 .SH DESCRIPTION
diff --git a/docs/libcurl/curl_easy_pause.3 b/docs/libcurl/gnurl_easy_pause.3
index 131fa774f..6d223f2dd 100644
--- a/docs/libcurl/curl_easy_pause.3
+++ b/docs/libcurl/gnurl_easy_pause.3
@@ -19,11 +19,11 @@
 .\" * KIND, either express or implied.
 .\" *
 .\" **************************************************************************
-.TH curl_easy_pause 3 "17 Dec 2007" "libcurl 7.18.0" "libcurl Manual"
+.TH gnurl_easy_pause 3 "17 Dec 2007" "libcurl 7.18.0" "libgnurl Manual"
 .SH NAME
 curl_easy_pause - pause and unpause a connection
 .SH SYNOPSIS
-.B #include <curl/curl.h>
+.B #include <gnurl/curl.h>
 
 .BI "CURLcode curl_easy_pause(CURL *"handle ", int "bitmask " );"
 
diff --git a/docs/libcurl/curl_easy_perform.3 b/docs/libcurl/gnurl_easy_perform.3
index 007f609e0..c0ace9921 100644
--- a/docs/libcurl/curl_easy_perform.3
+++ b/docs/libcurl/gnurl_easy_perform.3
@@ -19,11 +19,11 @@
 .\" * KIND, either express or implied.
 .\" *
 .\" **************************************************************************
-.TH curl_easy_perform 3 "5 Mar 2001" "libcurl 7.7" "libcurl Manual"
+.TH gnurl_easy_perform 3 "5 Mar 2001" "libcurl 7.7" "libgnurl Manual"
 .SH NAME
 curl_easy_perform - perform a blocking file transfer
 .SH SYNOPSIS
-.B #include <curl/curl.h>
+.B #include <gnurl/curl.h>
 .sp
 .BI "CURLcode curl_easy_perform(CURL *" easy_handle ");"
 .ad
@@ -54,7 +54,7 @@ While the \fBeasy_handle\fP is added to a multi handle, it cannot be used by
 \fIcurl_easy_perform(3)\fP.
 .SH RETURN VALUE
 CURLE_OK (0) means everything was ok, non-zero means an error occurred as
-.I <curl/curl.h>
+.I <gnurl/curl.h>
 defines - see \fIlibcurl-errors(3)\fP. If the \fICURLOPT_ERRORBUFFER(3)\fP was
 set with \fIcurl_easy_setopt(3)\fP there will be a readable error message in
 the error buffer when non-zero is returned.
diff --git a/docs/libcurl/curl_easy_recv.3 b/docs/libcurl/gnurl_easy_recv.3
index 7a812dd00..d5127757f 100644
--- a/docs/libcurl/curl_easy_recv.3
+++ b/docs/libcurl/gnurl_easy_recv.3
@@ -20,11 +20,11 @@
 .\" *
 .\" **************************************************************************
 .\"
-.TH curl_easy_recv 3 "29 April 2008" "libcurl 7.18.2" "libcurl Manual"
+.TH gnurl_easy_recv 3 "29 April 2008" "libcurl 7.18.2" "libgnurl Manual"
 .SH NAME
 curl_easy_recv - receives raw data on an "easy" connection
 .SH SYNOPSIS
-.B #include <curl/easy.h>
+.B #include <gnurl/easy.h>
 .sp
 .BI "CURLcode curl_easy_recv( CURL *" curl ", void *" buffer ","
 .BI "size_t " buflen ", size_t *" n ");"
diff --git a/docs/libcurl/curl_easy_reset.3 b/docs/libcurl/gnurl_easy_reset.3
index 539f9c716..56f5bbea7 100644
--- a/docs/libcurl/curl_easy_reset.3
+++ b/docs/libcurl/gnurl_easy_reset.3
@@ -19,11 +19,11 @@
 .\" * KIND, either express or implied.
 .\" *
 .\" **************************************************************************
-.TH curl_easy_reset 3 "31 July 2004" "libcurl 7.12.1" "libcurl Manual"
+.TH gnurl_easy_reset 3 "31 July 2004" "libcurl 7.12.1" "libgnurl Manual"
 .SH NAME
 curl_easy_reset - reset all options of a libcurl session handle
 .SH SYNOPSIS
-.B #include <curl/curl.h>
+.B #include <gnurl/curl.h>
 
 .BI "void curl_easy_reset(CURL *"handle ");"
 
diff --git a/docs/libcurl/curl_easy_send.3 b/docs/libcurl/gnurl_easy_send.3
index 47976f391..08c0671b0 100644
--- a/docs/libcurl/curl_easy_send.3
+++ b/docs/libcurl/gnurl_easy_send.3
@@ -20,11 +20,11 @@
 .\" *
 .\" **************************************************************************
 .\"
-.TH curl_easy_send 3 "29 April 2008" "libcurl 7.18.2" "libcurl Manual"
+.TH gnurl_easy_send 3 "29 April 2008" "libcurl 7.18.2" "libgnurl Manual"
 .SH NAME
 curl_easy_send - sends raw data over an "easy" connection
 .SH SYNOPSIS
-.B #include <curl/easy.h>
+.B #include <gnurl/easy.h>
 .sp
 .BI "CURLcode curl_easy_send( CURL *" curl ", const void *" buffer ","
 .BI " size_t " buflen ", size_t *" n ");"
diff --git a/docs/libcurl/curl_easy_setopt.3 b/docs/libcurl/gnurl_easy_setopt.3
index fc361d80c..17ed4369d 100644
--- a/docs/libcurl/curl_easy_setopt.3
+++ b/docs/libcurl/gnurl_easy_setopt.3
@@ -20,11 +20,11 @@
 .\" *
 .\" **************************************************************************
 .\"
-.TH curl_easy_setopt 3 "25 Jun 2014" "libcurl 7.38.0" "libcurl Manual"
+.TH gnurl_easy_setopt 3 "25 Jun 2014" "libcurl 7.38.0" "libgnurl Manual"
 .SH NAME
 curl_easy_setopt \- set options for a curl easy handle
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLoption option, parameter);
 .SH DESCRIPTION
@@ -616,7 +616,7 @@ Mode for creating new remote directories. See \fICURLOPT_NEW_DIRECTORY_PERMS(3)\
 TELNET options. See \fICURLOPT_TELNETOPTIONS(3)\fP
 .SH RETURN VALUE
 \fICURLE_OK\fP (zero) means that the option was set properly, non-zero means an
-error occurred as \fI<curl/curl.h>\fP defines. See the \fIlibcurl-errors(3)\fP
+error occurred as \fI<gnurl/curl.h>\fP defines. See the \fIlibcurl-errors(3)\fP
 man page for the full list with descriptions.
 
 If you try to set an option that libcurl doesn't know about, perhaps because
diff --git a/docs/libcurl/curl_easy_strerror.3 b/docs/libcurl/gnurl_easy_strerror.3
index ac9412207..f38b8acb5 100644
--- a/docs/libcurl/curl_easy_strerror.3
+++ b/docs/libcurl/gnurl_easy_strerror.3
@@ -19,11 +19,11 @@
 .\" * KIND, either express or implied.
 .\" *
 .\" **************************************************************************
-.TH curl_easy_strerror 3 "26 Apr 2004" "libcurl 7.12" "libcurl Manual"
+.TH gnurl_easy_strerror 3 "26 Apr 2004" "libcurl 7.12" "libgnurl Manual"
 .SH NAME
 curl_easy_strerror - return string describing error code
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 const char *curl_easy_strerror(CURLcode errornum);
 .SH DESCRIPTION
diff --git a/docs/libcurl/curl_easy_unescape.3 b/docs/libcurl/gnurl_easy_unescape.3
index 50ce97db7..397ae1ab1 100644
--- a/docs/libcurl/curl_easy_unescape.3
+++ b/docs/libcurl/gnurl_easy_unescape.3
@@ -20,11 +20,11 @@
 .\" *
 .\" **************************************************************************
 .\"
-.TH curl_easy_unescape 3 "7 April 2006" "libcurl 7.15.4" "libcurl Manual"
+.TH gnurl_easy_unescape 3 "7 April 2006" "libcurl 7.15.4" "libgnurl Manual"
 .SH NAME
 curl_easy_unescape - URL decodes the given string
 .SH SYNOPSIS
-.B #include <curl/curl.h>
+.B #include <gnurl/curl.h>
 .sp
 .BI "char *curl_easy_unescape( CURL *" curl ", const char *" url
 .BI ", int "inlength ", int *" outlength " );"
diff --git a/docs/libcurl/curl_easy_upkeep.3 b/docs/libcurl/gnurl_easy_upkeep.3
index f705b61fb..761902381 100644
--- a/docs/libcurl/curl_easy_upkeep.3
+++ b/docs/libcurl/gnurl_easy_upkeep.3
@@ -20,11 +20,11 @@
 .\" *
 .\" **************************************************************************
 .\"
-.TH curl_easy_upkeep 3 "31 Oct 2018" "libcurl 7.62.0" "libcurl Manual"
+.TH gnurl_easy_upkeep 3 "31 Oct 2018" "libcurl 7.62.0" "libgnurl Manual"
 .SH NAME
 curl_easy_upkeep - Perform any connection upkeep checks.
 .SH SYNOPSIS
-.B #include <curl/curl.h>
+.B #include <gnurl/curl.h>
 
 .BI "CURLcode curl_easy_upkeep(CURL *" handle ");"
 .SH DESCRIPTION
diff --git a/docs/libcurl/curl_escape.3 b/docs/libcurl/gnurl_escape.3
index 03f02d323..33f756eae 100644
--- a/docs/libcurl/curl_escape.3
+++ b/docs/libcurl/gnurl_escape.3
@@ -19,11 +19,11 @@
 .\" * KIND, either express or implied.
 .\" *
 .\" **************************************************************************
-.TH curl_escape 3 "6 March 2002" "libcurl 7.9" "libcurl Manual"
+.TH gnurl_escape 3 "6 March 2002" "libcurl 7.9" "libgnurl Manual"
 .SH NAME
 curl_escape - URL encodes the given string
 .SH SYNOPSIS
-.B #include <curl/curl.h>
+.B #include <gnurl/curl.h>
 .sp
 .BI "char *curl_escape( const char *" url ", int "length " );"
 .ad
diff --git a/docs/libcurl/curl_formadd.3 b/docs/libcurl/gnurl_formadd.3
index 28047b214..dbfd43214 100644
--- a/docs/libcurl/curl_formadd.3
+++ b/docs/libcurl/gnurl_formadd.3
@@ -19,11 +19,11 @@
 .\" * KIND, either express or implied.
 .\" *
 .\" **************************************************************************
-.TH curl_formadd 3 "24 June 2002" "libcurl 7.9.8" "libcurl Manual"
+.TH gnurl_formadd 3 "24 June 2002" "libcurl 7.9.8" "libgnurl Manual"
 .SH NAME
 curl_formadd - add a section to a multipart/formdata HTTP POST
 .SH SYNOPSIS
-.B #include <curl/curl.h>
+.B #include <gnurl/curl.h>
 .sp
 .BI "CURLFORMcode curl_formadd(struct curl_httppost ** " firstitem,
 .BI "struct curl_httppost ** " lastitem, " ...);"
@@ -180,7 +180,7 @@ double quotes in field and file names are now escaped before transmission.
 .SH RETURN VALUE
 0 means everything was ok, non-zero means an error occurred corresponding
 to a CURL_FORMADD_* constant defined in
-.I <curl/curl.h>
+.I <gnurl/curl.h>
 .SH EXAMPLE
 .nf
 
diff --git a/docs/libcurl/curl_formfree.3 b/docs/libcurl/gnurl_formfree.3
index 6e0e95f57..24764dc59 100644
--- a/docs/libcurl/curl_formfree.3
+++ b/docs/libcurl/gnurl_formfree.3
@@ -19,11 +19,11 @@
 .\" * KIND, either express or implied.
 .\" *
 .\" **************************************************************************
-.TH curl_formfree 3 "6 April 2001" "libcurl 7.7.1" "libcurl Manual"
+.TH gnurl_formfree 3 "6 April 2001" "libcurl 7.7.1" "libgnurl Manual"
 .SH NAME
 curl_formfree - free a previously build multipart/formdata HTTP POST chain
 .SH SYNOPSIS
-.B #include <curl/curl.h>
+.B #include <gnurl/curl.h>
 .sp
 .BI "void curl_formfree(struct curl_httppost *" form);
 .ad
diff --git a/docs/libcurl/curl_formget.3 b/docs/libcurl/gnurl_formget.3
index 0d947253a..261e51df6 100644
--- a/docs/libcurl/curl_formget.3
+++ b/docs/libcurl/gnurl_formget.3
@@ -19,12 +19,12 @@
 .\" * KIND, either express or implied.
 .\" *
 .\" **************************************************************************
-.TH curl_formget 3 "20 June 2006" "libcurl 7.15.5" "libcurl Manual"
+.TH gnurl_formget 3 "20 June 2006" "libcurl 7.15.5" "libgnurl Manual"
 .SH NAME
 curl_formget - serialize a previously built multipart/formdata HTTP POST chain
 .SH SYNOPSIS
 .nf
-.B #include <curl/curl.h>
+.B #include <gnurl/curl.h>
 
 int curl_formget(struct curl_httppost * form, void *userp,
                   curl_formget_callback append );
diff --git a/docs/libcurl/curl_free.3 b/docs/libcurl/gnurl_free.3
index e2cf890f0..e9901fa74 100644
--- a/docs/libcurl/curl_free.3
+++ b/docs/libcurl/gnurl_free.3
@@ -19,11 +19,11 @@
 .\" * KIND, either express or implied.
 .\" *
 .\" **************************************************************************
-.TH curl_free 3 "12 Aug 2003" "libcurl 7.10" "libcurl Manual"
+.TH gnurl_free 3 "12 Aug 2003" "libcurl 7.10" "libgnurl Manual"
 .SH NAME
 curl_free - reclaim memory that has been obtained through a libcurl call
 .SH SYNOPSIS
-.B #include <curl/curl.h>
+.B #include <gnurl/curl.h>
 .sp
 .BI "void curl_free( char *" ptr " );"
 .ad
diff --git a/docs/libcurl/curl_getdate.3 b/docs/libcurl/gnurl_getdate.3
index 71479d20e..eb122eaf3 100644
--- a/docs/libcurl/curl_getdate.3
+++ b/docs/libcurl/gnurl_getdate.3
@@ -19,11 +19,11 @@
 .\" * KIND, either express or implied.
 .\" *
 .\" **************************************************************************
-.TH curl_getdate 3 "12 Aug 2005" "libcurl 7.0" "libcurl Manual"
+.TH gnurl_getdate 3 "12 Aug 2005" "libcurl 7.0" "libgnurl Manual"
 .SH NAME
 curl_getdate - Convert a date string to number of seconds
 .SH SYNOPSIS
-.B #include <curl/curl.h>
+.B #include <gnurl/curl.h>
 .sp
 .BI "time_t curl_getdate(char *" datestring ", time_t *"now " );"
 .ad
diff --git a/docs/libcurl/curl_getenv.3 b/docs/libcurl/gnurl_getenv.3
index c6bee98db..7be52d1db 100644
--- a/docs/libcurl/curl_getenv.3
+++ b/docs/libcurl/gnurl_getenv.3
@@ -19,11 +19,11 @@
 .\" * KIND, either express or implied.
 .\" *
 .\" **************************************************************************
-.TH curl_getenv 3 "30 April 2004" "libcurl 7.12" "libcurl Manual"
+.TH gnurl_getenv 3 "30 April 2004" "libcurl 7.12" "libgnurl Manual"
 .SH NAME
 curl_getenv - return value for environment name
 .SH SYNOPSIS
-.B #include <curl/curl.h>
+.B #include <gnurl/curl.h>
 .sp
 .BI "char *curl_getenv(const char *" name ");"
 .ad
diff --git a/docs/libcurl/curl_global_cleanup.3 b/docs/libcurl/gnurl_global_cleanup.3
index 04ab0437c..a5b6675c2 100644
--- a/docs/libcurl/curl_global_cleanup.3
+++ b/docs/libcurl/gnurl_global_cleanup.3
@@ -19,11 +19,11 @@
 .\" * KIND, either express or implied.
 .\" *
 .\" **************************************************************************
-.TH curl_global_cleanup 3 "17 Feb 2006" "libcurl 7.8" "libcurl Manual"
+.TH gnurl_global_cleanup 3 "17 Feb 2006" "libcurl 7.8" "libgnurl Manual"
 .SH NAME
 curl_global_cleanup - global libcurl cleanup
 .SH SYNOPSIS
-.B #include <curl/curl.h>
+.B #include <gnurl/curl.h>
 .sp
 .BI "void curl_global_cleanup(void);"
 .ad
diff --git a/docs/libcurl/curl_global_init.3 b/docs/libcurl/gnurl_global_init.3
index 6ba0920c1..797c0d7ff 100644
--- a/docs/libcurl/curl_global_init.3
+++ b/docs/libcurl/gnurl_global_init.3
@@ -19,11 +19,11 @@
 .\" * KIND, either express or implied.
 .\" *
 .\" **************************************************************************
-.TH curl_global_init 3 "11 May 2004" "libcurl 7.12" "libcurl Manual"
+.TH gnurl_global_init 3 "11 May 2004" "libcurl 7.12" "libgnurl Manual"
 .SH NAME
 curl_global_init - Global libcurl initialisation
 .SH SYNOPSIS
-.B #include <curl/curl.h>
+.B #include <gnurl/curl.h>
 .sp
 .BI "CURLcode curl_global_init(long " flags ");"
 .ad
diff --git a/docs/libcurl/curl_global_init_mem.3 b/docs/libcurl/gnurl_global_init_mem.3
index 610ab5607..d49d4b13d 100644
--- a/docs/libcurl/curl_global_init_mem.3
+++ b/docs/libcurl/gnurl_global_init_mem.3
@@ -19,11 +19,11 @@
 .\" * KIND, either express or implied.
 .\" *
 .\" **************************************************************************
-.TH curl_global_init_mem 3 "10 May 2004" "libcurl 7.12.0" "libcurl Manual"
+.TH gnurl_global_init_mem 3 "10 May 2004" "libcurl 7.12.0" "libgnurl Manual"
 .SH NAME
 curl_global_init_mem - Global libcurl initialisation with memory callbacks
 .SH SYNOPSIS
-.B #include <curl/curl.h>
+.B #include <gnurl/curl.h>
 .nf
 .B "CURLcode curl_global_init_mem(long " flags,
 .B " curl_malloc_callback "m,
diff --git a/docs/libcurl/curl_global_sslset.3 b/docs/libcurl/gnurl_global_sslset.3
index 22d95065d..c9f5a4027 100644
--- a/docs/libcurl/curl_global_sslset.3
+++ b/docs/libcurl/gnurl_global_sslset.3
@@ -19,11 +19,11 @@
 .\" * KIND, either express or implied.
 .\" *
 .\" **************************************************************************
-.TH curl_global_sslset 3 "15 July 2017" "libcurl 7.56" "libcurl Manual"
+.TH gnurl_global_sslset 3 "15 July 2017" "libcurl 7.56" "libgnurl Manual"
 .SH NAME
 curl_global_sslset - Select SSL backend to use with libcurl
 .SH SYNOPSIS
-.B #include <curl/curl.h>
+.B #include <gnurl/curl.h>
 .nf
 
 typedef struct {
diff --git a/docs/libcurl/curl_mime_addpart.3 b/docs/libcurl/gnurl_mime_addpart.3
index 22350668a..9aab787eb 100644
--- a/docs/libcurl/curl_mime_addpart.3
+++ b/docs/libcurl/gnurl_mime_addpart.3
@@ -19,11 +19,11 @@
 .\" * KIND, either express or implied.
 .\" *
 .\" **************************************************************************
-.TH curl_mime_addpart 3 "22 August 2017" "libcurl 7.56.0" "libcurl Manual"
+.TH gnurl_mime_addpart 3 "22 August 2017" "libcurl 7.56.0" "libgnurl Manual"
 .SH NAME
 curl_mime_addpart - append a new empty part to a mime structure
 .SH SYNOPSIS
-.B #include <curl/curl.h>
+.B #include <gnurl/curl.h>
 .sp
 .BI "curl_mimepart * curl_mime_addpart(curl_mime * " mime ");"
 .ad
diff --git a/docs/libcurl/curl_mime_data.3 b/docs/libcurl/gnurl_mime_data.3
index d2112f2d4..a14617cea 100644
--- a/docs/libcurl/curl_mime_data.3
+++ b/docs/libcurl/gnurl_mime_data.3
@@ -19,11 +19,11 @@
 .\" * KIND, either express or implied.
 .\" *
 .\" **************************************************************************
-.TH curl_mime_data 3 "22 August 2017" "libcurl 7.56.0" "libcurl Manual"
+.TH gnurl_mime_data 3 "22 August 2017" "libcurl 7.56.0" "libgnurl Manual"
 .SH NAME
 curl_mime_data - set a mime part's body data from memory
 .SH SYNOPSIS
-.B #include <curl/curl.h>
+.B #include <gnurl/curl.h>
 .sp
 .BI "CURLcode curl_mime_data(curl_mimepart * " part ", const char * " data
 .BI ", size_t " datasize ");"
diff --git a/docs/libcurl/curl_mime_data_cb.3 b/docs/libcurl/gnurl_mime_data_cb.3
index 8ce42c300..2fd7413c4 100644
--- a/docs/libcurl/curl_mime_data_cb.3
+++ b/docs/libcurl/gnurl_mime_data_cb.3
@@ -19,11 +19,11 @@
 .\" * KIND, either express or implied.
 .\" *
 .\" **************************************************************************
-.TH curl_mime_data_cb 3 "22 August 2017" "libcurl 7.56.0" "libcurl Manual"
+.TH gnurl_mime_data_cb 3 "22 August 2017" "libcurl 7.56.0" "libgnurl Manual"
 .SH NAME
 curl_mime_data_cb - set a callback-based data source for a mime part's body
 .SH SYNOPSIS
-.B #include <curl/curl.h>
+.B #include <gnurl/curl.h>
 .sp
 size_t readfunc(char *buffer, size_t size, size_t nitems, void *arg);
 .br
diff --git a/docs/libcurl/curl_mime_encoder.3 b/docs/libcurl/gnurl_mime_encoder.3
index c17cf25b3..08c65c3e7 100644
--- a/docs/libcurl/curl_mime_encoder.3
+++ b/docs/libcurl/gnurl_mime_encoder.3
@@ -19,11 +19,11 @@
 .\" * KIND, either express or implied.
 .\" *
 .\" **************************************************************************
-.TH curl_mime_encoder 3 "22 August 2017" "libcurl 7.56.0" "libcurl Manual"
+.TH gnurl_mime_encoder 3 "22 August 2017" "libcurl 7.56.0" "libgnurl Manual"
 .SH NAME
 curl_mime_encoder - set a mime part's encoder and content transfer encoding
 .SH SYNOPSIS
-.B #include <curl/curl.h>
+.B #include <gnurl/curl.h>
 .sp
 .BI "CURLcode curl_mime_encoder(curl_mimepart * " part ,
 .BI "const char * " encoding ");"
diff --git a/docs/libcurl/curl_mime_filedata.3 b/docs/libcurl/gnurl_mime_filedata.3
index e22b5810d..1481174db 100644
--- a/docs/libcurl/curl_mime_filedata.3
+++ b/docs/libcurl/gnurl_mime_filedata.3
@@ -19,11 +19,11 @@
 .\" * KIND, either express or implied.
 .\" *
 .\" **************************************************************************
-.TH curl_mime_filedata 3 "22 August 2017" "libcurl 7.56.0" "libcurl Manual"
+.TH gnurl_mime_filedata 3 "22 August 2017" "libcurl 7.56.0" "libgnurl Manual"
 .SH NAME
 curl_mime_filedata - set a mime part's body data from a file contents
 .SH SYNOPSIS
-.B #include <curl/curl.h>
+.B #include <gnurl/curl.h>
 .sp
 .BI "CURLcode curl_mime_filedata(curl_mimepart * " part ,
 .BI " const char * " filename ");"
diff --git a/docs/libcurl/curl_mime_filename.3 b/docs/libcurl/gnurl_mime_filename.3
index 42916e598..b0c20791e 100644
--- a/docs/libcurl/curl_mime_filename.3
+++ b/docs/libcurl/gnurl_mime_filename.3
@@ -19,11 +19,11 @@
 .\" * KIND, either express or implied.
 .\" *
 .\" **************************************************************************
-.TH curl_mime_filename 3 "22 August 2017" "libcurl 7.56.0" "libcurl Manual"
+.TH gnurl_mime_filename 3 "22 August 2017" "libcurl 7.56.0" "libgnurl Manual"
 .SH NAME
 curl_mime_filename - set a mime part's remote file name
 .SH SYNOPSIS
-.B #include <curl/curl.h>
+.B #include <gnurl/curl.h>
 .sp
 .BI "CURLcode curl_mime_filename(curl_mimepart * " part ,
 .BI "const char * " filename ");"
diff --git a/docs/libcurl/curl_mime_free.3 b/docs/libcurl/gnurl_mime_free.3
index 80a95486e..8476d1a32 100644
--- a/docs/libcurl/curl_mime_free.3
+++ b/docs/libcurl/gnurl_mime_free.3
@@ -19,11 +19,11 @@
 .\" * KIND, either express or implied.
 .\" *
 .\" **************************************************************************
-.TH curl_mime_free 3 "22 August 2017" "libcurl 7.56.0" "libcurl Manual"
+.TH gnurl_mime_free 3 "22 August 2017" "libcurl 7.56.0" "libgnurl Manual"
 .SH NAME
 curl_mime_free - free a previously built mime structure
 .SH SYNOPSIS
-.B #include <curl/curl.h>
+.B #include <gnurl/curl.h>
 .sp
 .BI "void curl_mime_free(curl_mime *" mime);
 .ad
diff --git a/docs/libcurl/curl_mime_headers.3 b/docs/libcurl/gnurl_mime_headers.3
index 1d02e1ee5..ae54efd81 100644
--- a/docs/libcurl/curl_mime_headers.3
+++ b/docs/libcurl/gnurl_mime_headers.3
@@ -19,11 +19,11 @@
 .\" * KIND, either express or implied.
 .\" *
 .\" **************************************************************************
-.TH curl_mime_headers 3 "22 August 2017" "libcurl 7.56.0" "libcurl Manual"
+.TH gnurl_mime_headers 3 "22 August 2017" "libcurl 7.56.0" "libgnurl Manual"
 .SH NAME
 curl_mime_headers - set a mime part's custom headers
 .SH SYNOPSIS
-.B #include <curl/curl.h>
+.B #include <gnurl/curl.h>
 .sp
 .BI "CURLcode curl_mime_headers(curl_mimepart * " part ,
 .BI "struct curl_slist * " headers ", int " take_ownership ");"
diff --git a/docs/libcurl/curl_mime_init.3 b/docs/libcurl/gnurl_mime_init.3
index 469f02b7c..d6a49d1e7 100644
--- a/docs/libcurl/curl_mime_init.3
+++ b/docs/libcurl/gnurl_mime_init.3
@@ -19,11 +19,11 @@
 .\" * KIND, either express or implied.
 .\" *
 .\" **************************************************************************
-.TH curl_mime_init 3 "22 August 2017" "libcurl 7.56.0" "libcurl Manual"
+.TH gnurl_mime_init 3 "22 August 2017" "libcurl 7.56.0" "libgnurl Manual"
 .SH NAME
 curl_mime_init - create a mime handle
 .SH SYNOPSIS
-.B #include <curl/curl.h>
+.B #include <gnurl/curl.h>
 .sp
 .BI "curl_mime * curl_mime_init(CURL * " easy_handle ");"
 .ad
diff --git a/docs/libcurl/curl_mime_name.3 b/docs/libcurl/gnurl_mime_name.3
index f821d9082..ad5ff4788 100644
--- a/docs/libcurl/curl_mime_name.3
+++ b/docs/libcurl/gnurl_mime_name.3
@@ -19,11 +19,11 @@
 .\" * KIND, either express or implied.
 .\" *
 .\" **************************************************************************
-.TH curl_mime_name 3 "22 August 2017" "libcurl 7.56.0" "libcurl Manual"
+.TH gnurl_mime_name 3 "22 August 2017" "libcurl 7.56.0" "libgnurl Manual"
 .SH NAME
 curl_mime_name - set a mime part's name
 .SH SYNOPSIS
-.B #include <curl/curl.h>
+.B #include <gnurl/curl.h>
 .sp
 .BI "CURLcode curl_mime_name(curl_mimepart * " part ", const char * " name ");"
 .ad
diff --git a/docs/libcurl/curl_mime_subparts.3 b/docs/libcurl/gnurl_mime_subparts.3
index d5d46febb..ab57e6159 100644
--- a/docs/libcurl/curl_mime_subparts.3
+++ b/docs/libcurl/gnurl_mime_subparts.3
@@ -19,11 +19,11 @@
 .\" * KIND, either express or implied.
 .\" *
 .\" **************************************************************************
-.TH curl_mime_subparts 3 "22 August 2017" "libcurl 7.56.0" "libcurl Manual"
+.TH gnurl_mime_subparts 3 "22 August 2017" "libcurl 7.56.0" "libgnurl Manual"
 .SH NAME
 curl_mime_subparts - set subparts of a multipart mime part
 .SH SYNOPSIS
-.B #include <curl/curl.h>
+.B #include <gnurl/curl.h>
 .sp
 .BI "CURLcode curl_mime_subparts(curl_mimepart * " part ,
 .BI "curl_mime * " subparts ");"
diff --git a/docs/libcurl/curl_mime_type.3 b/docs/libcurl/gnurl_mime_type.3
index 2f4bb7ed2..b1cf0a378 100644
--- a/docs/libcurl/curl_mime_type.3
+++ b/docs/libcurl/gnurl_mime_type.3
@@ -19,11 +19,11 @@
 .\" * KIND, either express or implied.
 .\" *
 .\" **************************************************************************
-.TH curl_mime_type 3 "22 August 2017" "libcurl 7.56.0" "libcurl Manual"
+.TH gnurl_mime_type 3 "22 August 2017" "libcurl 7.56.0" "libgnurl Manual"
 .SH NAME
 curl_mime_type - set a mime part's content type
 .SH SYNOPSIS
-.B #include <curl/curl.h>
+.B #include <gnurl/curl.h>
 .sp
 .BI "CURLcode curl_mime_type(curl_mimepart * " part ,
 .BI "const char * " mimetype ");"
diff --git a/docs/libcurl/curl_mprintf.3 b/docs/libcurl/gnurl_mprintf.3
index e861ed9ce..c34898afc 100644
--- a/docs/libcurl/curl_mprintf.3
+++ b/docs/libcurl/gnurl_mprintf.3
@@ -19,13 +19,13 @@
 .\" * KIND, either express or implied.
 .\" *
 .\" **************************************************************************
-.TH curl_printf 3 "30 April 2004" "libcurl 7.12" "libcurl Manual"
+.TH gnurl_printf 3 "30 April 2004" "libcurl 7.12" "libgnurl Manual"
 .SH NAME
 curl_maprintf, curl_mfprintf, curl_mprintf, curl_msnprintf, curl_msprintf
 curl_mvaprintf, curl_mvfprintf, curl_mvprintf, curl_mvsnprintf,
 curl_mvsprintf - formatted output conversion
 .SH SYNOPSIS
-.B #include <curl/mprintf.h>
+.B #include <gnurl/mprintf.h>
 .sp
 .BI "int curl_mprintf(const char *" format ", ...);"
 .br
diff --git a/docs/libcurl/curl_multi_add_handle.3 b/docs/libcurl/gnurl_multi_add_handle.3
index 30908ad86..c1d103f17 100644
--- a/docs/libcurl/curl_multi_add_handle.3
+++ b/docs/libcurl/gnurl_multi_add_handle.3
@@ -19,11 +19,11 @@
 .\" * KIND, either express or implied.
 .\" *
 .\" **************************************************************************
-.TH curl_multi_add_handle 3 "4 March 2002" "libcurl 7.9.5" "libcurl Manual"
+.TH gnurl_multi_add_handle 3 "4 March 2002" "libcurl 7.9.5" "libgnurl Manual"
 .SH NAME
 curl_multi_add_handle - add an easy handle to a multi session
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLMcode curl_multi_add_handle(CURLM *multi_handle, CURL *easy_handle);
 .ad
diff --git a/docs/libcurl/curl_multi_assign.3 b/docs/libcurl/gnurl_multi_assign.3
index 75cb86b4c..f10e7832e 100644
--- a/docs/libcurl/curl_multi_assign.3
+++ b/docs/libcurl/gnurl_multi_assign.3
@@ -19,11 +19,11 @@
 .\" * KIND, either express or implied.
 .\" *
 .\" **************************************************************************
-.TH curl_multi_assign 3 "9 Jul 2006" "libcurl 7.16.0" "libcurl Manual"
+.TH gnurl_multi_assign 3 "9 Jul 2006" "libcurl 7.16.0" "libgnurl Manual"
 .SH NAME
 curl_multi_assign \- set data to associate with an internal socket
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLMcode curl_multi_assign(CURLM *multi_handle, curl_socket_t sockfd,
                             void *sockptr);
diff --git a/docs/libcurl/curl_multi_cleanup.3 b/docs/libcurl/gnurl_multi_cleanup.3
index a945fd698..cc3691137 100644
--- a/docs/libcurl/curl_multi_cleanup.3
+++ b/docs/libcurl/gnurl_multi_cleanup.3
@@ -19,11 +19,11 @@
 .\" * KIND, either express or implied.
 .\" *
 .\" **************************************************************************
-.TH curl_multi_cleanup 3 "1 March 2002" "libcurl 7.9.5" "libcurl Manual"
+.TH gnurl_multi_cleanup 3 "1 March 2002" "libcurl 7.9.5" "libgnurl Manual"
 .SH NAME
 curl_multi_cleanup - close down a multi session
 .SH SYNOPSIS
-.B #include <curl/curl.h>
+.B #include <gnurl/curl.h>
 .sp
 .BI "CURLMcode curl_multi_cleanup( CURLM *multi_handle );"
 .ad
diff --git a/docs/libcurl/curl_multi_fdset.3 b/docs/libcurl/gnurl_multi_fdset.3
index de3a92862..81fb4b1dc 100644
--- a/docs/libcurl/curl_multi_fdset.3
+++ b/docs/libcurl/gnurl_multi_fdset.3
@@ -19,12 +19,12 @@
 .\" * KIND, either express or implied.
 .\" *
 .\" **************************************************************************
-.TH curl_multi_fdset 3 "2 Jan 2006" "libcurl 7.16.0" "libcurl Manual"
+.TH gnurl_multi_fdset 3 "2 Jan 2006" "libcurl 7.16.0" "libgnurl Manual"
 .SH NAME
 curl_multi_fdset - extracts file descriptor information from a multi handle
 .SH SYNOPSIS
 .nf
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLMcode curl_multi_fdset(CURLM *multi_handle,
                            fd_set *read_fd_set,
diff --git a/docs/libcurl/curl_multi_info_read.3 b/docs/libcurl/gnurl_multi_info_read.3
index 736183df3..cb1d731fd 100644
--- a/docs/libcurl/curl_multi_info_read.3
+++ b/docs/libcurl/gnurl_multi_info_read.3
@@ -19,11 +19,11 @@
 .\" * KIND, either express or implied.
 .\" *
 .\" **************************************************************************
-.TH curl_multi_info_read 3 "18 Dec 2004" "libcurl 7.10.3" "libcurl Manual"
+.TH gnurl_multi_info_read 3 "18 Dec 2004" "libcurl 7.10.3" "libgnurl Manual"
 .SH NAME
 curl_multi_info_read - read multi stack informationals
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLMsg *curl_multi_info_read( CURLM *multi_handle,
                                int *msgs_in_queue);
diff --git a/docs/libcurl/curl_multi_init.3 b/docs/libcurl/gnurl_multi_init.3
index 829c5c246..f711015cd 100644
--- a/docs/libcurl/curl_multi_init.3
+++ b/docs/libcurl/gnurl_multi_init.3
@@ -19,11 +19,11 @@
 .\" * KIND, either express or implied.
 .\" *
 .\" **************************************************************************
-.TH curl_multi_init 3 "1 March 2002" "libcurl 7.9.5" "libcurl Manual"
+.TH gnurl_multi_init 3 "1 March 2002" "libcurl 7.9.5" "libgnurl Manual"
 .SH NAME
 curl_multi_init - create a multi handle
 .SH SYNOPSIS
-.B #include <curl/curl.h>
+.B #include <gnurl/curl.h>
 .sp
 .BI "CURLM *curl_multi_init( );"
 .ad
diff --git a/docs/libcurl/curl_multi_perform.3 b/docs/libcurl/gnurl_multi_perform.3
index d2ae541cf..836e9b580 100644
--- a/docs/libcurl/curl_multi_perform.3
+++ b/docs/libcurl/gnurl_multi_perform.3
@@ -19,11 +19,11 @@
 .\" * KIND, either express or implied.
 .\" *
 .\" **************************************************************************
-.TH curl_multi_perform 3 "1 March 2002" "libcurl 7.9.5" "libcurl Manual"
+.TH gnurl_multi_perform 3 "1 March 2002" "libcurl 7.9.5" "libgnurl Manual"
 .SH NAME
 curl_multi_perform - reads/writes available data from each easy handle
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLMcode curl_multi_perform(CURLM *multi_handle, int *running_handles);
 .ad
diff --git a/docs/libcurl/curl_multi_remove_handle.3 b/docs/libcurl/gnurl_multi_remove_handle.3
index 2aefd7ff0..0987ea287 100644
--- a/docs/libcurl/curl_multi_remove_handle.3
+++ b/docs/libcurl/gnurl_multi_remove_handle.3
@@ -19,11 +19,11 @@
 .\" * KIND, either express or implied.
 .\" *
 .\" **************************************************************************
-.TH curl_multi_remove_handle 3 "6 March 2002" "libcurl 7.9.5" "libcurl Manual"
+.TH gnurl_multi_remove_handle 3 "6 March 2002" "libcurl 7.9.5" "libgnurl Manual"
 .SH NAME
 curl_multi_remove_handle - remove an easy handle from a multi session
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLMcode curl_multi_remove_handle(CURLM *multi_handle, CURL *easy_handle);
 .ad
diff --git a/docs/libcurl/curl_multi_setopt.3 b/docs/libcurl/gnurl_multi_setopt.3
index d27c52441..71b976236 100644
--- a/docs/libcurl/curl_multi_setopt.3
+++ b/docs/libcurl/gnurl_multi_setopt.3
@@ -19,11 +19,11 @@
 .\" * KIND, either express or implied.
 .\" *
 .\" **************************************************************************
-.TH curl_multi_setopt 3 "4 Nov 2014" "libcurl 7.39.0" "libcurl Manual"
+.TH gnurl_multi_setopt 3 "4 Nov 2014" "libcurl 7.39.0" "libgnurl Manual"
 .SH NAME
 curl_multi_setopt \- set options for a curl multi handle
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLMcode curl_multi_setopt(CURLM * multi_handle, CURLMoption option, param);
 .SH DESCRIPTION
diff --git a/docs/libcurl/curl_multi_socket.3 b/docs/libcurl/gnurl_multi_socket.3
index d83126dd4..3ca76e668 100644
--- a/docs/libcurl/curl_multi_socket.3
+++ b/docs/libcurl/gnurl_multi_socket.3
@@ -19,12 +19,12 @@
 .\" * KIND, either express or implied.
 .\" *
 .\" **************************************************************************
-.TH curl_multi_socket 3 "9 Jul 2006" "libcurl 7.16.0" "libcurl Manual"
+.TH gnurl_multi_socket 3 "9 Jul 2006" "libcurl 7.16.0" "libgnurl Manual"
 .SH NAME
 curl_multi_socket \- reads/writes available data
 .SH SYNOPSIS
 .nf
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 CURLMcode curl_multi_socket(CURLM * multi_handle, curl_socket_t sockfd,
                             int *running_handles);
 
diff --git a/docs/libcurl/curl_multi_socket_action.3 b/docs/libcurl/gnurl_multi_socket_action.3
index 8d7731f84..99acbbaaf 100644
--- a/docs/libcurl/curl_multi_socket_action.3
+++ b/docs/libcurl/gnurl_multi_socket_action.3
@@ -19,12 +19,12 @@
 .\" * KIND, either express or implied.
 .\" *
 .\" **************************************************************************
-.TH curl_multi_socket_action 3 "9 Jul 2006" "libcurl 7.16.0" "libcurl Manual"
+.TH gnurl_multi_socket_action 3 "9 Jul 2006" "libcurl 7.16.0" "libgnurl Manual"
 .SH NAME
 curl_multi_socket_action \- reads/writes available data given an action
 .SH SYNOPSIS
 .nf
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLMcode curl_multi_socket_action(CURLM * multi_handle,
                                    curl_socket_t sockfd,
diff --git a/docs/libcurl/gnurl_multi_socket_all.3 b/docs/libcurl/gnurl_multi_socket_all.3
new file mode 100644
index 000000000..c3f876340
--- /dev/null
+++ b/docs/libcurl/gnurl_multi_socket_all.3
@@ -0,0 +1 @@
+.so man3/gnurl_multi_socket.3
diff --git a/docs/libcurl/curl_multi_strerror.3 b/docs/libcurl/gnurl_multi_strerror.3
index b5aa7afb3..3dcd63a5d 100644
--- a/docs/libcurl/curl_multi_strerror.3
+++ b/docs/libcurl/gnurl_multi_strerror.3
@@ -19,12 +19,12 @@
 .\" * KIND, either express or implied.
 .\" *
 .\" **************************************************************************
-.TH curl_multi_strerror 3 "26 Apr 2004" "libcurl 7.12" "libcurl Manual"
+.TH gnurl_multi_strerror 3 "26 Apr 2004" "libcurl 7.12" "libgnurl Manual"
 .SH NAME
 curl_multi_strerror - return string describing error code
 .SH SYNOPSIS
 .nf
-.B #include <curl/curl.h>
+.B #include <gnurl/curl.h>
 .BI "const char *curl_multi_strerror(CURLMcode " errornum ");"
 .SH DESCRIPTION
 The curl_multi_strerror() function returns a string describing the CURLMcode
diff --git a/docs/libcurl/curl_multi_timeout.3 b/docs/libcurl/gnurl_multi_timeout.3
index d915f9e4f..db84e69bc 100644
--- a/docs/libcurl/curl_multi_timeout.3
+++ b/docs/libcurl/gnurl_multi_timeout.3
@@ -19,11 +19,11 @@
 .\" * KIND, either express or implied.
 .\" *
 .\" **************************************************************************
-.TH curl_multi_timeout 3 "2 Jan 2006" "libcurl 7.16.0" "libcurl Manual"
+.TH gnurl_multi_timeout 3 "2 Jan 2006" "libcurl 7.16.0" "libgnurl Manual"
 .SH NAME
 curl_multi_timeout \- how long to wait for action before proceeding
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLMcode curl_multi_timeout(CURLM *multi_handle, long *timeout);
 .SH DESCRIPTION
diff --git a/docs/libcurl/curl_multi_wait.3 b/docs/libcurl/gnurl_multi_wait.3
index 9f15c5f89..286bebf68 100644
--- a/docs/libcurl/curl_multi_wait.3
+++ b/docs/libcurl/gnurl_multi_wait.3
@@ -19,12 +19,12 @@
 .\" * KIND, either express or implied.
 .\" *
 .\" **************************************************************************
-.TH curl_multi_wait 3 "12 Jul 2012" "libcurl 7.28.0" "libcurl Manual"
+.TH gnurl_multi_wait 3 "12 Jul 2012" "libcurl 7.28.0" "libgnurl Manual"
 .SH NAME
 curl_multi_wait - polls on all easy handles in a multi handle
 .SH SYNOPSIS
 .nf
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLMcode curl_multi_wait(CURLM *multi_handle,
                           struct curl_waitfd extra_fds[],
diff --git a/docs/libcurl/curl_share_cleanup.3 b/docs/libcurl/gnurl_share_cleanup.3
index d74ef91d2..9c07e0cbb 100644
--- a/docs/libcurl/curl_share_cleanup.3
+++ b/docs/libcurl/gnurl_share_cleanup.3
@@ -19,11 +19,11 @@
 .\" * KIND, either express or implied.
 .\" *
 .\" **************************************************************************
-.TH curl_share_cleanup 3 "8 Aug 2003" "libcurl 7.10.7" "libcurl Manual"
+.TH gnurl_share_cleanup 3 "8 Aug 2003" "libcurl 7.10.7" "libgnurl Manual"
 .SH NAME
 curl_share_cleanup - Clean up a shared object
 .SH SYNOPSIS
-.B #include <curl/curl.h>
+.B #include <gnurl/curl.h>
 .sp
 .BI "CURLSHcode curl_share_cleanup(CURLSH *" share_handle ");"
 .ad
@@ -35,7 +35,7 @@ Passing in a NULL pointer in \fIshare_handle\fP will make this function return
 immediately with no action.
 .SH RETURN VALUE
 CURLSHE_OK (zero) means that the option was set properly, non-zero means an
-error occurred as \fI<curl/curl.h>\fP defines. See the \fIlibcurl-errors.3\fP
+error occurred as \fI<gnurl/curl.h>\fP defines. See the \fIlibcurl-errors.3\fP
 man page for the full list with descriptions. If an error occurs, then the
 share object will not be deleted.
 .SH "SEE ALSO"
diff --git a/docs/libcurl/curl_share_init.3 b/docs/libcurl/gnurl_share_init.3
index e582828b4..7bf00c183 100644
--- a/docs/libcurl/curl_share_init.3
+++ b/docs/libcurl/gnurl_share_init.3
@@ -19,11 +19,11 @@
 .\" * KIND, either express or implied.
 .\" *
 .\" **************************************************************************
-.TH curl_share_init 3 "8 Aug 2003" "libcurl 7.10.7" "libcurl Manual"
+.TH gnurl_share_init 3 "8 Aug 2003" "libcurl 7.10.7" "libgnurl Manual"
 .SH NAME
 curl_share_init - Create a shared object
 .SH SYNOPSIS
-.B #include <curl/curl.h>
+.B #include <gnurl/curl.h>
 .sp
 .BI "CURLSH *curl_share_init( );"
 .ad
diff --git a/docs/libcurl/curl_share_setopt.3 b/docs/libcurl/gnurl_share_setopt.3
index 6c209eb00..0646b348e 100644
--- a/docs/libcurl/curl_share_setopt.3
+++ b/docs/libcurl/gnurl_share_setopt.3
@@ -19,11 +19,11 @@
 .\" * KIND, either express or implied.
 .\" *
 .\" **************************************************************************
-.TH curl_share_setopt 3 "8 Aug 2003" "libcurl 7.10.7" "libcurl Manual"
+.TH gnurl_share_setopt 3 "8 Aug 2003" "libcurl 7.10.7" "libgnurl Manual"
 .SH NAME
 curl_share_setopt - Set options for a shared object
 .SH SYNOPSIS
-.B #include <curl/curl.h>
+.B #include <gnurl/curl.h>
 .sp
 CURLSHcode curl_share_setopt(CURLSH *share, CURLSHoption option, parameter);
 .ad
@@ -106,7 +106,7 @@ The \fIparameter\fP allows you to specify a pointer to data that will be passed
 to the lock_function and unlock_function each time it is called.
 .SH RETURN VALUE
 CURLSHE_OK (zero) means that the option was set properly, non-zero means an
-error occurred as \fI<curl/curl.h>\fP defines. See the \fIlibcurl-errors.3\fP
+error occurred as \fI<gnurl/curl.h>\fP defines. See the \fIlibcurl-errors.3\fP
 man page for the full list with descriptions.
 .SH "SEE ALSO"
 .BR curl_share_cleanup "(3), " curl_share_init "(3)"
diff --git a/docs/libcurl/curl_share_strerror.3 b/docs/libcurl/gnurl_share_strerror.3
index faa5299d1..8b93a2451 100644
--- a/docs/libcurl/curl_share_strerror.3
+++ b/docs/libcurl/gnurl_share_strerror.3
@@ -19,12 +19,12 @@
 .\" * KIND, either express or implied.
 .\" *
 .\" **************************************************************************
-.TH curl_share_strerror 3 "26 Apr 2004" "libcurl 7.12" "libcurl Manual"
+.TH gnurl_share_strerror 3 "26 Apr 2004" "libcurl 7.12" "libgnurl Manual"
 .SH NAME
 curl_share_strerror - return string describing error code
 .SH SYNOPSIS
 .nf
-.B #include <curl/curl.h>
+.B #include <gnurl/curl.h>
 .BI "const char *curl_share_strerror(CURLSHcode " errornum ");"
 .SH DESCRIPTION
 The curl_share_strerror() function returns a string describing the CURLSHcode
diff --git a/docs/libcurl/curl_slist_append.3 b/docs/libcurl/gnurl_slist_append.3
index a902b4754..963ad760d 100644
--- a/docs/libcurl/curl_slist_append.3
+++ b/docs/libcurl/gnurl_slist_append.3
@@ -19,11 +19,11 @@
 .\" * KIND, either express or implied.
 .\" *
 .\" **************************************************************************
-.TH curl_slist_append 3 "19 Jun 2003" "libcurl 7.10.4" "libcurl Manual"
+.TH gnurl_slist_append 3 "19 Jun 2003" "libcurl 7.10.4" "libgnurl Manual"
 .SH NAME
 curl_slist_append - add a string to an slist
 .SH SYNOPSIS
-.B #include <curl/curl.h>
+.B #include <gnurl/curl.h>
 .sp
 .BI "struct curl_slist *curl_slist_append(struct curl_slist *" list,
 .BI "const char * "string ");"
diff --git a/docs/libcurl/curl_slist_free_all.3 b/docs/libcurl/gnurl_slist_free_all.3
index 180d34a61..bb9c522f7 100644
--- a/docs/libcurl/curl_slist_free_all.3
+++ b/docs/libcurl/gnurl_slist_free_all.3
@@ -19,11 +19,11 @@
 .\" * KIND, either express or implied.
 .\" *
 .\" **************************************************************************
-.TH curl_slist_free_all 3 "5 March 2001" "libcurl 7.0" "libcurl Manual"
+.TH gnurl_slist_free_all 3 "5 March 2001" "libcurl 7.0" "libgnurl Manual"
 .SH NAME
 curl_slist_free_all - free an entire curl_slist list
 .SH SYNOPSIS
-.B #include <curl/curl.h>
+.B #include <gnurl/curl.h>
 .sp
 .BI "void curl_slist_free_all(struct curl_slist *" list);
 .ad
diff --git a/docs/libcurl/curl_strequal.3 b/docs/libcurl/gnurl_strequal.3
index e9cf80387..4b7752cd7 100644
--- a/docs/libcurl/curl_strequal.3
+++ b/docs/libcurl/gnurl_strequal.3
@@ -19,11 +19,11 @@
 .\" * KIND, either express or implied.
 .\" *
 .\" **************************************************************************
-.TH curl_strequal 3 "30 April 2004" "libcurl 7.12" "libcurl Manual"
+.TH gnurl_strequal 3 "30 April 2004" "libcurl 7.12" "libgnurl Manual"
 .SH NAME
 curl_strequal, curl_strnequal - case insensitive string comparisons
 .SH SYNOPSIS
-.B #include <curl/curl.h>
+.B #include <gnurl/curl.h>
 .sp
 .BI "int curl_strequal(char *" str1 ", char *" str2 ");"
 .sp
diff --git a/docs/libcurl/gnurl_strnequal.3 b/docs/libcurl/gnurl_strnequal.3
new file mode 100644
index 000000000..5af4e28c7
--- /dev/null
+++ b/docs/libcurl/gnurl_strnequal.3
@@ -0,0 +1 @@
+.so man3/gnurl_strequal.3
diff --git a/docs/libcurl/curl_unescape.3 b/docs/libcurl/gnurl_unescape.3
index 061fbbf5c..6f3dce495 100644
--- a/docs/libcurl/curl_unescape.3
+++ b/docs/libcurl/gnurl_unescape.3
@@ -19,11 +19,11 @@
 .\" * KIND, either express or implied.
 .\" *
 .\" **************************************************************************
-.TH curl_unescape 3 "22 March 2001" "libcurl 7.7" "libcurl Manual"
+.TH gnurl_unescape 3 "22 March 2001" "libcurl 7.7" "libgnurl Manual"
 .SH NAME
 curl_unescape - URL decodes the given string
 .SH SYNOPSIS
-.B #include <curl/curl.h>
+.B #include <gnurl/curl.h>
 .sp
 .BI "char *curl_unescape( const char *" url ", int "length " );"
 .ad
diff --git a/docs/libcurl/curl_url.3 b/docs/libcurl/gnurl_url.3
index 2378a75bb..325865ae2 100644
--- a/docs/libcurl/curl_url.3
+++ b/docs/libcurl/gnurl_url.3
@@ -19,11 +19,11 @@
 .\" * KIND, either express or implied.
 .\" *
 .\" **************************************************************************
-.TH curl_url 3 "6 Aug 2018" "libcurl" "libcurl Manual"
+.TH gnurl_url 3 "6 Aug 2018" "libcurl" "libgnurl Manual"
 .SH NAME
 curl_url - returns a new CURLU handle
 .SH SYNOPSIS
-.B #include <curl/curl.h>
+.B #include <gnurl/curl.h>
 
 CURLU *curl_url();
 .SH DESCRIPTION
diff --git a/docs/libcurl/curl_url_cleanup.3 b/docs/libcurl/gnurl_url_cleanup.3
index 4d095a9d7..f0bfefdba 100644
--- a/docs/libcurl/curl_url_cleanup.3
+++ b/docs/libcurl/gnurl_url_cleanup.3
@@ -19,11 +19,11 @@
 .\" * KIND, either express or implied.
 .\" *
 .\" **************************************************************************
-.TH curl_url_cleanup 3 "6 Aug 2018" "libcurl" "libcurl Manual"
+.TH gnurl_url_cleanup 3 "6 Aug 2018" "libcurl" "libgnurl Manual"
 .SH NAME
 curl_url_cleanup - free a CURLU handle
 .SH SYNOPSIS
-.B #include <curl/curl.h>
+.B #include <gnurl/curl.h>
 
 void curl_url_cleanup(CURLU *handle);
 .fi
diff --git a/docs/libcurl/curl_url_dup.3 b/docs/libcurl/gnurl_url_dup.3
index c0259e0e6..7fa8d17c7 100644
--- a/docs/libcurl/curl_url_dup.3
+++ b/docs/libcurl/gnurl_url_dup.3
@@ -19,11 +19,11 @@
 .\" * KIND, either express or implied.
 .\" *
 .\" **************************************************************************
-.TH curl_url_dup 3 "6 Aug 2018" "libcurl" "libcurl Manual"
+.TH gnurl_url_dup 3 "6 Aug 2018" "libcurl" "libgnurl Manual"
 .SH NAME
 curl_url_dup - duplicate a CURLU handle
 .SH SYNOPSIS
-.B #include <curl/curl.h>
+.B #include <gnurl/curl.h>
 
 CURLU *curl_url_dup(CURLU *inhandle);
 .fi
diff --git a/docs/libcurl/curl_url_get.3 b/docs/libcurl/gnurl_url_get.3
index 0adc65a5f..2813a0aaa 100644
--- a/docs/libcurl/curl_url_get.3
+++ b/docs/libcurl/gnurl_url_get.3
@@ -19,11 +19,11 @@
 .\" * KIND, either express or implied.
 .\" *
 .\" **************************************************************************
-.TH curl_url_get 3 "6 Aug 2018" "libcurl" "libcurl Manual"
+.TH gnurl_url_get 3 "6 Aug 2018" "libcurl" "libgnurl Manual"
 .SH NAME
 curl_url_get - extract a part from a URL
 .SH SYNOPSIS
-.B #include <curl/curl.h>
+.B #include <gnurl/curl.h>
 
 .nf
 CURLUcode curl_url_get(CURLU *url,
diff --git a/docs/libcurl/curl_url_set.3 b/docs/libcurl/gnurl_url_set.3
index 4c8ff9810..c512ec3f4 100644
--- a/docs/libcurl/curl_url_set.3
+++ b/docs/libcurl/gnurl_url_set.3
@@ -19,11 +19,11 @@
 .\" * KIND, either express or implied.
 .\" *
 .\" **************************************************************************
-.TH curl_url_set 3 "6 Aug 2018" "libcurl" "libcurl Manual"
+.TH gnurl_url_set 3 "6 Aug 2018" "libcurl" "libgnurl Manual"
 .SH NAME
 curl_url_set - set a URL part
 .SH SYNOPSIS
-.B #include <curl/curl.h>
+.B #include <gnurl/curl.h>
 
 CURLUcode curl_url_set(CURLU *url,
                        CURLUPart part,
diff --git a/docs/libcurl/curl_version.3 b/docs/libcurl/gnurl_version.3
index 4acd73aab..2d3f02635 100644
--- a/docs/libcurl/curl_version.3
+++ b/docs/libcurl/gnurl_version.3
@@ -19,11 +19,11 @@
 .\" * KIND, either express or implied.
 .\" *
 .\" **************************************************************************
-.TH curl_version 3 "5 March 2001" "libcurl 7.0" "libcurl Manual"
+.TH gnurl_version 3 "5 March 2001" "libcurl 7.0" "libgnurl Manual"
 .SH NAME
 curl_version - returns the libcurl version string
 .SH SYNOPSIS
-.B #include <curl/curl.h>
+.B #include <gnurl/curl.h>
 .sp
 .BI "char *curl_version( );"
 .ad
diff --git a/docs/libcurl/curl_version_info.3 b/docs/libcurl/gnurl_version_info.3
index 07cdf0c47..09e0fe535 100644
--- a/docs/libcurl/curl_version_info.3
+++ b/docs/libcurl/gnurl_version_info.3
@@ -20,11 +20,11 @@
 .\" *
 .\" **************************************************************************
 .\"
-.TH curl_version_info 3 "2 Nov 2014" "libcurl 7.40.0" "libcurl Manual"
+.TH gnurl_version_info 3 "2 Nov 2014" "libcurl 7.40.0" "libgnurl Manual"
 .SH NAME
 curl_version_info - returns run-time libcurl version info
 .SH SYNOPSIS
-.B #include <curl/curl.h>
+.B #include <gnurl/curl.h>
 .sp
 .BI "curl_version_info_data *curl_version_info( CURLversion "age ");"
 .ad
diff --git a/docs/libcurl/libcurl-easy.3 b/docs/libcurl/libgnurl-easy.3
index d112632fa..d112632fa 100644
--- a/docs/libcurl/libcurl-easy.3
+++ b/docs/libcurl/libgnurl-easy.3
diff --git a/docs/libcurl/libcurl-env.3 b/docs/libcurl/libgnurl-env.3
index 3807e662e..3807e662e 100644
--- a/docs/libcurl/libcurl-env.3
+++ b/docs/libcurl/libgnurl-env.3
diff --git a/docs/libcurl/libcurl-errors.3 b/docs/libcurl/libgnurl-errors.3
index 26def4fec..26def4fec 100644
--- a/docs/libcurl/libcurl-errors.3
+++ b/docs/libcurl/libgnurl-errors.3
diff --git a/docs/libcurl/libcurl-multi.3 b/docs/libcurl/libgnurl-multi.3
index 96013552f..96013552f 100644
--- a/docs/libcurl/libcurl-multi.3
+++ b/docs/libcurl/libgnurl-multi.3
diff --git a/docs/libcurl/libcurl-security.3 b/docs/libcurl/libgnurl-security.3
index 0cfdddea8..0cfdddea8 100644
--- a/docs/libcurl/libcurl-security.3
+++ b/docs/libcurl/libgnurl-security.3
diff --git a/docs/libcurl/libcurl-share.3 b/docs/libcurl/libgnurl-share.3
index 26e43b8c8..26e43b8c8 100644
--- a/docs/libcurl/libcurl-share.3
+++ b/docs/libcurl/libgnurl-share.3
diff --git a/docs/libcurl/libcurl-thread.3 b/docs/libcurl/libgnurl-thread.3
index 1692b0fda..1692b0fda 100644
--- a/docs/libcurl/libcurl-thread.3
+++ b/docs/libcurl/libgnurl-thread.3
diff --git a/docs/libcurl/libcurl-tutorial.3 b/docs/libcurl/libgnurl-tutorial.3
index aeca76e2e..aeca76e2e 100644
--- a/docs/libcurl/libcurl-tutorial.3
+++ b/docs/libcurl/libgnurl-tutorial.3
diff --git a/docs/libcurl/libcurl-url.3 b/docs/libcurl/libgnurl-url.3
index 4ad0a1582..bdf82ec15 100644
--- a/docs/libcurl/libcurl-url.3
+++ b/docs/libcurl/libgnurl-url.3
@@ -25,7 +25,7 @@ libcurl-url \- URL interface overview
 .SH DESCRIPTION
 The URL interface provides a set of functions for parsing and generating URLs.
 .SH INCLUDE
-You still only include <curl/curl.h> in your code. Note that the URL API was
+You still only include <gnurl/curl.h> in your code. Note that the URL API was
 introduced in 7.62.0.
 .SH CREATE
 Create a handle that holds URL info and resources with \fIcurl_url(3)\fP:
diff --git a/docs/libcurl/libcurl.3 b/docs/libcurl/libgnurl.3
index e8ecc31da..e8ecc31da 100644
--- a/docs/libcurl/libcurl.3
+++ b/docs/libcurl/libgnurl.3
diff --git a/docs/libcurl/libcurl.m4 b/docs/libcurl/libgnurl.m4
index 53d694d0a..7e79629d5 100644
--- a/docs/libcurl/libcurl.m4
+++ b/docs/libcurl/libgnurl.m4
@@ -167,7 +167,7 @@ AC_DEFUN([LIBCURL_CHECK_CONFIG],
            _libcurl_save_libs=$LIBS
            LIBS="$LIBCURL $LIBS"
 
-           AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <curl/curl.h>]],[[
+           AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <gnurl/curl.h>]],[[
 /* Try and use a few common options to force a failure if we are
    missing symbols or can't link. */
 int x;
diff --git a/docs/libcurl/mksymbolsmanpage.pl b/docs/libcurl/mksymbolsmanpage.pl
index 8ae202e46..b0b8480ad 100755
--- a/docs/libcurl/mksymbolsmanpage.pl
+++ b/docs/libcurl/mksymbolsmanpage.pl
@@ -49,7 +49,7 @@ print <<HEADER
 .\\" * KIND, either express or implied.
 .\\" *
 .\\" **************************************************************************
-.TH libcurl-symbols 3 "$date" "libcurl $version" "libcurl symbols"
+.TH libgnurl-symbols 3 "$date" "libcurl $version" "libcurl symbols"
 .SH NAME
 libcurl-symbols \\- libcurl symbol version information
 .SH "libcurl symbols"
diff --git a/docs/libcurl/opts/CURLINFO_ACTIVESOCKET.3 b/docs/libcurl/opts/GNURLINFO_ACTIVESOCKET.3
index b42ba110f..faa9a6866 100644
--- a/docs/libcurl/opts/CURLINFO_ACTIVESOCKET.3
+++ b/docs/libcurl/opts/GNURLINFO_ACTIVESOCKET.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLINFO_ACTIVESOCKET \- get the active socket
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_getinfo(CURL *handle, CURLINFO_ACTIVESOCKET,
                            curl_socket_t *socket);
diff --git a/docs/libcurl/opts/CURLINFO_APPCONNECT_TIME.3 b/docs/libcurl/opts/GNURLINFO_APPCONNECT_TIME.3
index fb0c982a4..c0eadb821 100644
--- a/docs/libcurl/opts/CURLINFO_APPCONNECT_TIME.3
+++ b/docs/libcurl/opts/GNURLINFO_APPCONNECT_TIME.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLINFO_APPCONNECT_TIME \- get the time until the SSL/SSH handshake is completed
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_getinfo(CURL *handle, CURLINFO_APPCONNECT_TIME, double *timep);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLINFO_APPCONNECT_TIME_T.3 b/docs/libcurl/opts/GNURLINFO_APPCONNECT_TIME_T.3
index 8c06d68fb..bc8908035 100644
--- a/docs/libcurl/opts/CURLINFO_APPCONNECT_TIME_T.3
+++ b/docs/libcurl/opts/GNURLINFO_APPCONNECT_TIME_T.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLINFO_APPCONNECT_TIME_T \- get the time until the SSL/SSH handshake is completed
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_getinfo(CURL *handle, CURLINFO_APPCONNECT_TIME_T, curl_off_t *timep);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLINFO_CERTINFO.3 b/docs/libcurl/opts/GNURLINFO_CERTINFO.3
index 110e1559b..86d6e28b1 100644
--- a/docs/libcurl/opts/CURLINFO_CERTINFO.3
+++ b/docs/libcurl/opts/GNURLINFO_CERTINFO.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLINFO_CERTINFO \- get the TLS certificate chain
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_getinfo(CURL *handle, CURLINFO_CERTINFO,
                            struct curl_certinfo *chainp);
diff --git a/docs/libcurl/opts/CURLINFO_CONDITION_UNMET.3 b/docs/libcurl/opts/GNURLINFO_CONDITION_UNMET.3
index a8d6fc2c6..a52e5f750 100644
--- a/docs/libcurl/opts/CURLINFO_CONDITION_UNMET.3
+++ b/docs/libcurl/opts/GNURLINFO_CONDITION_UNMET.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLINFO_CONDITION_UNMET \- get info on unmet time conditional
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_getinfo(CURL *handle, CURLINFO_CONDITION_UNMET, long *unmet);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLINFO_CONNECT_TIME.3 b/docs/libcurl/opts/GNURLINFO_CONNECT_TIME.3
index 4b6d3dee9..107553702 100644
--- a/docs/libcurl/opts/CURLINFO_CONNECT_TIME.3
+++ b/docs/libcurl/opts/GNURLINFO_CONNECT_TIME.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLINFO_CONNECT_TIME \- get the time until connect
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_getinfo(CURL *handle, CURLINFO_CONNECT_TIME, double *timep);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLINFO_CONNECT_TIME_T.3 b/docs/libcurl/opts/GNURLINFO_CONNECT_TIME_T.3
index aed2e9d22..9871aec17 100644
--- a/docs/libcurl/opts/CURLINFO_CONNECT_TIME_T.3
+++ b/docs/libcurl/opts/GNURLINFO_CONNECT_TIME_T.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLINFO_CONNECT_TIME_T \- get the time until connect
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_getinfo(CURL *handle, CURLINFO_CONNECT_TIME_T, curl_off_t *timep);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLINFO_CONTENT_LENGTH_DOWNLOAD.3 b/docs/libcurl/opts/GNURLINFO_CONTENT_LENGTH_DOWNLOAD.3
index e5148410f..19f0dfc4f 100644
--- a/docs/libcurl/opts/CURLINFO_CONTENT_LENGTH_DOWNLOAD.3
+++ b/docs/libcurl/opts/GNURLINFO_CONTENT_LENGTH_DOWNLOAD.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLINFO_CONTENT_LENGTH_DOWNLOAD \- get content-length of download
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_getinfo(CURL *handle, CURLINFO_CONTENT_LENGTH_DOWNLOAD,
                            double *content_length);
diff --git a/docs/libcurl/opts/CURLINFO_CONTENT_LENGTH_DOWNLOAD_T.3 b/docs/libcurl/opts/GNURLINFO_CONTENT_LENGTH_DOWNLOAD_T.3
index 9d2916c9b..0399e3b0d 100644
--- a/docs/libcurl/opts/CURLINFO_CONTENT_LENGTH_DOWNLOAD_T.3
+++ b/docs/libcurl/opts/GNURLINFO_CONTENT_LENGTH_DOWNLOAD_T.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLINFO_CONTENT_LENGTH_DOWNLOAD_T \- get content-length of download
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_getinfo(CURL *handle, CURLINFO_CONTENT_LENGTH_DOWNLOAD_T,
                            curl_off_t *content_length);
diff --git a/docs/libcurl/opts/CURLINFO_CONTENT_LENGTH_UPLOAD.3 b/docs/libcurl/opts/GNURLINFO_CONTENT_LENGTH_UPLOAD.3
index deaff925b..260752619 100644
--- a/docs/libcurl/opts/CURLINFO_CONTENT_LENGTH_UPLOAD.3
+++ b/docs/libcurl/opts/GNURLINFO_CONTENT_LENGTH_UPLOAD.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLINFO_CONTENT_LENGTH_UPLOAD \- get the specified size of the upload
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_getinfo(CURL *handle, CURLINFO_CONTENT_LENGTH_UPLOAD,
                            double *content_length);
diff --git a/docs/libcurl/opts/CURLINFO_CONTENT_LENGTH_UPLOAD_T.3 b/docs/libcurl/opts/GNURLINFO_CONTENT_LENGTH_UPLOAD_T.3
index 67747925b..e6b715ef4 100644
--- a/docs/libcurl/opts/CURLINFO_CONTENT_LENGTH_UPLOAD_T.3
+++ b/docs/libcurl/opts/GNURLINFO_CONTENT_LENGTH_UPLOAD_T.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLINFO_CONTENT_LENGTH_UPLOAD_T \- get the specified size of the upload
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_getinfo(CURL *handle, CURLINFO_CONTENT_LENGTH_UPLOAD_T,
                            curl_off_t *content_length);
diff --git a/docs/libcurl/opts/CURLINFO_CONTENT_TYPE.3 b/docs/libcurl/opts/GNURLINFO_CONTENT_TYPE.3
index 3dce953e6..07d768d80 100644
--- a/docs/libcurl/opts/CURLINFO_CONTENT_TYPE.3
+++ b/docs/libcurl/opts/GNURLINFO_CONTENT_TYPE.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLINFO_CONTENT_TYPE \- get Content-Type
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_getinfo(CURL *handle, CURLINFO_CONTENT_TYPE, char **ct);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLINFO_COOKIELIST.3 b/docs/libcurl/opts/GNURLINFO_COOKIELIST.3
index a20489064..48b20d532 100644
--- a/docs/libcurl/opts/CURLINFO_COOKIELIST.3
+++ b/docs/libcurl/opts/GNURLINFO_COOKIELIST.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLINFO_COOKIELIST \- get all known cookies
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_getinfo(CURL *handle, CURLINFO_COOKIELIST,
                            struct curl_slist **cookies);
diff --git a/docs/libcurl/opts/CURLINFO_EFFECTIVE_URL.3 b/docs/libcurl/opts/GNURLINFO_EFFECTIVE_URL.3
index 97c0c2ab6..a1d16b08d 100644
--- a/docs/libcurl/opts/CURLINFO_EFFECTIVE_URL.3
+++ b/docs/libcurl/opts/GNURLINFO_EFFECTIVE_URL.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLINFO_EFFECTIVE_URL \- get the last used URL
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_getinfo(CURL *handle, CURLINFO_EFFECTIVE_URL, char **urlp);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLINFO_FILETIME.3 b/docs/libcurl/opts/GNURLINFO_FILETIME.3
index 3b13bd7e3..966cc3821 100644
--- a/docs/libcurl/opts/CURLINFO_FILETIME.3
+++ b/docs/libcurl/opts/GNURLINFO_FILETIME.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLINFO_FILETIME \- get the remote time of the retrieved document
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_getinfo(CURL *handle, CURLINFO_FILETIME, long *timep);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLINFO_FILETIME_T.3 b/docs/libcurl/opts/GNURLINFO_FILETIME_T.3
index d8853ccd2..abb2a6bde 100644
--- a/docs/libcurl/opts/CURLINFO_FILETIME_T.3
+++ b/docs/libcurl/opts/GNURLINFO_FILETIME_T.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLINFO_FILETIME_T \- get the remote time of the retrieved document
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_getinfo(CURL *handle, CURLINFO_FILETIME_T, curl_off_t *timep);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLINFO_FTP_ENTRY_PATH.3 b/docs/libcurl/opts/GNURLINFO_FTP_ENTRY_PATH.3
index 00677fd1a..e35658c56 100644
--- a/docs/libcurl/opts/CURLINFO_FTP_ENTRY_PATH.3
+++ b/docs/libcurl/opts/GNURLINFO_FTP_ENTRY_PATH.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLINFO_FTP_ENTRY_PATH \- get entry path in FTP server
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_getinfo(CURL *handle, CURLINFO_FTP_ENTRY_PATH, char **path);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLINFO_HEADER_SIZE.3 b/docs/libcurl/opts/GNURLINFO_HEADER_SIZE.3
index cc928c725..7e02138b9 100644
--- a/docs/libcurl/opts/CURLINFO_HEADER_SIZE.3
+++ b/docs/libcurl/opts/GNURLINFO_HEADER_SIZE.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLINFO_HEADER_SIZE \- get size of retrieved headers
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_getinfo(CURL *handle, CURLINFO_HEADER_SIZE, long *sizep);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLINFO_HTTPAUTH_AVAIL.3 b/docs/libcurl/opts/GNURLINFO_HTTPAUTH_AVAIL.3
index 08d66b32e..235abd03e 100644
--- a/docs/libcurl/opts/CURLINFO_HTTPAUTH_AVAIL.3
+++ b/docs/libcurl/opts/GNURLINFO_HTTPAUTH_AVAIL.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLINFO_HTTPAUTH_AVAIL \- get available HTTP authentication methods
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_getinfo(CURL *handle, CURLINFO_HTTPAUTH_AVAIL, long *authp);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLINFO_HTTP_CONNECTCODE.3 b/docs/libcurl/opts/GNURLINFO_HTTP_CONNECTCODE.3
index 5f5038d72..3c13ed8b1 100644
--- a/docs/libcurl/opts/CURLINFO_HTTP_CONNECTCODE.3
+++ b/docs/libcurl/opts/GNURLINFO_HTTP_CONNECTCODE.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLINFO_HTTP_CONNECTCODE \- get the CONNECT response code
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_getinfo(CURL *handle, CURLINFO_HTTP_CONNECTCODE, long *p);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLINFO_HTTP_VERSION.3 b/docs/libcurl/opts/GNURLINFO_HTTP_VERSION.3
index b0f43e549..23ae68b22 100644
--- a/docs/libcurl/opts/CURLINFO_HTTP_VERSION.3
+++ b/docs/libcurl/opts/GNURLINFO_HTTP_VERSION.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLINFO_HTTP_VERSION \- get the http version used in the connection
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_getinfo(CURL *handle, CURLINFO_HTTP_VERSION, long *p);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLINFO_LASTSOCKET.3 b/docs/libcurl/opts/GNURLINFO_LASTSOCKET.3
index 693f215d5..de88c9a94 100644
--- a/docs/libcurl/opts/CURLINFO_LASTSOCKET.3
+++ b/docs/libcurl/opts/GNURLINFO_LASTSOCKET.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLINFO_LASTSOCKET \- get the last socket used
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_getinfo(CURL *handle, CURLINFO_LASTSOCKET, long *socket);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLINFO_LOCAL_IP.3 b/docs/libcurl/opts/GNURLINFO_LOCAL_IP.3
index e342fd2b3..ee15faaf7 100644
--- a/docs/libcurl/opts/CURLINFO_LOCAL_IP.3
+++ b/docs/libcurl/opts/GNURLINFO_LOCAL_IP.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLINFO_LOCAL_IP \- get local IP address of last connection
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_getinfo(CURL *handle, CURLINFO_LOCAL_IP, char **ip);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLINFO_LOCAL_PORT.3 b/docs/libcurl/opts/GNURLINFO_LOCAL_PORT.3
index bf6b6e533..16ef96e59 100644
--- a/docs/libcurl/opts/CURLINFO_LOCAL_PORT.3
+++ b/docs/libcurl/opts/GNURLINFO_LOCAL_PORT.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLINFO_LOCAL_PORT \- get the latest local port number
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_getinfo(CURL *handle, CURLINFO_LOCAL_PORT, long *portp);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLINFO_NAMELOOKUP_TIME.3 b/docs/libcurl/opts/GNURLINFO_NAMELOOKUP_TIME.3
index db916d4a8..84dd96e1f 100644
--- a/docs/libcurl/opts/CURLINFO_NAMELOOKUP_TIME.3
+++ b/docs/libcurl/opts/GNURLINFO_NAMELOOKUP_TIME.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLINFO_NAMELOOKUP_TIME \- get the name lookup time
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_getinfo(CURL *handle, CURLINFO_NAMELOOKUP_TIME, double *timep);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLINFO_NAMELOOKUP_TIME_T.3 b/docs/libcurl/opts/GNURLINFO_NAMELOOKUP_TIME_T.3
index 0c13eb243..f1150f2da 100644
--- a/docs/libcurl/opts/CURLINFO_NAMELOOKUP_TIME_T.3
+++ b/docs/libcurl/opts/GNURLINFO_NAMELOOKUP_TIME_T.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLINFO_NAMELOOKUP_TIME_T \- get the name lookup time in microseconds
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_getinfo(CURL *handle, CURLINFO_NAMELOOKUP_TIME_T, curl_off_t *timep);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLINFO_NUM_CONNECTS.3 b/docs/libcurl/opts/GNURLINFO_NUM_CONNECTS.3
index e682179aa..4cc73c78f 100644
--- a/docs/libcurl/opts/CURLINFO_NUM_CONNECTS.3
+++ b/docs/libcurl/opts/GNURLINFO_NUM_CONNECTS.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLINFO_NUM_CONNECTS \- get number of created connections
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_getinfo(CURL *handle, CURLINFO_NUM_CONNECTS, long *nump);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLINFO_OS_ERRNO.3 b/docs/libcurl/opts/GNURLINFO_OS_ERRNO.3
index 63072ae1a..86f9312ce 100644
--- a/docs/libcurl/opts/CURLINFO_OS_ERRNO.3
+++ b/docs/libcurl/opts/GNURLINFO_OS_ERRNO.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLINFO_OS_ERRNO \- get errno number from last connect failure
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_getinfo(CURL *handle, CURLINFO_OS_ERRNO, long *errnop);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLINFO_PRETRANSFER_TIME.3 b/docs/libcurl/opts/GNURLINFO_PRETRANSFER_TIME.3
index fdc31d60c..17b99a4b7 100644
--- a/docs/libcurl/opts/CURLINFO_PRETRANSFER_TIME.3
+++ b/docs/libcurl/opts/GNURLINFO_PRETRANSFER_TIME.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLINFO_PRETRANSFER_TIME \- get the time until the file transfer start
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_getinfo(CURL *handle, CURLINFO_PRETRANSFER_TIME, double *timep);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLINFO_PRETRANSFER_TIME_T.3 b/docs/libcurl/opts/GNURLINFO_PRETRANSFER_TIME_T.3
index 2bdc3c256..d63856a58 100644
--- a/docs/libcurl/opts/CURLINFO_PRETRANSFER_TIME_T.3
+++ b/docs/libcurl/opts/GNURLINFO_PRETRANSFER_TIME_T.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLINFO_PRETRANSFER_TIME_T \- get the time until the file transfer start
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_getinfo(CURL *handle, CURLINFO_PRETRANSFER_TIME_T, curl_off_t *timep);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLINFO_PRIMARY_IP.3 b/docs/libcurl/opts/GNURLINFO_PRIMARY_IP.3
index ec859d5d5..6f2d16842 100644
--- a/docs/libcurl/opts/CURLINFO_PRIMARY_IP.3
+++ b/docs/libcurl/opts/GNURLINFO_PRIMARY_IP.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLINFO_PRIMARY_IP \- get IP address of last connection
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_getinfo(CURL *handle, CURLINFO_PRIMARY_IP, char **ip);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLINFO_PRIMARY_PORT.3 b/docs/libcurl/opts/GNURLINFO_PRIMARY_PORT.3
index f86855412..10ed5423f 100644
--- a/docs/libcurl/opts/CURLINFO_PRIMARY_PORT.3
+++ b/docs/libcurl/opts/GNURLINFO_PRIMARY_PORT.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLINFO_PRIMARY_PORT \- get the latest destination port number
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_getinfo(CURL *handle, CURLINFO_PRIMARY_PORT, long *portp);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLINFO_PRIVATE.3 b/docs/libcurl/opts/GNURLINFO_PRIVATE.3
index 03418e364..90c74ed42 100644
--- a/docs/libcurl/opts/CURLINFO_PRIVATE.3
+++ b/docs/libcurl/opts/GNURLINFO_PRIVATE.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLINFO_PRIVATE \- get the private pointer
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_getinfo(CURL *handle, CURLINFO_PRIVATE, char **private);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLINFO_PROTOCOL.3 b/docs/libcurl/opts/GNURLINFO_PROTOCOL.3
index 2f5a3edfc..638aefde5 100644
--- a/docs/libcurl/opts/CURLINFO_PROTOCOL.3
+++ b/docs/libcurl/opts/GNURLINFO_PROTOCOL.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLINFO_PROTOCOL \- get the protocol used in the connection
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_getinfo(CURL *handle, CURLINFO_PROTOCOL, long *p);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLINFO_PROXYAUTH_AVAIL.3 b/docs/libcurl/opts/GNURLINFO_PROXYAUTH_AVAIL.3
index fa6bb41f8..429a8a25c 100644
--- a/docs/libcurl/opts/CURLINFO_PROXYAUTH_AVAIL.3
+++ b/docs/libcurl/opts/GNURLINFO_PROXYAUTH_AVAIL.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLINFO_PROXYAUTH_AVAIL \- get available HTTP proxy authentication methods
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_getinfo(CURL *handle, CURLINFO_PROXYAUTH_AVAIL, long *authp);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLINFO_PROXY_SSL_VERIFYRESULT.3 b/docs/libcurl/opts/GNURLINFO_PROXY_SSL_VERIFYRESULT.3
index b6ef7d13e..c148bf329 100644
--- a/docs/libcurl/opts/CURLINFO_PROXY_SSL_VERIFYRESULT.3
+++ b/docs/libcurl/opts/GNURLINFO_PROXY_SSL_VERIFYRESULT.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLINFO_PROXY_SSL_VERIFYRESULT \- get the result of the proxy certificate verification
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_getinfo(CURL *handle, CURLINFO_PROXY_SSL_VERIFYRESULT, long *result);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLINFO_REDIRECT_COUNT.3 b/docs/libcurl/opts/GNURLINFO_REDIRECT_COUNT.3
index 61d79830b..f4516cbe7 100644
--- a/docs/libcurl/opts/CURLINFO_REDIRECT_COUNT.3
+++ b/docs/libcurl/opts/GNURLINFO_REDIRECT_COUNT.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLINFO_REDIRECT_COUNT \- get the number of redirects
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_getinfo(CURL *handle, CURLINFO_REDIRECT_COUNT, long *countp);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLINFO_REDIRECT_TIME.3 b/docs/libcurl/opts/GNURLINFO_REDIRECT_TIME.3
index 3cc58729b..f7ccd541c 100644
--- a/docs/libcurl/opts/CURLINFO_REDIRECT_TIME.3
+++ b/docs/libcurl/opts/GNURLINFO_REDIRECT_TIME.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLINFO_REDIRECT_TIME \- get the time for all redirection steps
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_getinfo(CURL *handle, CURLINFO_REDIRECT_TIME, double *timep);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLINFO_REDIRECT_TIME_T.3 b/docs/libcurl/opts/GNURLINFO_REDIRECT_TIME_T.3
index 20fa0313b..922a1b50d 100644
--- a/docs/libcurl/opts/CURLINFO_REDIRECT_TIME_T.3
+++ b/docs/libcurl/opts/GNURLINFO_REDIRECT_TIME_T.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLINFO_REDIRECT_TIME_T \- get the time for all redirection steps
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_getinfo(CURL *handle, CURLINFO_REDIRECT_TIME_T, curl_off_t *timep);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLINFO_REDIRECT_URL.3 b/docs/libcurl/opts/GNURLINFO_REDIRECT_URL.3
index f4f882e5b..91abf43de 100644
--- a/docs/libcurl/opts/CURLINFO_REDIRECT_URL.3
+++ b/docs/libcurl/opts/GNURLINFO_REDIRECT_URL.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLINFO_REDIRECT_URL \- get the URL a redirect would go to
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_getinfo(CURL *handle, CURLINFO_REDIRECT_URL, char **urlp);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLINFO_REQUEST_SIZE.3 b/docs/libcurl/opts/GNURLINFO_REQUEST_SIZE.3
index 43b183fc4..b7e7679d3 100644
--- a/docs/libcurl/opts/CURLINFO_REQUEST_SIZE.3
+++ b/docs/libcurl/opts/GNURLINFO_REQUEST_SIZE.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLINFO_REQUEST_SIZE \- get size of sent request
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_getinfo(CURL *handle, CURLINFO_REQUEST_SIZE, long *sizep);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLINFO_RESPONSE_CODE.3 b/docs/libcurl/opts/GNURLINFO_RESPONSE_CODE.3
index b1f48473d..955201574 100644
--- a/docs/libcurl/opts/CURLINFO_RESPONSE_CODE.3
+++ b/docs/libcurl/opts/GNURLINFO_RESPONSE_CODE.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLINFO_RESPONSE_CODE \- get the last response code
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_getinfo(CURL *handle, CURLINFO_RESPONSE_CODE, long *codep);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLINFO_RTSP_CLIENT_CSEQ.3 b/docs/libcurl/opts/GNURLINFO_RTSP_CLIENT_CSEQ.3
index 6ca6781f5..347808ba3 100644
--- a/docs/libcurl/opts/CURLINFO_RTSP_CLIENT_CSEQ.3
+++ b/docs/libcurl/opts/GNURLINFO_RTSP_CLIENT_CSEQ.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLINFO_RTSP_CLIENT_CSEQ \- get the next RTSP client CSeq
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_getinfo(CURL *handle, CURLINFO_RTSP_CLIENT_CSEQ, long *cseq);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLINFO_RTSP_CSEQ_RECV.3 b/docs/libcurl/opts/GNURLINFO_RTSP_CSEQ_RECV.3
index 66e9f6a08..db2716678 100644
--- a/docs/libcurl/opts/CURLINFO_RTSP_CSEQ_RECV.3
+++ b/docs/libcurl/opts/GNURLINFO_RTSP_CSEQ_RECV.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLINFO_RTSP_CSEQ_RECV \- get the recently received CSeq
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_getinfo(CURL *handle, CURLINFO_RTSP_CSEQ_RECV, long *cseq);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLINFO_RTSP_SERVER_CSEQ.3 b/docs/libcurl/opts/GNURLINFO_RTSP_SERVER_CSEQ.3
index 1334dc5a6..b0f697a3b 100644
--- a/docs/libcurl/opts/CURLINFO_RTSP_SERVER_CSEQ.3
+++ b/docs/libcurl/opts/GNURLINFO_RTSP_SERVER_CSEQ.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLINFO_RTSP_SERVER_CSEQ \- get the next RTSP server CSeq
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_getinfo(CURL *handle, CURLINFO_RTSP_SERVER_CSEQ, long *cseq);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLINFO_RTSP_SESSION_ID.3 b/docs/libcurl/opts/GNURLINFO_RTSP_SESSION_ID.3
index faa52f3f8..29b570fd9 100644
--- a/docs/libcurl/opts/CURLINFO_RTSP_SESSION_ID.3
+++ b/docs/libcurl/opts/GNURLINFO_RTSP_SESSION_ID.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLINFO_RTSP_SESSION_ID \- get RTSP session ID
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_getinfo(CURL *handle, CURLINFO_RTSP_SESSION_ID, char **id);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLINFO_SCHEME.3 b/docs/libcurl/opts/GNURLINFO_SCHEME.3
index 38a3d15ba..acc501f6d 100644
--- a/docs/libcurl/opts/CURLINFO_SCHEME.3
+++ b/docs/libcurl/opts/GNURLINFO_SCHEME.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLINFO_SCHEME \- get the URL scheme (sometimes called protocol) used in the connection
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_getinfo(CURL *handle, CURLINFO_SCHEME, char **scheme);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLINFO_SIZE_DOWNLOAD.3 b/docs/libcurl/opts/GNURLINFO_SIZE_DOWNLOAD.3
index 6253fed79..77bd7390e 100644
--- a/docs/libcurl/opts/CURLINFO_SIZE_DOWNLOAD.3
+++ b/docs/libcurl/opts/GNURLINFO_SIZE_DOWNLOAD.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLINFO_SIZE_DOWNLOAD \- get the number of downloaded bytes
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_getinfo(CURL *handle, CURLINFO_SIZE_DOWNLOAD, double *dlp);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLINFO_SIZE_DOWNLOAD_T.3 b/docs/libcurl/opts/GNURLINFO_SIZE_DOWNLOAD_T.3
index 05f255463..ec92c979b 100644
--- a/docs/libcurl/opts/CURLINFO_SIZE_DOWNLOAD_T.3
+++ b/docs/libcurl/opts/GNURLINFO_SIZE_DOWNLOAD_T.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLINFO_SIZE_DOWNLOAD_T \- get the number of downloaded bytes
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_getinfo(CURL *handle, CURLINFO_SIZE_DOWNLOAD_T, curl_off_t *dlp);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLINFO_SIZE_UPLOAD.3 b/docs/libcurl/opts/GNURLINFO_SIZE_UPLOAD.3
index 704902d6c..959a79255 100644
--- a/docs/libcurl/opts/CURLINFO_SIZE_UPLOAD.3
+++ b/docs/libcurl/opts/GNURLINFO_SIZE_UPLOAD.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLINFO_SIZE_UPLOAD \- get the number of uploaded bytes
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_getinfo(CURL *handle, CURLINFO_SIZE_UPLOAD, double *uploadp);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLINFO_SIZE_UPLOAD_T.3 b/docs/libcurl/opts/GNURLINFO_SIZE_UPLOAD_T.3
index 1b931e8f0..1c8e3f066 100644
--- a/docs/libcurl/opts/CURLINFO_SIZE_UPLOAD_T.3
+++ b/docs/libcurl/opts/GNURLINFO_SIZE_UPLOAD_T.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLINFO_SIZE_UPLOAD_T \- get the number of uploaded bytes
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_getinfo(CURL *handle, CURLINFO_SIZE_UPLOAD_T, curl_off_t *uploadp);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLINFO_SPEED_DOWNLOAD.3 b/docs/libcurl/opts/GNURLINFO_SPEED_DOWNLOAD.3
index e78503c10..8059ba47a 100644
--- a/docs/libcurl/opts/CURLINFO_SPEED_DOWNLOAD.3
+++ b/docs/libcurl/opts/GNURLINFO_SPEED_DOWNLOAD.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLINFO_SPEED_DOWNLOAD \- get download speed
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_getinfo(CURL *handle, CURLINFO_SPEED_DOWNLOAD, double *speed);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLINFO_SPEED_DOWNLOAD_T.3 b/docs/libcurl/opts/GNURLINFO_SPEED_DOWNLOAD_T.3
index 721dc47fd..6875f3a39 100644
--- a/docs/libcurl/opts/CURLINFO_SPEED_DOWNLOAD_T.3
+++ b/docs/libcurl/opts/GNURLINFO_SPEED_DOWNLOAD_T.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLINFO_SPEED_DOWNLOAD_T \- get download speed
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_getinfo(CURL *handle, CURLINFO_SPEED_DOWNLOAD_T, curl_off_t *speed);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLINFO_SPEED_UPLOAD.3 b/docs/libcurl/opts/GNURLINFO_SPEED_UPLOAD.3
index 9d2e330d0..4828c0b98 100644
--- a/docs/libcurl/opts/CURLINFO_SPEED_UPLOAD.3
+++ b/docs/libcurl/opts/GNURLINFO_SPEED_UPLOAD.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLINFO_SPEED_UPLOAD \- get upload speed
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_getinfo(CURL *handle, CURLINFO_SPEED_UPLOAD, double *speed);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLINFO_SPEED_UPLOAD_T.3 b/docs/libcurl/opts/GNURLINFO_SPEED_UPLOAD_T.3
index 873fde6fe..3263b6344 100644
--- a/docs/libcurl/opts/CURLINFO_SPEED_UPLOAD_T.3
+++ b/docs/libcurl/opts/GNURLINFO_SPEED_UPLOAD_T.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLINFO_SPEED_UPLOAD_T \- get upload speed
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_getinfo(CURL *handle, CURLINFO_SPEED_UPLOAD_T, curl_off_t *speed);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLINFO_SSL_ENGINES.3 b/docs/libcurl/opts/GNURLINFO_SSL_ENGINES.3
index ab598f1e9..a5b2deb04 100644
--- a/docs/libcurl/opts/CURLINFO_SSL_ENGINES.3
+++ b/docs/libcurl/opts/GNURLINFO_SSL_ENGINES.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLINFO_SSL_ENGINES \- get an slist of OpenSSL crypto-engines
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_getinfo(CURL *handle, CURLINFO_SSL_ENGINES,
                            struct curl_slist **engine_list);
diff --git a/docs/libcurl/opts/CURLINFO_SSL_VERIFYRESULT.3 b/docs/libcurl/opts/GNURLINFO_SSL_VERIFYRESULT.3
index b0bd54cd8..6a138007c 100644
--- a/docs/libcurl/opts/CURLINFO_SSL_VERIFYRESULT.3
+++ b/docs/libcurl/opts/GNURLINFO_SSL_VERIFYRESULT.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLINFO_SSL_VERIFYRESULT \- get the result of the certificate verification
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_getinfo(CURL *handle, CURLINFO_SSL_VERIFYRESULT, long *result);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLINFO_STARTTRANSFER_TIME.3 b/docs/libcurl/opts/GNURLINFO_STARTTRANSFER_TIME.3
index e5252804d..6b72677e7 100644
--- a/docs/libcurl/opts/CURLINFO_STARTTRANSFER_TIME.3
+++ b/docs/libcurl/opts/GNURLINFO_STARTTRANSFER_TIME.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLINFO_STARTTRANSFER_TIME \- get the time until the first byte is received
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_getinfo(CURL *handle, CURLINFO_STARTTRANSFER_TIME, double *timep);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLINFO_STARTTRANSFER_TIME_T.3 b/docs/libcurl/opts/GNURLINFO_STARTTRANSFER_TIME_T.3
index 76d354629..73baaf473 100644
--- a/docs/libcurl/opts/CURLINFO_STARTTRANSFER_TIME_T.3
+++ b/docs/libcurl/opts/GNURLINFO_STARTTRANSFER_TIME_T.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLINFO_STARTTRANSFER_TIME_T \- get the time until the first byte is received
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_getinfo(CURL *handle, CURLINFO_STARTTRANSFER_TIME_T, curl_off_t *timep);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLINFO_TLS_SESSION.3 b/docs/libcurl/opts/GNURLINFO_TLS_SESSION.3
index fcfa17f25..fb0d1df5c 100644
--- a/docs/libcurl/opts/CURLINFO_TLS_SESSION.3
+++ b/docs/libcurl/opts/GNURLINFO_TLS_SESSION.3
@@ -25,7 +25,7 @@
 CURLINFO_TLS_SESSION \- get TLS session info
 .SH SYNOPSIS
 .nf
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_getinfo(CURL *handle, CURLINFO_TLS_SESSION,
                            struct curl_tlssessioninfo **session);
diff --git a/docs/libcurl/opts/CURLINFO_TLS_SSL_PTR.3 b/docs/libcurl/opts/GNURLINFO_TLS_SSL_PTR.3
index 44ad40574..85013a6e0 100644
--- a/docs/libcurl/opts/CURLINFO_TLS_SSL_PTR.3
+++ b/docs/libcurl/opts/GNURLINFO_TLS_SSL_PTR.3
@@ -25,7 +25,7 @@
 CURLINFO_TLS_SESSION, CURLINFO_TLS_SSL_PTR \- get TLS session info
 .SH SYNOPSIS
 .nf
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_getinfo(CURL *handle, CURLINFO_TLS_SSL_PTR,
                            struct curl_tlssessioninfo **session);
@@ -129,7 +129,7 @@ https://github.com/curl/curl/issues/685
 All TLS-based
 .SH EXAMPLE
 .nf
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 #include <openssl/ssl.h>
 
 CURL *curl;
diff --git a/docs/libcurl/opts/CURLINFO_TOTAL_TIME.3 b/docs/libcurl/opts/GNURLINFO_TOTAL_TIME.3
index e2386a94b..83598f0ea 100644
--- a/docs/libcurl/opts/CURLINFO_TOTAL_TIME.3
+++ b/docs/libcurl/opts/GNURLINFO_TOTAL_TIME.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLINFO_TOTAL_TIME \- get total time of previous transfer
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_getinfo(CURL *handle, CURLINFO_TOTAL_TIME, double *timep);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLINFO_TOTAL_TIME_T.3 b/docs/libcurl/opts/GNURLINFO_TOTAL_TIME_T.3
index 313425bef..8f833f7e0 100644
--- a/docs/libcurl/opts/CURLINFO_TOTAL_TIME_T.3
+++ b/docs/libcurl/opts/GNURLINFO_TOTAL_TIME_T.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLINFO_TOTAL_TIME_T \- get total time of previous transfer in microseconds
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_getinfo(CURL *handle, CURLINFO_TOTAL_TIME_T, curl_off_t *timep);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLMOPT_CHUNK_LENGTH_PENALTY_SIZE.3 b/docs/libcurl/opts/GNURLMOPT_CHUNK_LENGTH_PENALTY_SIZE.3
index f07676082..fc852fa4d 100644
--- a/docs/libcurl/opts/CURLMOPT_CHUNK_LENGTH_PENALTY_SIZE.3
+++ b/docs/libcurl/opts/GNURLMOPT_CHUNK_LENGTH_PENALTY_SIZE.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLMOPT_CHUNK_LENGTH_PENALTY_SIZE \- chunk length threshold for pipelining
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLMcode curl_multi_setopt(CURLM *handle, CURLMOPT_CHUNK_LENGTH_PENALTY_SIZE, long size);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLMOPT_CONTENT_LENGTH_PENALTY_SIZE.3 b/docs/libcurl/opts/GNURLMOPT_CONTENT_LENGTH_PENALTY_SIZE.3
index c7a004041..1ddd4d325 100644
--- a/docs/libcurl/opts/CURLMOPT_CONTENT_LENGTH_PENALTY_SIZE.3
+++ b/docs/libcurl/opts/GNURLMOPT_CONTENT_LENGTH_PENALTY_SIZE.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLMOPT_CONTENT_LENGTH_PENALTY_SIZE \- size threshold for pipelining penalty
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLMcode curl_multi_setopt(CURLM *handle, CURLMOPT_CONTENT_LENGTH_PENALTY_SIZE, long size);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLMOPT_MAXCONNECTS.3 b/docs/libcurl/opts/GNURLMOPT_MAXCONNECTS.3
index 8f5ac7b86..94798a36e 100644
--- a/docs/libcurl/opts/CURLMOPT_MAXCONNECTS.3
+++ b/docs/libcurl/opts/GNURLMOPT_MAXCONNECTS.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLMOPT_MAXCONNECTS \- set size of connection cache
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLMcode curl_multi_setopt(CURLM *handle, CURLMOPT_MAXCONNECTS, long max);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLMOPT_MAX_HOST_CONNECTIONS.3 b/docs/libcurl/opts/GNURLMOPT_MAX_HOST_CONNECTIONS.3
index 9507a04ec..3cfeb71cc 100644
--- a/docs/libcurl/opts/CURLMOPT_MAX_HOST_CONNECTIONS.3
+++ b/docs/libcurl/opts/GNURLMOPT_MAX_HOST_CONNECTIONS.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLMOPT_MAX_HOST_CONNECTIONS \- set max number of connections to a single host
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLMcode curl_multi_setopt(CURLM *handle, CURLMOPT_MAX_HOST_CONNECTIONS, long max);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLMOPT_MAX_PIPELINE_LENGTH.3 b/docs/libcurl/opts/GNURLMOPT_MAX_PIPELINE_LENGTH.3
index 4ced6bfb9..3823a623d 100644
--- a/docs/libcurl/opts/CURLMOPT_MAX_PIPELINE_LENGTH.3
+++ b/docs/libcurl/opts/GNURLMOPT_MAX_PIPELINE_LENGTH.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLMOPT_MAX_PIPELINE_LENGTH \- maximum number of requests in a pipeline
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLMcode curl_multi_setopt(CURLM *handle, CURLMOPT_MAX_PIPELINE_LENGTH, long max);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLMOPT_MAX_TOTAL_CONNECTIONS.3 b/docs/libcurl/opts/GNURLMOPT_MAX_TOTAL_CONNECTIONS.3
index bca000186..330a37f99 100644
--- a/docs/libcurl/opts/CURLMOPT_MAX_TOTAL_CONNECTIONS.3
+++ b/docs/libcurl/opts/GNURLMOPT_MAX_TOTAL_CONNECTIONS.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLMOPT_MAX_TOTAL_CONNECTIONS \- max simultaneously open connections
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLMcode curl_multi_setopt(CURLM *handle, CURLMOPT_MAX_TOTAL_CONNECTIONS, long amount);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLMOPT_PIPELINING.3 b/docs/libcurl/opts/GNURLMOPT_PIPELINING.3
index 48e058796..50c9ba313 100644
--- a/docs/libcurl/opts/CURLMOPT_PIPELINING.3
+++ b/docs/libcurl/opts/GNURLMOPT_PIPELINING.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLMOPT_PIPELINING \- enable HTTP pipelining and multiplexing
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLMcode curl_multi_setopt(CURLM *handle, CURLMOPT_PIPELINING, long bitmask);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLMOPT_PIPELINING_SERVER_BL.3 b/docs/libcurl/opts/GNURLMOPT_PIPELINING_SERVER_BL.3
index 457bef232..22b125f78 100644
--- a/docs/libcurl/opts/CURLMOPT_PIPELINING_SERVER_BL.3
+++ b/docs/libcurl/opts/GNURLMOPT_PIPELINING_SERVER_BL.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLMOPT_PIPELINING_SERVER_BL \- pipelining server blacklist
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLMcode curl_multi_setopt(CURLM *handle, CURLMOPT_PIPELINING_SERVER_BL, char **servers);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLMOPT_PIPELINING_SITE_BL.3 b/docs/libcurl/opts/GNURLMOPT_PIPELINING_SITE_BL.3
index 8c5f5d410..3e9132f34 100644
--- a/docs/libcurl/opts/CURLMOPT_PIPELINING_SITE_BL.3
+++ b/docs/libcurl/opts/GNURLMOPT_PIPELINING_SITE_BL.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLMOPT_PIPELINING_SITE_BL \- pipelining host blacklist
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLMcode curl_multi_setopt(CURLM *handle, CURLMOPT_PIPELINING_SITE_BL, char **hosts);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLMOPT_PUSHDATA.3 b/docs/libcurl/opts/GNURLMOPT_PUSHDATA.3
index d8ada0100..cbbe03c12 100644
--- a/docs/libcurl/opts/CURLMOPT_PUSHDATA.3
+++ b/docs/libcurl/opts/GNURLMOPT_PUSHDATA.3
@@ -25,7 +25,7 @@
 CURLMOPT_PUSHDATA \- pointer to pass to push callback
 .SH SYNOPSIS
 .nf
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLMcode curl_multi_setopt(CURLM *handle, CURLMOPT_PUSHDATA, void *pointer);
 .fi
diff --git a/docs/libcurl/opts/CURLMOPT_PUSHFUNCTION.3 b/docs/libcurl/opts/GNURLMOPT_PUSHFUNCTION.3
index 9fe02f8d7..daab05162 100644
--- a/docs/libcurl/opts/CURLMOPT_PUSHFUNCTION.3
+++ b/docs/libcurl/opts/GNURLMOPT_PUSHFUNCTION.3
@@ -25,7 +25,7 @@
 CURLMOPT_PUSHFUNCTION \- callback that approves or denies server pushes
 .SH SYNOPSIS
 .nf
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 char *curl_pushheader_bynum(struct curl_pushheaders *h, size_t num);
 char *curl_pushheader_byname(struct curl_pushheaders *h, const char *name);
diff --git a/docs/libcurl/opts/CURLMOPT_SOCKETDATA.3 b/docs/libcurl/opts/GNURLMOPT_SOCKETDATA.3
index 54e8befa6..5b544c66b 100644
--- a/docs/libcurl/opts/CURLMOPT_SOCKETDATA.3
+++ b/docs/libcurl/opts/GNURLMOPT_SOCKETDATA.3
@@ -25,7 +25,7 @@
 CURLMOPT_SOCKETDATA \- custom pointer passed to the socket callback
 .SH SYNOPSIS
 .nf
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLMcode curl_multi_setopt(CURLM *handle, CURLMOPT_SOCKETDATA, void *pointer);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLMOPT_SOCKETFUNCTION.3 b/docs/libcurl/opts/GNURLMOPT_SOCKETFUNCTION.3
index e55ff5e0b..dd0cbcf3d 100644
--- a/docs/libcurl/opts/CURLMOPT_SOCKETFUNCTION.3
+++ b/docs/libcurl/opts/GNURLMOPT_SOCKETFUNCTION.3
@@ -25,7 +25,7 @@
 CURLMOPT_SOCKETFUNCTION \- callback informed about what to wait for
 .SH SYNOPSIS
 .nf
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 int socket_callback(CURL *easy,      /* easy handle */
                     curl_socket_t s, /* socket */
diff --git a/docs/libcurl/opts/CURLMOPT_TIMERDATA.3 b/docs/libcurl/opts/GNURLMOPT_TIMERDATA.3
index 6f590d3e7..309ec5f1b 100644
--- a/docs/libcurl/opts/CURLMOPT_TIMERDATA.3
+++ b/docs/libcurl/opts/GNURLMOPT_TIMERDATA.3
@@ -25,7 +25,7 @@
 CURLMOPT_TIMERDATA \- custom pointer to pass to timer callback
 .SH SYNOPSIS
 .nf
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLMcode curl_multi_setopt(CURLM *handle, CURLMOPT_TIMERDATA, void *pointer);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLMOPT_TIMERFUNCTION.3 b/docs/libcurl/opts/GNURLMOPT_TIMERFUNCTION.3
index d926d811d..f60391f45 100644
--- a/docs/libcurl/opts/CURLMOPT_TIMERFUNCTION.3
+++ b/docs/libcurl/opts/GNURLMOPT_TIMERFUNCTION.3
@@ -25,7 +25,7 @@
 CURLMOPT_TIMERFUNCTION \- set callback to receive timeout values
 .SH SYNOPSIS
 .nf
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 int timer_callback(CURLM *multi,    /* multi handle */
                    long timeout_ms, /* timeout in number of ms */
diff --git a/docs/libcurl/opts/CURLOPT_ABSTRACT_UNIX_SOCKET.3 b/docs/libcurl/opts/GNURLOPT_ABSTRACT_UNIX_SOCKET.3
index 8b61854c0..b9ee4fff3 100644
--- a/docs/libcurl/opts/CURLOPT_ABSTRACT_UNIX_SOCKET.3
+++ b/docs/libcurl/opts/GNURLOPT_ABSTRACT_UNIX_SOCKET.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_ABSTRACT_UNIX_SOCKET \- set an abstract Unix domain socket
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_ABSTRACT_UNIX_SOCKET, char *path);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_ACCEPTTIMEOUT_MS.3 b/docs/libcurl/opts/GNURLOPT_ACCEPTTIMEOUT_MS.3
index 70325fd9a..37ec54553 100644
--- a/docs/libcurl/opts/CURLOPT_ACCEPTTIMEOUT_MS.3
+++ b/docs/libcurl/opts/GNURLOPT_ACCEPTTIMEOUT_MS.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_ACCEPTTIMEOUT_MS \- timeout waiting for FTP server to connect back
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_ACCEPTTIMEOUT_MS, long ms);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_ACCEPT_ENCODING.3 b/docs/libcurl/opts/GNURLOPT_ACCEPT_ENCODING.3
index abd4734ab..1ef8e17e0 100644
--- a/docs/libcurl/opts/CURLOPT_ACCEPT_ENCODING.3
+++ b/docs/libcurl/opts/GNURLOPT_ACCEPT_ENCODING.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_ACCEPT_ENCODING \- enables automatic decompression of HTTP downloads
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_ACCEPT_ENCODING, char *enc);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_ADDRESS_SCOPE.3 b/docs/libcurl/opts/GNURLOPT_ADDRESS_SCOPE.3
index 4ce6db9b1..61a180eed 100644
--- a/docs/libcurl/opts/CURLOPT_ADDRESS_SCOPE.3
+++ b/docs/libcurl/opts/GNURLOPT_ADDRESS_SCOPE.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_ADDRESS_SCOPE \- set scope for local IPv6 addresses
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_ADDRESS_SCOPE, long scope);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_APPEND.3 b/docs/libcurl/opts/GNURLOPT_APPEND.3
index c22acf797..6a0799a31 100644
--- a/docs/libcurl/opts/CURLOPT_APPEND.3
+++ b/docs/libcurl/opts/GNURLOPT_APPEND.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_APPEND \- enable appending to the remote file
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_APPEND, long append);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_AUTOREFERER.3 b/docs/libcurl/opts/GNURLOPT_AUTOREFERER.3
index 4d8a1c04d..df6230d26 100644
--- a/docs/libcurl/opts/CURLOPT_AUTOREFERER.3
+++ b/docs/libcurl/opts/GNURLOPT_AUTOREFERER.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_AUTOREFERER \- automatically update the referer header
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_AUTOREFERER, long autorefer);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_BUFFERSIZE.3 b/docs/libcurl/opts/GNURLOPT_BUFFERSIZE.3
index b4100e607..68119398e 100644
--- a/docs/libcurl/opts/CURLOPT_BUFFERSIZE.3
+++ b/docs/libcurl/opts/GNURLOPT_BUFFERSIZE.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_BUFFERSIZE \- set preferred receive buffer size
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_BUFFERSIZE, long size);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_CAINFO.3 b/docs/libcurl/opts/GNURLOPT_CAINFO.3
index 84fb30120..3ad8746b8 100644
--- a/docs/libcurl/opts/CURLOPT_CAINFO.3
+++ b/docs/libcurl/opts/GNURLOPT_CAINFO.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_CAINFO \- path to Certificate Authority (CA) bundle
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_CAINFO, char *path);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_CAPATH.3 b/docs/libcurl/opts/GNURLOPT_CAPATH.3
index 183428ffc..bceffdc83 100644
--- a/docs/libcurl/opts/CURLOPT_CAPATH.3
+++ b/docs/libcurl/opts/GNURLOPT_CAPATH.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_CAPATH \- specify directory holding CA certificates
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_CAPATH, char *capath);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_CERTINFO.3 b/docs/libcurl/opts/GNURLOPT_CERTINFO.3
index 015b7fbe1..9157f0429 100644
--- a/docs/libcurl/opts/CURLOPT_CERTINFO.3
+++ b/docs/libcurl/opts/GNURLOPT_CERTINFO.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_CERTINFO \- request SSL certificate information
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_CERTINFO, long certinfo);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_CHUNK_BGN_FUNCTION.3 b/docs/libcurl/opts/GNURLOPT_CHUNK_BGN_FUNCTION.3
index 8a7afb620..be5277810 100644
--- a/docs/libcurl/opts/CURLOPT_CHUNK_BGN_FUNCTION.3
+++ b/docs/libcurl/opts/GNURLOPT_CHUNK_BGN_FUNCTION.3
@@ -25,7 +25,7 @@
 CURLOPT_CHUNK_BGN_FUNCTION \- callback before a transfer with FTP wildcardmatch
 .SH SYNOPSIS
 .nf
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 long chunk_bgn_callback(const void *transfer_info, void *ptr,
                         int remains);
@@ -47,7 +47,7 @@ option for now.
 
 The target of transfer_info parameter is a "feature depended" structure. For
 the FTP wildcard download, the target is curl_fileinfo structure (see
-\fIcurl/curl.h\fP).  The parameter \fIptr\fP is a pointer given by
+\fIgnurl/curl.h\fP).  The parameter \fIptr\fP is a pointer given by
 \fICURLOPT_CHUNK_DATA(3)\fP. The parameter remains contains number of chunks
 remaining per the transfer. If the feature is not available, the parameter has
 zero value.
diff --git a/docs/libcurl/opts/CURLOPT_CHUNK_DATA.3 b/docs/libcurl/opts/GNURLOPT_CHUNK_DATA.3
index ebf76559e..0acbadd24 100644
--- a/docs/libcurl/opts/CURLOPT_CHUNK_DATA.3
+++ b/docs/libcurl/opts/GNURLOPT_CHUNK_DATA.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_CHUNK_DATA \- custom pointer to the FTP chunk callbacks
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_CHUNK_DATA, void *pointer);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_CHUNK_END_FUNCTION.3 b/docs/libcurl/opts/GNURLOPT_CHUNK_END_FUNCTION.3
index e8d20982b..0e0b914f4 100644
--- a/docs/libcurl/opts/CURLOPT_CHUNK_END_FUNCTION.3
+++ b/docs/libcurl/opts/GNURLOPT_CHUNK_END_FUNCTION.3
@@ -25,7 +25,7 @@
 CURLOPT_CHUNK_END_FUNCTION \- callback after a transfer with FTP wildcardmatch
 .SH SYNOPSIS
 .nf
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 long chunk_end_callback(void *ptr);
 
diff --git a/docs/libcurl/opts/CURLOPT_CLOSESOCKETDATA.3 b/docs/libcurl/opts/GNURLOPT_CLOSESOCKETDATA.3
index b9bca47dc..247d6e040 100644
--- a/docs/libcurl/opts/CURLOPT_CLOSESOCKETDATA.3
+++ b/docs/libcurl/opts/GNURLOPT_CLOSESOCKETDATA.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_CLOSESOCKETDATA \- pointer passed to the socket close callback
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_CLOSESOCKETDATA, void *pointer);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_CLOSESOCKETFUNCTION.3 b/docs/libcurl/opts/GNURLOPT_CLOSESOCKETFUNCTION.3
index 3fb75f747..a3c09cb11 100644
--- a/docs/libcurl/opts/CURLOPT_CLOSESOCKETFUNCTION.3
+++ b/docs/libcurl/opts/GNURLOPT_CLOSESOCKETFUNCTION.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_CLOSESOCKETFUNCTION \- callback to socket close replacement function
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 int closesocket_callback(void *clientp, curl_socket_t item);
 
diff --git a/docs/libcurl/opts/CURLOPT_CONNECTTIMEOUT.3 b/docs/libcurl/opts/GNURLOPT_CONNECTTIMEOUT.3
index 2adb9bb09..195566fd3 100644
--- a/docs/libcurl/opts/CURLOPT_CONNECTTIMEOUT.3
+++ b/docs/libcurl/opts/GNURLOPT_CONNECTTIMEOUT.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_CONNECTTIMEOUT \- timeout for the connect phase
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_CONNECTTIMEOUT, long timeout);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_CONNECTTIMEOUT_MS.3 b/docs/libcurl/opts/GNURLOPT_CONNECTTIMEOUT_MS.3
index 5fad75c55..1f74f6334 100644
--- a/docs/libcurl/opts/CURLOPT_CONNECTTIMEOUT_MS.3
+++ b/docs/libcurl/opts/GNURLOPT_CONNECTTIMEOUT_MS.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_CONNECTTIMEOUT_MS \- timeout for the connect phase
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_CONNECTTIMEOUT_MS, long timeout);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_CONNECT_ONLY.3 b/docs/libcurl/opts/GNURLOPT_CONNECT_ONLY.3
index 375d5d4d6..a01ba2117 100644
--- a/docs/libcurl/opts/CURLOPT_CONNECT_ONLY.3
+++ b/docs/libcurl/opts/GNURLOPT_CONNECT_ONLY.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_CONNECT_ONLY \- stop when connected to target server
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_CONNECT_ONLY, long only);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_CONNECT_TO.3 b/docs/libcurl/opts/GNURLOPT_CONNECT_TO.3
index 9f80cc383..586d96278 100644
--- a/docs/libcurl/opts/CURLOPT_CONNECT_TO.3
+++ b/docs/libcurl/opts/GNURLOPT_CONNECT_TO.3
@@ -25,7 +25,7 @@
 CURLOPT_CONNECT_TO \- Connect to a specific host and port instead of the URL's host and port
 .SH SYNOPSIS
 .nf
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_CONNECT_TO,
                           struct curl_slist *connect_to);
diff --git a/docs/libcurl/opts/CURLOPT_CONV_FROM_NETWORK_FUNCTION.3 b/docs/libcurl/opts/GNURLOPT_CONV_FROM_NETWORK_FUNCTION.3
index b810129dd..d29f97527 100644
--- a/docs/libcurl/opts/CURLOPT_CONV_FROM_NETWORK_FUNCTION.3
+++ b/docs/libcurl/opts/GNURLOPT_CONV_FROM_NETWORK_FUNCTION.3
@@ -25,7 +25,7 @@
 CURLOPT_CONV_FROM_NETWORK_FUNCTION \- convert data from network to host encoding
 .SH SYNOPSIS
 .nf
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode conv_callback(char *ptr, size_t length);
 
diff --git a/docs/libcurl/opts/CURLOPT_CONV_FROM_UTF8_FUNCTION.3 b/docs/libcurl/opts/GNURLOPT_CONV_FROM_UTF8_FUNCTION.3
index e029fc032..21cdca657 100644
--- a/docs/libcurl/opts/CURLOPT_CONV_FROM_UTF8_FUNCTION.3
+++ b/docs/libcurl/opts/GNURLOPT_CONV_FROM_UTF8_FUNCTION.3
@@ -25,7 +25,7 @@
 CURLOPT_CONV_FROM_UTF8_FUNCTION \- convert data from UTF8 to host encoding
 .SH SYNOPSIS
 .nf
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode conv_callback(char *ptr, size_t length);
 
diff --git a/docs/libcurl/opts/CURLOPT_CONV_TO_NETWORK_FUNCTION.3 b/docs/libcurl/opts/GNURLOPT_CONV_TO_NETWORK_FUNCTION.3
index c9aea1e44..58445d179 100644
--- a/docs/libcurl/opts/CURLOPT_CONV_TO_NETWORK_FUNCTION.3
+++ b/docs/libcurl/opts/GNURLOPT_CONV_TO_NETWORK_FUNCTION.3
@@ -25,7 +25,7 @@
 CURLOPT_CONV_TO_NETWORK_FUNCTION \- convert data to network from host encoding
 .SH SYNOPSIS
 .nf
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode conv_callback(char *ptr, size_t length);
 
diff --git a/docs/libcurl/opts/CURLOPT_COOKIE.3 b/docs/libcurl/opts/GNURLOPT_COOKIE.3
index d0da3f1f1..efd8cab33 100644
--- a/docs/libcurl/opts/CURLOPT_COOKIE.3
+++ b/docs/libcurl/opts/GNURLOPT_COOKIE.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_COOKIE \- set contents of HTTP Cookie header
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_COOKIE, char *cookie);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_COOKIEFILE.3 b/docs/libcurl/opts/GNURLOPT_COOKIEFILE.3
index fb33e41f0..fcf908631 100644
--- a/docs/libcurl/opts/CURLOPT_COOKIEFILE.3
+++ b/docs/libcurl/opts/GNURLOPT_COOKIEFILE.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_COOKIEFILE \- file name to read cookies from
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_COOKIEFILE, char *filename);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_COOKIEJAR.3 b/docs/libcurl/opts/GNURLOPT_COOKIEJAR.3
index d4f7ccdad..eee777f9d 100644
--- a/docs/libcurl/opts/CURLOPT_COOKIEJAR.3
+++ b/docs/libcurl/opts/GNURLOPT_COOKIEJAR.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_COOKIEJAR \- file name to store cookies to
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_COOKIEJAR, char *filename);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_COOKIELIST.3 b/docs/libcurl/opts/GNURLOPT_COOKIELIST.3
index 7de4da882..f0e079fc4 100644
--- a/docs/libcurl/opts/CURLOPT_COOKIELIST.3
+++ b/docs/libcurl/opts/GNURLOPT_COOKIELIST.3
@@ -25,7 +25,7 @@
 CURLOPT_COOKIELIST \- add to or manipulate cookies held in memory
 .SH SYNOPSIS
 .nf
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_COOKIELIST,
                           char *cookie);
diff --git a/docs/libcurl/opts/CURLOPT_COOKIESESSION.3 b/docs/libcurl/opts/GNURLOPT_COOKIESESSION.3
index c4c015f82..042854681 100644
--- a/docs/libcurl/opts/CURLOPT_COOKIESESSION.3
+++ b/docs/libcurl/opts/GNURLOPT_COOKIESESSION.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_COOKIESESSION \- start a new cookie session
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_COOKIESESSION, long init);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_COPYPOSTFIELDS.3 b/docs/libcurl/opts/GNURLOPT_COPYPOSTFIELDS.3
index 001d6fe4a..76a83f6f9 100644
--- a/docs/libcurl/opts/CURLOPT_COPYPOSTFIELDS.3
+++ b/docs/libcurl/opts/GNURLOPT_COPYPOSTFIELDS.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_COPYPOSTFIELDS \- have libcurl copy data to POST
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_COPYPOSTFIELDS, char *data);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_CRLF.3 b/docs/libcurl/opts/GNURLOPT_CRLF.3
index 61ac9e264..f49fa0699 100644
--- a/docs/libcurl/opts/CURLOPT_CRLF.3
+++ b/docs/libcurl/opts/GNURLOPT_CRLF.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_CRLF \- enable/disable CRLF conversion
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_CRLF, long conv);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_CRLFILE.3 b/docs/libcurl/opts/GNURLOPT_CRLFILE.3
index 1b8df4afc..22f777d18 100644
--- a/docs/libcurl/opts/CURLOPT_CRLFILE.3
+++ b/docs/libcurl/opts/GNURLOPT_CRLFILE.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_CRLFILE \- specify a Certificate Revocation List file
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_CRLFILE, char *file);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_CURLU.3 b/docs/libcurl/opts/GNURLOPT_CURLU.3
index 995fcd3f4..1b4843f98 100644
--- a/docs/libcurl/opts/CURLOPT_CURLU.3
+++ b/docs/libcurl/opts/GNURLOPT_CURLU.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_CURLU \- set URL with CURLU *
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_CURLU, void *pointer);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_CUSTOMREQUEST.3 b/docs/libcurl/opts/GNURLOPT_CUSTOMREQUEST.3
index 93ccaf8dd..31773f9f9 100644
--- a/docs/libcurl/opts/CURLOPT_CUSTOMREQUEST.3
+++ b/docs/libcurl/opts/GNURLOPT_CUSTOMREQUEST.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_CUSTOMREQUEST \- custom string for request
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_CUSTOMREQUEST, char *request);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_DEBUGDATA.3 b/docs/libcurl/opts/GNURLOPT_DEBUGDATA.3
index 27b9cbb39..09468e975 100644
--- a/docs/libcurl/opts/CURLOPT_DEBUGDATA.3
+++ b/docs/libcurl/opts/GNURLOPT_DEBUGDATA.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_DEBUGDATA \- custom pointer for debug callback
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_DEBUGDATA, void *pointer);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_DEBUGFUNCTION.3 b/docs/libcurl/opts/GNURLOPT_DEBUGFUNCTION.3
index 535c5302b..2477a6db4 100644
--- a/docs/libcurl/opts/CURLOPT_DEBUGFUNCTION.3
+++ b/docs/libcurl/opts/GNURLOPT_DEBUGFUNCTION.3
@@ -25,7 +25,7 @@
 CURLOPT_DEBUGFUNCTION \- debug callback
 .SH SYNOPSIS
 .nf
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 typedef enum {
   CURLINFO_TEXT = 0,
diff --git a/docs/libcurl/opts/CURLOPT_DEFAULT_PROTOCOL.3 b/docs/libcurl/opts/GNURLOPT_DEFAULT_PROTOCOL.3
index a39c6b3f4..03b3bfaf5 100644
--- a/docs/libcurl/opts/CURLOPT_DEFAULT_PROTOCOL.3
+++ b/docs/libcurl/opts/GNURLOPT_DEFAULT_PROTOCOL.3
@@ -25,7 +25,7 @@
 CURLOPT_DEFAULT_PROTOCOL \- default protocol to use if the URL is missing a
 scheme name
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_DEFAULT_PROTOCOL, char
 *protocol);
diff --git a/docs/libcurl/opts/CURLOPT_DIRLISTONLY.3 b/docs/libcurl/opts/GNURLOPT_DIRLISTONLY.3
index 203e247b7..4773c6a80 100644
--- a/docs/libcurl/opts/CURLOPT_DIRLISTONLY.3
+++ b/docs/libcurl/opts/GNURLOPT_DIRLISTONLY.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_DIRLISTONLY \- ask for names only in a directory listing
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_DIRLISTONLY, long listonly);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_DISALLOW_USERNAME_IN_URL.3 b/docs/libcurl/opts/GNURLOPT_DISALLOW_USERNAME_IN_URL.3
index ac5f913a3..8a4638a4c 100644
--- a/docs/libcurl/opts/CURLOPT_DISALLOW_USERNAME_IN_URL.3
+++ b/docs/libcurl/opts/GNURLOPT_DISALLOW_USERNAME_IN_URL.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_DISALLOW_USERNAME_IN_URL \- disallow specifying username in the url
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_DISALLOW_USERNAME_IN_URL, long disallow);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_DNS_CACHE_TIMEOUT.3 b/docs/libcurl/opts/GNURLOPT_DNS_CACHE_TIMEOUT.3
index 24b61a839..d4294502b 100644
--- a/docs/libcurl/opts/CURLOPT_DNS_CACHE_TIMEOUT.3
+++ b/docs/libcurl/opts/GNURLOPT_DNS_CACHE_TIMEOUT.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_DNS_CACHE_TIMEOUT \- set life-time for DNS cache entries
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_DNS_CACHE_TIMEOUT, long age);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_DNS_INTERFACE.3 b/docs/libcurl/opts/GNURLOPT_DNS_INTERFACE.3
index 824ca1ea6..ea0db94ec 100644
--- a/docs/libcurl/opts/CURLOPT_DNS_INTERFACE.3
+++ b/docs/libcurl/opts/GNURLOPT_DNS_INTERFACE.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_DNS_INTERFACE \- set interface to speak DNS over
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_DNS_INTERFACE, char *ifname);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_DNS_LOCAL_IP4.3 b/docs/libcurl/opts/GNURLOPT_DNS_LOCAL_IP4.3
index d29242be8..62ccd075c 100644
--- a/docs/libcurl/opts/CURLOPT_DNS_LOCAL_IP4.3
+++ b/docs/libcurl/opts/GNURLOPT_DNS_LOCAL_IP4.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_DNS_LOCAL_IP4 \- IPv4 address to bind DNS resolves to
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_DNS_LOCAL_IP4, char *address);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_DNS_LOCAL_IP6.3 b/docs/libcurl/opts/GNURLOPT_DNS_LOCAL_IP6.3
index 3402f346c..12389503f 100644
--- a/docs/libcurl/opts/CURLOPT_DNS_LOCAL_IP6.3
+++ b/docs/libcurl/opts/GNURLOPT_DNS_LOCAL_IP6.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_DNS_LOCAL_IP6 \- IPv6 address to bind DNS resolves to
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_DNS_LOCAL_IP6, char *address);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_DNS_SERVERS.3 b/docs/libcurl/opts/GNURLOPT_DNS_SERVERS.3
index 0067494ae..dd1587fc5 100644
--- a/docs/libcurl/opts/CURLOPT_DNS_SERVERS.3
+++ b/docs/libcurl/opts/GNURLOPT_DNS_SERVERS.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_DNS_SERVERS \- set preferred DNS servers
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_DNS_SERVERS, char *servers);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_DNS_SHUFFLE_ADDRESSES.3 b/docs/libcurl/opts/GNURLOPT_DNS_SHUFFLE_ADDRESSES.3
index 8af2d0aa2..94233626c 100644
--- a/docs/libcurl/opts/CURLOPT_DNS_SHUFFLE_ADDRESSES.3
+++ b/docs/libcurl/opts/GNURLOPT_DNS_SHUFFLE_ADDRESSES.3
@@ -25,7 +25,7 @@
 CURLOPT_DNS_SHUFFLE_ADDRESSES \- Shuffle addresses when a hostname returns more than one
 .SH SYNOPSIS
 .nf
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_DNS_SHUFFLE_ADDRESSES, long onoff);
 .fi
diff --git a/docs/libcurl/opts/CURLOPT_DNS_USE_GLOBAL_CACHE.3 b/docs/libcurl/opts/GNURLOPT_DNS_USE_GLOBAL_CACHE.3
index b23493b41..b76bc870c 100644
--- a/docs/libcurl/opts/CURLOPT_DNS_USE_GLOBAL_CACHE.3
+++ b/docs/libcurl/opts/GNURLOPT_DNS_USE_GLOBAL_CACHE.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_DNS_USE_GLOBAL_CACHE \- enable/disable global DNS cache
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_DNS_USE_GLOBAL_CACHE,
                           long enable);
diff --git a/docs/libcurl/opts/CURLOPT_DOH_URL.3 b/docs/libcurl/opts/GNURLOPT_DOH_URL.3
index 407b92e20..2a45db3b2 100644
--- a/docs/libcurl/opts/CURLOPT_DOH_URL.3
+++ b/docs/libcurl/opts/GNURLOPT_DOH_URL.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_DOH_URL \- provide the DNS-over-HTTPS URL
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_DOH_URL, char *URL);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_EGDSOCKET.3 b/docs/libcurl/opts/GNURLOPT_EGDSOCKET.3
index 8a2c1a603..2068ea5b1 100644
--- a/docs/libcurl/opts/CURLOPT_EGDSOCKET.3
+++ b/docs/libcurl/opts/GNURLOPT_EGDSOCKET.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_EGDSOCKET \- set EGD socket path
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_EGDSOCKET, char *path);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_ERRORBUFFER.3 b/docs/libcurl/opts/GNURLOPT_ERRORBUFFER.3
index 71cce945b..6d5bec81f 100644
--- a/docs/libcurl/opts/CURLOPT_ERRORBUFFER.3
+++ b/docs/libcurl/opts/GNURLOPT_ERRORBUFFER.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_ERRORBUFFER \- set error buffer for error messages
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_ERRORBUFFER, char *buf);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_EXPECT_100_TIMEOUT_MS.3 b/docs/libcurl/opts/GNURLOPT_EXPECT_100_TIMEOUT_MS.3
index 2e2ccd1ba..5f1fb1fdd 100644
--- a/docs/libcurl/opts/CURLOPT_EXPECT_100_TIMEOUT_MS.3
+++ b/docs/libcurl/opts/GNURLOPT_EXPECT_100_TIMEOUT_MS.3
@@ -25,7 +25,7 @@
 CURLOPT_EXPECT_100_TIMEOUT_MS \- timeout for Expect: 100-continue response
 .SH SYNOPSIS
 .nf
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_EXPECT_100_TIMEOUT_MS,
                           long milliseconds);
diff --git a/docs/libcurl/opts/CURLOPT_FAILONERROR.3 b/docs/libcurl/opts/GNURLOPT_FAILONERROR.3
index 107b28ef8..936fbba76 100644
--- a/docs/libcurl/opts/CURLOPT_FAILONERROR.3
+++ b/docs/libcurl/opts/GNURLOPT_FAILONERROR.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_FAILONERROR \- request failure on HTTP response >= 400
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_FAILONERROR, long fail);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_FILETIME.3 b/docs/libcurl/opts/GNURLOPT_FILETIME.3
index d8d1c7ed0..2de1b1585 100644
--- a/docs/libcurl/opts/CURLOPT_FILETIME.3
+++ b/docs/libcurl/opts/GNURLOPT_FILETIME.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_FILETIME \- get the modification time of the remote resource
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_FILETIME, long gettime);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_FNMATCH_DATA.3 b/docs/libcurl/opts/GNURLOPT_FNMATCH_DATA.3
index 88f3ba662..7da4eb2e8 100644
--- a/docs/libcurl/opts/CURLOPT_FNMATCH_DATA.3
+++ b/docs/libcurl/opts/GNURLOPT_FNMATCH_DATA.3
@@ -25,7 +25,7 @@
 CURLOPT_FNMATCH_DATA \- custom pointer to fnmatch callback
 .SH SYNOPSIS
 .nf
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_FNMATCH_DATA,
                           void *pointer);
diff --git a/docs/libcurl/opts/CURLOPT_FNMATCH_FUNCTION.3 b/docs/libcurl/opts/GNURLOPT_FNMATCH_FUNCTION.3
index 7a79ad8a7..c69320e34 100644
--- a/docs/libcurl/opts/CURLOPT_FNMATCH_FUNCTION.3
+++ b/docs/libcurl/opts/GNURLOPT_FNMATCH_FUNCTION.3
@@ -25,7 +25,7 @@
 CURLOPT_FNMATCH_FUNCTION \- wildcard matching function callback
 .SH SYNOPSIS
 .nf
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 int fnmatch_callback(void *ptr,
                      const char *pattern,
diff --git a/docs/libcurl/opts/CURLOPT_FOLLOWLOCATION.3 b/docs/libcurl/opts/GNURLOPT_FOLLOWLOCATION.3
index f8d2b1889..06982b901 100644
--- a/docs/libcurl/opts/CURLOPT_FOLLOWLOCATION.3
+++ b/docs/libcurl/opts/GNURLOPT_FOLLOWLOCATION.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_FOLLOWLOCATION \- follow HTTP 3xx redirects
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_FOLLOWLOCATION, long enable);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_FORBID_REUSE.3 b/docs/libcurl/opts/GNURLOPT_FORBID_REUSE.3
index 509052381..3387d258c 100644
--- a/docs/libcurl/opts/CURLOPT_FORBID_REUSE.3
+++ b/docs/libcurl/opts/GNURLOPT_FORBID_REUSE.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_FORBID_REUSE \- make connection get closed at once after use
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_FORBID_REUSE, long close);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_FRESH_CONNECT.3 b/docs/libcurl/opts/GNURLOPT_FRESH_CONNECT.3
index 19cd575c6..3ec33eb5a 100644
--- a/docs/libcurl/opts/CURLOPT_FRESH_CONNECT.3
+++ b/docs/libcurl/opts/GNURLOPT_FRESH_CONNECT.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_FRESH_CONNECT \- force a new connection to be used
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_FRESH_CONNECT, long fresh);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_FTPPORT.3 b/docs/libcurl/opts/GNURLOPT_FTPPORT.3
index e150a5b29..a7b95f25a 100644
--- a/docs/libcurl/opts/CURLOPT_FTPPORT.3
+++ b/docs/libcurl/opts/GNURLOPT_FTPPORT.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_FTPPORT \- make FTP transfer active
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_FTPPORT, char *spec);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_FTPSSLAUTH.3 b/docs/libcurl/opts/GNURLOPT_FTPSSLAUTH.3
index 8aa9eec0b..34e674859 100644
--- a/docs/libcurl/opts/CURLOPT_FTPSSLAUTH.3
+++ b/docs/libcurl/opts/GNURLOPT_FTPSSLAUTH.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_FTPSSLAUTH \- set order in which to attempt TLS vs SSL when using FTP
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_FTPSSLAUTH, long order);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_FTP_ACCOUNT.3 b/docs/libcurl/opts/GNURLOPT_FTP_ACCOUNT.3
index 8218038a1..12b01ca10 100644
--- a/docs/libcurl/opts/CURLOPT_FTP_ACCOUNT.3
+++ b/docs/libcurl/opts/GNURLOPT_FTP_ACCOUNT.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_FTP_ACCOUNT \- set account info for FTP
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_FTP_ACCOUNT, char *account);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_FTP_ALTERNATIVE_TO_USER.3 b/docs/libcurl/opts/GNURLOPT_FTP_ALTERNATIVE_TO_USER.3
index a9723b5f6..1e8fed583 100644
--- a/docs/libcurl/opts/CURLOPT_FTP_ALTERNATIVE_TO_USER.3
+++ b/docs/libcurl/opts/GNURLOPT_FTP_ALTERNATIVE_TO_USER.3
@@ -25,7 +25,7 @@
 CURLOPT_FTP_ALTERNATIVE_TO_USER \- command to use instead of USER with FTP
 .SH SYNOPSIS
 .nf
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_FTP_ALTERNATIVE_TO_USER,
                           char *cmd);
diff --git a/docs/libcurl/opts/CURLOPT_FTP_CREATE_MISSING_DIRS.3 b/docs/libcurl/opts/GNURLOPT_FTP_CREATE_MISSING_DIRS.3
index f57873605..277e2a13d 100644
--- a/docs/libcurl/opts/CURLOPT_FTP_CREATE_MISSING_DIRS.3
+++ b/docs/libcurl/opts/GNURLOPT_FTP_CREATE_MISSING_DIRS.3
@@ -25,7 +25,7 @@
 CURLOPT_FTP_CREATE_MISSING_DIRS \- create missing dirs for FTP and SFTP
 .SH SYNOPSIS
 .nf
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 typedef enum {
   CURLFTP_CREATE_DIR_NONE,
diff --git a/docs/libcurl/opts/CURLOPT_FTP_FILEMETHOD.3 b/docs/libcurl/opts/GNURLOPT_FTP_FILEMETHOD.3
index 381145bc3..92e7ced91 100644
--- a/docs/libcurl/opts/CURLOPT_FTP_FILEMETHOD.3
+++ b/docs/libcurl/opts/GNURLOPT_FTP_FILEMETHOD.3
@@ -25,7 +25,7 @@
 CURLOPT_FTP_FILEMETHOD \- select directory traversing method for FTP
 .SH SYNOPSIS
 .nf
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_FTP_FILEMETHOD,
                           long method);
diff --git a/docs/libcurl/opts/CURLOPT_FTP_RESPONSE_TIMEOUT.3 b/docs/libcurl/opts/GNURLOPT_FTP_RESPONSE_TIMEOUT.3
index 86b6073ff..1d8b6dff9 100644
--- a/docs/libcurl/opts/CURLOPT_FTP_RESPONSE_TIMEOUT.3
+++ b/docs/libcurl/opts/GNURLOPT_FTP_RESPONSE_TIMEOUT.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_FTP_RESPONSE_TIMEOUT \- time allowed to wait for FTP response
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_FTP_RESPONSE_TIMEOUT, long timeout);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_FTP_SKIP_PASV_IP.3 b/docs/libcurl/opts/GNURLOPT_FTP_SKIP_PASV_IP.3
index 9d468a551..5af90b182 100644
--- a/docs/libcurl/opts/CURLOPT_FTP_SKIP_PASV_IP.3
+++ b/docs/libcurl/opts/GNURLOPT_FTP_SKIP_PASV_IP.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_FTP_SKIP_PASV_IP \- ignore the IP address in the PASV response
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_FTP_SKIP_PASV_IP, long skip);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_FTP_SSL_CCC.3 b/docs/libcurl/opts/GNURLOPT_FTP_SSL_CCC.3
index 2cd2c7380..2ed1d0768 100644
--- a/docs/libcurl/opts/CURLOPT_FTP_SSL_CCC.3
+++ b/docs/libcurl/opts/GNURLOPT_FTP_SSL_CCC.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_FTP_SSL_CCC \- switch off SSL again with FTP after auth
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_FTP_SSL_CCC,
                           long how);
diff --git a/docs/libcurl/opts/CURLOPT_FTP_USE_EPRT.3 b/docs/libcurl/opts/GNURLOPT_FTP_USE_EPRT.3
index 181f5a1cb..19c3e42f9 100644
--- a/docs/libcurl/opts/CURLOPT_FTP_USE_EPRT.3
+++ b/docs/libcurl/opts/GNURLOPT_FTP_USE_EPRT.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_FTP_USE_EPRT \- enable/disable use of EPRT with FTP
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_FTP_USE_EPRT, long enabled);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_FTP_USE_EPSV.3 b/docs/libcurl/opts/GNURLOPT_FTP_USE_EPSV.3
index 970e08a83..ffe6bed7d 100644
--- a/docs/libcurl/opts/CURLOPT_FTP_USE_EPSV.3
+++ b/docs/libcurl/opts/GNURLOPT_FTP_USE_EPSV.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_FTP_USE_EPSV \- enable/disable use of EPSV
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_FTP_USE_EPSV, long epsv);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_FTP_USE_PRET.3 b/docs/libcurl/opts/GNURLOPT_FTP_USE_PRET.3
index 53b33e50d..4ae96af74 100644
--- a/docs/libcurl/opts/CURLOPT_FTP_USE_PRET.3
+++ b/docs/libcurl/opts/GNURLOPT_FTP_USE_PRET.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_FTP_USE_PRET \- enable the PRET command
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_FTP_USE_PRET, long enable);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_GSSAPI_DELEGATION.3 b/docs/libcurl/opts/GNURLOPT_GSSAPI_DELEGATION.3
index 9cd7be906..d35cfcbd1 100644
--- a/docs/libcurl/opts/CURLOPT_GSSAPI_DELEGATION.3
+++ b/docs/libcurl/opts/GNURLOPT_GSSAPI_DELEGATION.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_GSSAPI_DELEGATION \- set allowed GSS-API delegation
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_GSSAPI_DELEGATION, long level);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_HAPPY_EYEBALLS_TIMEOUT_MS.3 b/docs/libcurl/opts/GNURLOPT_HAPPY_EYEBALLS_TIMEOUT_MS.3
index df6694877..8bb8bc633 100644
--- a/docs/libcurl/opts/CURLOPT_HAPPY_EYEBALLS_TIMEOUT_MS.3
+++ b/docs/libcurl/opts/GNURLOPT_HAPPY_EYEBALLS_TIMEOUT_MS.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_HAPPY_EYEBALLS_TIMEOUT_MS \- head start for ipv6 for happy eyeballs
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_HAPPY_EYEBALLS_TIMEOUT_MS, long timeout);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_HAPROXYPROTOCOL.3 b/docs/libcurl/opts/GNURLOPT_HAPROXYPROTOCOL.3
index 679ab2360..e1bc12dbf 100644
--- a/docs/libcurl/opts/CURLOPT_HAPROXYPROTOCOL.3
+++ b/docs/libcurl/opts/GNURLOPT_HAPROXYPROTOCOL.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_HAPROXYPROTOCOL \- send HAProxy PROXY protocol v1 header
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_HAPROXYPROTOCOL,
                           long haproxy_protocol);
diff --git a/docs/libcurl/opts/CURLOPT_HEADER.3 b/docs/libcurl/opts/GNURLOPT_HEADER.3
index 0cd7b6fac..3e25ad7a1 100644
--- a/docs/libcurl/opts/CURLOPT_HEADER.3
+++ b/docs/libcurl/opts/GNURLOPT_HEADER.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_HEADER \- pass headers to the data stream
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_HEADER, long onoff);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_HEADERDATA.3 b/docs/libcurl/opts/GNURLOPT_HEADERDATA.3
index 73dcc2bb9..fbfc90ab6 100644
--- a/docs/libcurl/opts/CURLOPT_HEADERDATA.3
+++ b/docs/libcurl/opts/GNURLOPT_HEADERDATA.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_HEADERDATA \- pointer to pass to header callback
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_HEADERDATA, void *pointer);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_HEADERFUNCTION.3 b/docs/libcurl/opts/GNURLOPT_HEADERFUNCTION.3
index b5faa01de..dff530ccf 100644
--- a/docs/libcurl/opts/CURLOPT_HEADERFUNCTION.3
+++ b/docs/libcurl/opts/GNURLOPT_HEADERFUNCTION.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_HEADERFUNCTION \- callback that receives header data
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 size_t header_callback(char *buffer,
                        size_t size,
diff --git a/docs/libcurl/opts/CURLOPT_HEADEROPT.3 b/docs/libcurl/opts/GNURLOPT_HEADEROPT.3
index b9a0075cc..e78461994 100644
--- a/docs/libcurl/opts/CURLOPT_HEADEROPT.3
+++ b/docs/libcurl/opts/GNURLOPT_HEADEROPT.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_HEADEROPT \- set how to send HTTP headers
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_HEADEROPT, long bitmask);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_HTTP09_ALLOWED.3 b/docs/libcurl/opts/GNURLOPT_HTTP09_ALLOWED.3
index 3fa44993a..36f4f9a71 100644
--- a/docs/libcurl/opts/CURLOPT_HTTP09_ALLOWED.3
+++ b/docs/libcurl/opts/GNURLOPT_HTTP09_ALLOWED.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_HTTP09 \- allow HTTP/0.9 response
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_HTTP09_ALLOWED, long allowed);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_HTTP200ALIASES.3 b/docs/libcurl/opts/GNURLOPT_HTTP200ALIASES.3
index 24d33053f..8f014b289 100644
--- a/docs/libcurl/opts/CURLOPT_HTTP200ALIASES.3
+++ b/docs/libcurl/opts/GNURLOPT_HTTP200ALIASES.3
@@ -25,7 +25,7 @@
 CURLOPT_HTTP200ALIASES \- specify alternative matches for HTTP 200 OK
 .SH SYNOPSIS
 .nf
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_HTTP200ALIASES,
                           struct curl_slist *aliases);
diff --git a/docs/libcurl/opts/CURLOPT_HTTPAUTH.3 b/docs/libcurl/opts/GNURLOPT_HTTPAUTH.3
index 7b85ecbb6..c5897d65c 100644
--- a/docs/libcurl/opts/CURLOPT_HTTPAUTH.3
+++ b/docs/libcurl/opts/GNURLOPT_HTTPAUTH.3
@@ -25,7 +25,7 @@
 CURLOPT_HTTPAUTH \- set HTTP server authentication methods to try
 .SH SYNOPSIS
 .nf
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_HTTPAUTH, long bitmask);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_HTTPGET.3 b/docs/libcurl/opts/GNURLOPT_HTTPGET.3
index 831fed81a..f06cb7a87 100644
--- a/docs/libcurl/opts/CURLOPT_HTTPGET.3
+++ b/docs/libcurl/opts/GNURLOPT_HTTPGET.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_HTTPGET \- ask for an HTTP GET request
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_HTTPGET, long useget);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_HTTPHEADER.3 b/docs/libcurl/opts/GNURLOPT_HTTPHEADER.3
index 9579fc41b..4eaf3121e 100644
--- a/docs/libcurl/opts/CURLOPT_HTTPHEADER.3
+++ b/docs/libcurl/opts/GNURLOPT_HTTPHEADER.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_HTTPHEADER \- set custom HTTP headers
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_HTTPHEADER, struct curl_slist *headers);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_HTTPPOST.3 b/docs/libcurl/opts/GNURLOPT_HTTPPOST.3
index 68a15d816..8cf6018b6 100644
--- a/docs/libcurl/opts/CURLOPT_HTTPPOST.3
+++ b/docs/libcurl/opts/GNURLOPT_HTTPPOST.3
@@ -25,7 +25,7 @@
 CURLOPT_HTTPPOST \- specify the multipart formpost content
 .SH SYNOPSIS
 .nf
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_HTTPPOST,
                           struct curl_httppost *formpost);
diff --git a/docs/libcurl/opts/CURLOPT_HTTPPROXYTUNNEL.3 b/docs/libcurl/opts/GNURLOPT_HTTPPROXYTUNNEL.3
index 46f9946d4..5a58f7e9f 100644
--- a/docs/libcurl/opts/CURLOPT_HTTPPROXYTUNNEL.3
+++ b/docs/libcurl/opts/GNURLOPT_HTTPPROXYTUNNEL.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_HTTPPROXYTUNNEL \- tunnel through HTTP proxy
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_HTTPPROXYTUNNEL, long tunnel);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_HTTP_CONTENT_DECODING.3 b/docs/libcurl/opts/GNURLOPT_HTTP_CONTENT_DECODING.3
index 084070774..0166e3aec 100644
--- a/docs/libcurl/opts/CURLOPT_HTTP_CONTENT_DECODING.3
+++ b/docs/libcurl/opts/GNURLOPT_HTTP_CONTENT_DECODING.3
@@ -25,7 +25,7 @@
 CURLOPT_HTTP_CONTENT_DECODING \- enable/disable HTTP content decoding
 .SH SYNOPSIS
 .nf
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_HTTP_CONTENT_DECODING,
                           long enabled);
diff --git a/docs/libcurl/opts/CURLOPT_HTTP_TRANSFER_DECODING.3 b/docs/libcurl/opts/GNURLOPT_HTTP_TRANSFER_DECODING.3
index db629615b..d26e9c37c 100644
--- a/docs/libcurl/opts/CURLOPT_HTTP_TRANSFER_DECODING.3
+++ b/docs/libcurl/opts/GNURLOPT_HTTP_TRANSFER_DECODING.3
@@ -25,7 +25,7 @@
 CURLOPT_HTTP_TRANSFER_DECODING \- enable/disable HTTP transfer decoding
 .SH SYNOPSIS
 .nf
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_HTTP_TRANSFER_DECODING,
                          long enabled);
diff --git a/docs/libcurl/opts/CURLOPT_HTTP_VERSION.3 b/docs/libcurl/opts/GNURLOPT_HTTP_VERSION.3
index 7b7a08144..0e44adaa1 100644
--- a/docs/libcurl/opts/CURLOPT_HTTP_VERSION.3
+++ b/docs/libcurl/opts/GNURLOPT_HTTP_VERSION.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_HTTP_VERSION \- specify HTTP protocol version to use
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_HTTP_VERSION, long version);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_IGNORE_CONTENT_LENGTH.3 b/docs/libcurl/opts/GNURLOPT_IGNORE_CONTENT_LENGTH.3
index 413ee5791..93be62e95 100644
--- a/docs/libcurl/opts/CURLOPT_IGNORE_CONTENT_LENGTH.3
+++ b/docs/libcurl/opts/GNURLOPT_IGNORE_CONTENT_LENGTH.3
@@ -25,7 +25,7 @@
 CURLOPT_IGNORE_CONTENT_LENGTH \- ignore content length
 .SH SYNOPSIS
 .nf
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_IGNORE_CONTENT_LENGTH,
                           long ignore);
diff --git a/docs/libcurl/opts/CURLOPT_INFILESIZE.3 b/docs/libcurl/opts/GNURLOPT_INFILESIZE.3
index 088f45d01..632d771b7 100644
--- a/docs/libcurl/opts/CURLOPT_INFILESIZE.3
+++ b/docs/libcurl/opts/GNURLOPT_INFILESIZE.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_INFILESIZE \- set size of the input file to send off
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_INFILESIZE, long filesize);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_INFILESIZE_LARGE.3 b/docs/libcurl/opts/GNURLOPT_INFILESIZE_LARGE.3
index cdc38f75c..6f7338190 100644
--- a/docs/libcurl/opts/CURLOPT_INFILESIZE_LARGE.3
+++ b/docs/libcurl/opts/GNURLOPT_INFILESIZE_LARGE.3
@@ -25,7 +25,7 @@
 CURLOPT_INFILESIZE_LARGE \- set size of the input file to send off
 .SH SYNOPSIS
 .nf
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_INFILESIZE_LARGE,
                           curl_off_t filesize);
diff --git a/docs/libcurl/opts/CURLOPT_INTERFACE.3 b/docs/libcurl/opts/GNURLOPT_INTERFACE.3
index bf30db74b..16c7f358c 100644
--- a/docs/libcurl/opts/CURLOPT_INTERFACE.3
+++ b/docs/libcurl/opts/GNURLOPT_INTERFACE.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_INTERFACE \- source interface for outgoing traffic
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_INTERFACE, char *interface);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_INTERLEAVEDATA.3 b/docs/libcurl/opts/GNURLOPT_INTERLEAVEDATA.3
index 59d36a1be..79a059446 100644
--- a/docs/libcurl/opts/CURLOPT_INTERLEAVEDATA.3
+++ b/docs/libcurl/opts/GNURLOPT_INTERLEAVEDATA.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_INTERLEAVEDATA \- custom pointer passed to RTSP interleave callback
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_INTERLEAVEDATA, void *pointer);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_INTERLEAVEFUNCTION.3 b/docs/libcurl/opts/GNURLOPT_INTERLEAVEFUNCTION.3
index b5776ed2c..08eb49ad9 100644
--- a/docs/libcurl/opts/CURLOPT_INTERLEAVEFUNCTION.3
+++ b/docs/libcurl/opts/GNURLOPT_INTERLEAVEFUNCTION.3
@@ -25,7 +25,7 @@
 CURLOPT_INTERLEAVEFUNCTION \- callback function for RTSP interleaved data
 .SH SYNOPSIS
 .nf
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 size_t interleave_callback(void *ptr, size_t size, size_t nmemb,
                            void *userdata);
diff --git a/docs/libcurl/opts/CURLOPT_IOCTLDATA.3 b/docs/libcurl/opts/GNURLOPT_IOCTLDATA.3
index f8d1e6782..0a92c09e7 100644
--- a/docs/libcurl/opts/CURLOPT_IOCTLDATA.3
+++ b/docs/libcurl/opts/GNURLOPT_IOCTLDATA.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_IOCTLDATA \- custom pointer passed to I/O callback
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_IOCTLDATA, void *pointer);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_IOCTLFUNCTION.3 b/docs/libcurl/opts/GNURLOPT_IOCTLFUNCTION.3
index fe1feec97..fb5bb2502 100644
--- a/docs/libcurl/opts/CURLOPT_IOCTLFUNCTION.3
+++ b/docs/libcurl/opts/GNURLOPT_IOCTLFUNCTION.3
@@ -25,7 +25,7 @@
 CURLOPT_IOCTLFUNCTION \- callback for I/O operations
 .SH SYNOPSIS
 .nf
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 typedef enum {
   CURLIOE_OK,            /* I/O operation successful */
diff --git a/docs/libcurl/opts/CURLOPT_IPRESOLVE.3 b/docs/libcurl/opts/GNURLOPT_IPRESOLVE.3
index a23d883fd..995c8939a 100644
--- a/docs/libcurl/opts/CURLOPT_IPRESOLVE.3
+++ b/docs/libcurl/opts/GNURLOPT_IPRESOLVE.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_IPRESOLVE \- specify which IP protocol version to use
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_IPRESOLVE, long resolve);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_ISSUERCERT.3 b/docs/libcurl/opts/GNURLOPT_ISSUERCERT.3
index 8c5d70faf..06d010572 100644
--- a/docs/libcurl/opts/CURLOPT_ISSUERCERT.3
+++ b/docs/libcurl/opts/GNURLOPT_ISSUERCERT.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_ISSUERCERT \- issuer SSL certificate filename
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_ISSUERCERT, char *file);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_KEEP_SENDING_ON_ERROR.3 b/docs/libcurl/opts/GNURLOPT_KEEP_SENDING_ON_ERROR.3
index 384ca756c..fbef74c07 100644
--- a/docs/libcurl/opts/CURLOPT_KEEP_SENDING_ON_ERROR.3
+++ b/docs/libcurl/opts/GNURLOPT_KEEP_SENDING_ON_ERROR.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_KEEP_SENDING_ON_ERROR \- keep sending on early HTTP response >= 300
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_KEEP_SENDING_ON_ERROR,
                           long keep_sending);
diff --git a/docs/libcurl/opts/CURLOPT_KEYPASSWD.3 b/docs/libcurl/opts/GNURLOPT_KEYPASSWD.3
index ea3212144..3b915782b 100644
--- a/docs/libcurl/opts/CURLOPT_KEYPASSWD.3
+++ b/docs/libcurl/opts/GNURLOPT_KEYPASSWD.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_KEYPASSWD \- set passphrase to private key
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_KEYPASSWD, char *pwd);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_KRBLEVEL.3 b/docs/libcurl/opts/GNURLOPT_KRBLEVEL.3
index 175e1cd77..771095b2a 100644
--- a/docs/libcurl/opts/CURLOPT_KRBLEVEL.3
+++ b/docs/libcurl/opts/GNURLOPT_KRBLEVEL.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_KRBLEVEL \- set FTP kerberos security level
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_KRBLEVEL, char *level);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_LOCALPORT.3 b/docs/libcurl/opts/GNURLOPT_LOCALPORT.3
index 1911b7c1a..e00da7a37 100644
--- a/docs/libcurl/opts/CURLOPT_LOCALPORT.3
+++ b/docs/libcurl/opts/GNURLOPT_LOCALPORT.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_LOCALPORT \- set local port number to use for socket
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_LOCALPORT, long port);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_LOCALPORTRANGE.3 b/docs/libcurl/opts/GNURLOPT_LOCALPORTRANGE.3
index 86f6b2823..21ee54c46 100644
--- a/docs/libcurl/opts/CURLOPT_LOCALPORTRANGE.3
+++ b/docs/libcurl/opts/GNURLOPT_LOCALPORTRANGE.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_LOCALPORTRANGE \- number of additional local ports to try
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_LOCALPORTRANGE,
                           long range);
diff --git a/docs/libcurl/opts/CURLOPT_LOGIN_OPTIONS.3 b/docs/libcurl/opts/GNURLOPT_LOGIN_OPTIONS.3
index 9b690341c..b3988e405 100644
--- a/docs/libcurl/opts/CURLOPT_LOGIN_OPTIONS.3
+++ b/docs/libcurl/opts/GNURLOPT_LOGIN_OPTIONS.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_LOGIN_OPTIONS \- set login options
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_LOGIN_OPTIONS, char *options);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_LOW_SPEED_LIMIT.3 b/docs/libcurl/opts/GNURLOPT_LOW_SPEED_LIMIT.3
index 7061345cf..f81cf9596 100644
--- a/docs/libcurl/opts/CURLOPT_LOW_SPEED_LIMIT.3
+++ b/docs/libcurl/opts/GNURLOPT_LOW_SPEED_LIMIT.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_LOW_SPEED_LIMIT \- set low speed limit in bytes per second
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_LOW_SPEED_LIMIT, long speedlimit);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_LOW_SPEED_TIME.3 b/docs/libcurl/opts/GNURLOPT_LOW_SPEED_TIME.3
index 64c336099..c6f9c6706 100644
--- a/docs/libcurl/opts/CURLOPT_LOW_SPEED_TIME.3
+++ b/docs/libcurl/opts/GNURLOPT_LOW_SPEED_TIME.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_LOW_SPEED_TIME \- set low speed limit time period
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_LOW_SPEED_TIME, long speedtime);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_MAIL_AUTH.3 b/docs/libcurl/opts/GNURLOPT_MAIL_AUTH.3
index 6aa4d604d..73844fb89 100644
--- a/docs/libcurl/opts/CURLOPT_MAIL_AUTH.3
+++ b/docs/libcurl/opts/GNURLOPT_MAIL_AUTH.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_MAIL_AUTH \- SMTP authentication address
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_MAIL_AUTH, char *auth);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_MAIL_FROM.3 b/docs/libcurl/opts/GNURLOPT_MAIL_FROM.3
index 2963c2731..d3ec37c42 100644
--- a/docs/libcurl/opts/CURLOPT_MAIL_FROM.3
+++ b/docs/libcurl/opts/GNURLOPT_MAIL_FROM.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_MAIL_FROM \- SMTP sender address
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_MAIL_FROM, char *from);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_MAIL_RCPT.3 b/docs/libcurl/opts/GNURLOPT_MAIL_RCPT.3
index 403a7a510..b12f58faf 100644
--- a/docs/libcurl/opts/CURLOPT_MAIL_RCPT.3
+++ b/docs/libcurl/opts/GNURLOPT_MAIL_RCPT.3
@@ -25,7 +25,7 @@
 CURLOPT_MAIL_RCPT \- list of SMTP mail recipients
 .SH SYNOPSIS
 .nf
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_MAIL_RCPT,
                           struct curl_slist *rcpts);
diff --git a/docs/libcurl/opts/CURLOPT_MAXCONNECTS.3 b/docs/libcurl/opts/GNURLOPT_MAXCONNECTS.3
index b60517175..d1abb74f1 100644
--- a/docs/libcurl/opts/CURLOPT_MAXCONNECTS.3
+++ b/docs/libcurl/opts/GNURLOPT_MAXCONNECTS.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_MAXCONNECTS \- maximum connection cache size
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_MAXCONNECTS, long amount);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_MAXFILESIZE.3 b/docs/libcurl/opts/GNURLOPT_MAXFILESIZE.3
index b75e66df7..8eedaddd4 100644
--- a/docs/libcurl/opts/CURLOPT_MAXFILESIZE.3
+++ b/docs/libcurl/opts/GNURLOPT_MAXFILESIZE.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_MAXFILESIZE \- maximum file size allowed to download
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_MAXFILESIZE, long size);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_MAXFILESIZE_LARGE.3 b/docs/libcurl/opts/GNURLOPT_MAXFILESIZE_LARGE.3
index 969cc5f2c..ad4be82d0 100644
--- a/docs/libcurl/opts/CURLOPT_MAXFILESIZE_LARGE.3
+++ b/docs/libcurl/opts/GNURLOPT_MAXFILESIZE_LARGE.3
@@ -25,7 +25,7 @@
 CURLOPT_MAXFILESIZE_LARGE \- maximum file size allowed to download
 .SH SYNOPSIS
 .nf
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_MAXFILESIZE_LARGE,
                           curl_off_t size);
diff --git a/docs/libcurl/opts/CURLOPT_MAXREDIRS.3 b/docs/libcurl/opts/GNURLOPT_MAXREDIRS.3
index ce6255360..6d333bc70 100644
--- a/docs/libcurl/opts/CURLOPT_MAXREDIRS.3
+++ b/docs/libcurl/opts/GNURLOPT_MAXREDIRS.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_MAXREDIRS \- maximum number of redirects allowed
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_MAXREDIRS, long amount);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_MAX_RECV_SPEED_LARGE.3 b/docs/libcurl/opts/GNURLOPT_MAX_RECV_SPEED_LARGE.3
index e4ced8643..5ea85fb77 100644
--- a/docs/libcurl/opts/CURLOPT_MAX_RECV_SPEED_LARGE.3
+++ b/docs/libcurl/opts/GNURLOPT_MAX_RECV_SPEED_LARGE.3
@@ -25,7 +25,7 @@
 CURLOPT_MAX_RECV_SPEED_LARGE \- rate limit data download speed
 .SH SYNOPSIS
 .nf
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_MAX_RECV_SPEED_LARGE,
                           curl_off_t speed);
diff --git a/docs/libcurl/opts/CURLOPT_MAX_SEND_SPEED_LARGE.3 b/docs/libcurl/opts/GNURLOPT_MAX_SEND_SPEED_LARGE.3
index d9f5c8bf0..450039437 100644
--- a/docs/libcurl/opts/CURLOPT_MAX_SEND_SPEED_LARGE.3
+++ b/docs/libcurl/opts/GNURLOPT_MAX_SEND_SPEED_LARGE.3
@@ -25,7 +25,7 @@
 CURLOPT_MAX_SEND_SPEED_LARGE \- rate limit data upload speed
 .SH SYNOPSIS
 .nf
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_MAX_SEND_SPEED_LARGE,
                           curl_off_t maxspeed);
diff --git a/docs/libcurl/opts/CURLOPT_MIMEPOST.3 b/docs/libcurl/opts/GNURLOPT_MIMEPOST.3
index dd64c4b17..be396c7d9 100644
--- a/docs/libcurl/opts/CURLOPT_MIMEPOST.3
+++ b/docs/libcurl/opts/GNURLOPT_MIMEPOST.3
@@ -25,7 +25,7 @@
 CURLOPT_MIMEPOST \- set post/send data from mime structure
 .SH SYNOPSIS
 .nf
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 curl_mime *mime;
 
diff --git a/docs/libcurl/opts/CURLOPT_NETRC.3 b/docs/libcurl/opts/GNURLOPT_NETRC.3
index 21178ef16..21941b9d8 100644
--- a/docs/libcurl/opts/CURLOPT_NETRC.3
+++ b/docs/libcurl/opts/GNURLOPT_NETRC.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_NETRC \- request that .netrc is used
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_NETRC, long level);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_NETRC_FILE.3 b/docs/libcurl/opts/GNURLOPT_NETRC_FILE.3
index 8cb29f534..e60b3c525 100644
--- a/docs/libcurl/opts/CURLOPT_NETRC_FILE.3
+++ b/docs/libcurl/opts/GNURLOPT_NETRC_FILE.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_NETRC_FILE \- file name to read .netrc info from
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_NETRC_FILE, char *file);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_NEW_DIRECTORY_PERMS.3 b/docs/libcurl/opts/GNURLOPT_NEW_DIRECTORY_PERMS.3
index e355dcd15..737d05a79 100644
--- a/docs/libcurl/opts/CURLOPT_NEW_DIRECTORY_PERMS.3
+++ b/docs/libcurl/opts/GNURLOPT_NEW_DIRECTORY_PERMS.3
@@ -25,7 +25,7 @@
 CURLOPT_NEW_DIRECTORY_PERMS \- permissions for remotely created directories
 .SH SYNOPSIS
 .nf
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_NEW_DIRECTORY_PERMS,
                           long mode);
diff --git a/docs/libcurl/opts/CURLOPT_NEW_FILE_PERMS.3 b/docs/libcurl/opts/GNURLOPT_NEW_FILE_PERMS.3
index d74c34e4f..5fa970db2 100644
--- a/docs/libcurl/opts/CURLOPT_NEW_FILE_PERMS.3
+++ b/docs/libcurl/opts/GNURLOPT_NEW_FILE_PERMS.3
@@ -25,7 +25,7 @@
 CURLOPT_NEW_FILE_PERMS \- permissions for remotely created files
 .SH SYNOPSIS
 .nf
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_NEW_FILE_PERMS,
                           long mode);
diff --git a/docs/libcurl/opts/CURLOPT_NOBODY.3 b/docs/libcurl/opts/GNURLOPT_NOBODY.3
index 02590b212..15992bd74 100644
--- a/docs/libcurl/opts/CURLOPT_NOBODY.3
+++ b/docs/libcurl/opts/GNURLOPT_NOBODY.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_NOBODY \- do the download request without getting the body
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_NOBODY, long opt);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_NOPROGRESS.3 b/docs/libcurl/opts/GNURLOPT_NOPROGRESS.3
index b8132d8f8..0d1a1c7c7 100644
--- a/docs/libcurl/opts/CURLOPT_NOPROGRESS.3
+++ b/docs/libcurl/opts/GNURLOPT_NOPROGRESS.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_NOPROGRESS \- switch off the progress meter
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_NOPROGRESS, long onoff);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_NOPROXY.3 b/docs/libcurl/opts/GNURLOPT_NOPROXY.3
index 0d3ce229c..6000d40ca 100644
--- a/docs/libcurl/opts/CURLOPT_NOPROXY.3
+++ b/docs/libcurl/opts/GNURLOPT_NOPROXY.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_NOPROXY \- disable proxy use for specific hosts
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_NOPROXY, char *noproxy);
 .SH DESCRIPTION
@@ -53,7 +53,7 @@ The application does not have to keep the string around after setting this
 option.
 .SH "Environment variables"
 If there's an environment variable called \fBno_proxy\fP (or \fBNO_PROXY\fP),
-it will be used if the \fICURLOPT_NOPROXY(3)\fP option is not set. It works
+it will be used if the \fIGNURLOPT_NOPROXY(3)\fP option is not set. It works
 exactly the same way.
 .SH DEFAULT
 NULL
@@ -78,4 +78,4 @@ Added in 7.19.4
 Returns CURLE_OK if the option is supported, CURLE_UNKNOWN_OPTION if not, or
 CURLE_OUT_OF_MEMORY if there was insufficient heap space.
 .SH "SEE ALSO"
-.BR CURLOPT_PROXY "(3), " CURLOPT_PROXYAUTH "(3), "
+.BR GNURLOPT_PROXY "(3), " GNURLOPT_PROXYAUTH "(3), "
diff --git a/docs/libcurl/opts/CURLOPT_NOSIGNAL.3 b/docs/libcurl/opts/GNURLOPT_NOSIGNAL.3
index dac0710f1..c122bf82b 100644
--- a/docs/libcurl/opts/CURLOPT_NOSIGNAL.3
+++ b/docs/libcurl/opts/GNURLOPT_NOSIGNAL.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_NOSIGNAL \- skip all signal handling
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_NOSIGNAL, long onoff);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_OPENSOCKETDATA.3 b/docs/libcurl/opts/GNURLOPT_OPENSOCKETDATA.3
index dadc3651c..dcdbf5861 100644
--- a/docs/libcurl/opts/CURLOPT_OPENSOCKETDATA.3
+++ b/docs/libcurl/opts/GNURLOPT_OPENSOCKETDATA.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_OPENSOCKETDATA \- custom pointer passed to open socket callback
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_OPENSOCKETDATA, void *pointer);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_OPENSOCKETFUNCTION.3 b/docs/libcurl/opts/GNURLOPT_OPENSOCKETFUNCTION.3
index 28a0e5752..b6dccf79d 100644
--- a/docs/libcurl/opts/CURLOPT_OPENSOCKETFUNCTION.3
+++ b/docs/libcurl/opts/GNURLOPT_OPENSOCKETFUNCTION.3
@@ -25,7 +25,7 @@
 CURLOPT_OPENSOCKETFUNCTION \- set callback for opening sockets
 .SH SYNOPSIS
 .nf
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 typedef enum  {
   CURLSOCKTYPE_IPCXN,  /* socket created for a specific IP connection */
diff --git a/docs/libcurl/opts/CURLOPT_PASSWORD.3 b/docs/libcurl/opts/GNURLOPT_PASSWORD.3
index 17789407a..90ff5c9dc 100644
--- a/docs/libcurl/opts/CURLOPT_PASSWORD.3
+++ b/docs/libcurl/opts/GNURLOPT_PASSWORD.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_PASSWORD \- password to use in authentication
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_PASSWORD, char *pwd);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_PATH_AS_IS.3 b/docs/libcurl/opts/GNURLOPT_PATH_AS_IS.3
index d9ef5f907..76019887c 100644
--- a/docs/libcurl/opts/CURLOPT_PATH_AS_IS.3
+++ b/docs/libcurl/opts/GNURLOPT_PATH_AS_IS.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_PATH_AS_IS \- do not handle dot dot sequences
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_PATH_AS_IS, long leaveit);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_PINNEDPUBLICKEY.3 b/docs/libcurl/opts/GNURLOPT_PINNEDPUBLICKEY.3
index 8f61f89a6..c3adff6fe 100644
--- a/docs/libcurl/opts/CURLOPT_PINNEDPUBLICKEY.3
+++ b/docs/libcurl/opts/GNURLOPT_PINNEDPUBLICKEY.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_PINNEDPUBLICKEY \- set pinned public key
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_PINNEDPUBLICKEY, char *pinnedpubkey);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_PIPEWAIT.3 b/docs/libcurl/opts/GNURLOPT_PIPEWAIT.3
index 6d0f14e79..454ad2ce1 100644
--- a/docs/libcurl/opts/CURLOPT_PIPEWAIT.3
+++ b/docs/libcurl/opts/GNURLOPT_PIPEWAIT.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_PIPEWAIT \- wait for pipelining/multiplexing
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_PIPEWAIT, long wait);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_PORT.3 b/docs/libcurl/opts/GNURLOPT_PORT.3
index 6c7b9dc82..c94badfb5 100644
--- a/docs/libcurl/opts/CURLOPT_PORT.3
+++ b/docs/libcurl/opts/GNURLOPT_PORT.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_PORT \- set remote port number to work with
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_PORT, long number);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_POST.3 b/docs/libcurl/opts/GNURLOPT_POST.3
index 66e5c6ac7..e9e1aa7fe 100644
--- a/docs/libcurl/opts/CURLOPT_POST.3
+++ b/docs/libcurl/opts/GNURLOPT_POST.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_POST \- request an HTTP POST
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_POST, long post);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_POSTFIELDS.3 b/docs/libcurl/opts/GNURLOPT_POSTFIELDS.3
index 857e1d987..29ab06dac 100644
--- a/docs/libcurl/opts/CURLOPT_POSTFIELDS.3
+++ b/docs/libcurl/opts/GNURLOPT_POSTFIELDS.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_POSTFIELDS \- specify data to POST to server
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_POSTFIELDS, char *postdata);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_POSTFIELDSIZE.3 b/docs/libcurl/opts/GNURLOPT_POSTFIELDSIZE.3
index 8db05c68b..da939e386 100644
--- a/docs/libcurl/opts/CURLOPT_POSTFIELDSIZE.3
+++ b/docs/libcurl/opts/GNURLOPT_POSTFIELDSIZE.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_POSTFIELDSIZE \- size of POST data pointed to
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_POSTFIELDSIZE, long size);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_POSTFIELDSIZE_LARGE.3 b/docs/libcurl/opts/GNURLOPT_POSTFIELDSIZE_LARGE.3
index 9d0c40178..4fdc126e4 100644
--- a/docs/libcurl/opts/CURLOPT_POSTFIELDSIZE_LARGE.3
+++ b/docs/libcurl/opts/GNURLOPT_POSTFIELDSIZE_LARGE.3
@@ -25,7 +25,7 @@
 CURLOPT_POSTFIELDSIZE_LARGE \- size of POST data pointed to
 .SH SYNOPSIS
 .nf
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_POSTFIELDSIZE_LARGE,
                           curl_off_t size);
diff --git a/docs/libcurl/opts/CURLOPT_POSTQUOTE.3 b/docs/libcurl/opts/GNURLOPT_POSTQUOTE.3
index 8af7ffdd0..26aaa5e65 100644
--- a/docs/libcurl/opts/CURLOPT_POSTQUOTE.3
+++ b/docs/libcurl/opts/GNURLOPT_POSTQUOTE.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_POSTQUOTE \- (S)FTP commands to run after the transfer
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_POSTQUOTE, struct curl_slist *cmds);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_POSTREDIR.3 b/docs/libcurl/opts/GNURLOPT_POSTREDIR.3
index 62b6b5392..fadc2288a 100644
--- a/docs/libcurl/opts/CURLOPT_POSTREDIR.3
+++ b/docs/libcurl/opts/GNURLOPT_POSTREDIR.3
@@ -25,7 +25,7 @@
 CURLOPT_POSTREDIR \- how to act on an HTTP POST redirect
 .SH SYNOPSIS
 .nf
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_POSTREDIR,
                           long bitmask);
diff --git a/docs/libcurl/opts/CURLOPT_PREQUOTE.3 b/docs/libcurl/opts/GNURLOPT_PREQUOTE.3
index 77da3908a..189488856 100644
--- a/docs/libcurl/opts/CURLOPT_PREQUOTE.3
+++ b/docs/libcurl/opts/GNURLOPT_PREQUOTE.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_PREQUOTE \- commands to run before an FTP transfer
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_PREQUOTE,
                           struct curl_slist *cmds);
diff --git a/docs/libcurl/opts/CURLOPT_PRE_PROXY.3 b/docs/libcurl/opts/GNURLOPT_PRE_PROXY.3
index de5b0f49c..e0550f977 100644
--- a/docs/libcurl/opts/CURLOPT_PRE_PROXY.3
+++ b/docs/libcurl/opts/GNURLOPT_PRE_PROXY.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_PRE_PROXY \- set pre-proxy to use
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_PRE_PROXY, char *preproxy);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_PRIVATE.3 b/docs/libcurl/opts/GNURLOPT_PRIVATE.3
index 49f29aa42..fd2c0f340 100644
--- a/docs/libcurl/opts/CURLOPT_PRIVATE.3
+++ b/docs/libcurl/opts/GNURLOPT_PRIVATE.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_PRIVATE \- store a private pointer
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_PRIVATE, void *pointer);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_PROGRESSDATA.3 b/docs/libcurl/opts/GNURLOPT_PROGRESSDATA.3
index 7dc70f128..a33837d7d 100644
--- a/docs/libcurl/opts/CURLOPT_PROGRESSDATA.3
+++ b/docs/libcurl/opts/GNURLOPT_PROGRESSDATA.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_PROGRESSDATA \- custom pointer passed to the progress callback
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_PROGRESSDATA, void *pointer);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_PROGRESSFUNCTION.3 b/docs/libcurl/opts/GNURLOPT_PROGRESSFUNCTION.3
index b077e3b6e..422df0948 100644
--- a/docs/libcurl/opts/CURLOPT_PROGRESSFUNCTION.3
+++ b/docs/libcurl/opts/GNURLOPT_PROGRESSFUNCTION.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_PROGRESSFUNCTION \- callback to progress meter function
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 int progress_callback(void *clientp,
                       double dltotal,
diff --git a/docs/libcurl/opts/CURLOPT_PROTOCOLS.3 b/docs/libcurl/opts/GNURLOPT_PROTOCOLS.3
index 4fecb81d0..743e1cd25 100644
--- a/docs/libcurl/opts/CURLOPT_PROTOCOLS.3
+++ b/docs/libcurl/opts/GNURLOPT_PROTOCOLS.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_PROTOCOLS \- set allowed protocols
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_PROTOCOLS, long bitmask);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_PROXY.3 b/docs/libcurl/opts/GNURLOPT_PROXY.3
index 97818e920..4dbede760 100644
--- a/docs/libcurl/opts/CURLOPT_PROXY.3
+++ b/docs/libcurl/opts/GNURLOPT_PROXY.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_PROXY \- set proxy to use
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_PROXY, char *proxy);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_PROXYAUTH.3 b/docs/libcurl/opts/GNURLOPT_PROXYAUTH.3
index fbf941430..9c0f1ac0d 100644
--- a/docs/libcurl/opts/CURLOPT_PROXYAUTH.3
+++ b/docs/libcurl/opts/GNURLOPT_PROXYAUTH.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_PROXYAUTH \- set HTTP proxy authentication methods to try
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_PROXYAUTH, long bitmask);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_PROXYHEADER.3 b/docs/libcurl/opts/GNURLOPT_PROXYHEADER.3
index 44ed85ece..43d88e362 100644
--- a/docs/libcurl/opts/CURLOPT_PROXYHEADER.3
+++ b/docs/libcurl/opts/GNURLOPT_PROXYHEADER.3
@@ -25,7 +25,7 @@
 CURLOPT_PROXYHEADER \- custom HTTP headers to pass to proxy
 .SH SYNOPSIS
 .nf
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_PROXYHEADER,
                           struct curl_slist *headers);
diff --git a/docs/libcurl/opts/CURLOPT_PROXYPASSWORD.3 b/docs/libcurl/opts/GNURLOPT_PROXYPASSWORD.3
index 75b2b7df3..409e1a964 100644
--- a/docs/libcurl/opts/CURLOPT_PROXYPASSWORD.3
+++ b/docs/libcurl/opts/GNURLOPT_PROXYPASSWORD.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_PROXYPASSWORD \- password to use with proxy authentication
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_PROXYPASSWORD, char *pwd);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_PROXYPORT.3 b/docs/libcurl/opts/GNURLOPT_PROXYPORT.3
index 30ed17f11..0b5da708f 100644
--- a/docs/libcurl/opts/CURLOPT_PROXYPORT.3
+++ b/docs/libcurl/opts/GNURLOPT_PROXYPORT.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_PROXYPORT \- port number the proxy listens on
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_PROXYPORT, long port);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_PROXYTYPE.3 b/docs/libcurl/opts/GNURLOPT_PROXYTYPE.3
index d7d97504e..3b114eb04 100644
--- a/docs/libcurl/opts/CURLOPT_PROXYTYPE.3
+++ b/docs/libcurl/opts/GNURLOPT_PROXYTYPE.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_PROXYTYPE \- proxy protocol type
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_PROXYTYPE, long type);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_PROXYUSERNAME.3 b/docs/libcurl/opts/GNURLOPT_PROXYUSERNAME.3
index 54981b124..f1e7df45e 100644
--- a/docs/libcurl/opts/CURLOPT_PROXYUSERNAME.3
+++ b/docs/libcurl/opts/GNURLOPT_PROXYUSERNAME.3
@@ -25,7 +25,7 @@
 CURLOPT_PROXYUSERNAME \- user name to use for proxy authentication
 .SH SYNOPSIS
 .nf
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_PROXYUSERNAME,
                           char *username);
diff --git a/docs/libcurl/opts/CURLOPT_PROXYUSERPWD.3 b/docs/libcurl/opts/GNURLOPT_PROXYUSERPWD.3
index cdf4e0885..87647335d 100644
--- a/docs/libcurl/opts/CURLOPT_PROXYUSERPWD.3
+++ b/docs/libcurl/opts/GNURLOPT_PROXYUSERPWD.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_PROXYUSERPWD \- user name and password to use for proxy authentication
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_PROXYUSERPWD, char *userpwd);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_PROXY_CAINFO.3 b/docs/libcurl/opts/GNURLOPT_PROXY_CAINFO.3
index 79c28a634..b8f6c28c0 100644
--- a/docs/libcurl/opts/CURLOPT_PROXY_CAINFO.3
+++ b/docs/libcurl/opts/GNURLOPT_PROXY_CAINFO.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_PROXY_CAINFO \- path to proxy Certificate Authority (CA) bundle
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_PROXY_CAINFO, char *path);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_PROXY_CAPATH.3 b/docs/libcurl/opts/GNURLOPT_PROXY_CAPATH.3
index 43bccd7bc..4391d02e3 100644
--- a/docs/libcurl/opts/CURLOPT_PROXY_CAPATH.3
+++ b/docs/libcurl/opts/GNURLOPT_PROXY_CAPATH.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_PROXY_CAPATH \- specify directory holding proxy CA certificates
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_PROXY_CAPATH, char *capath);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_PROXY_CRLFILE.3 b/docs/libcurl/opts/GNURLOPT_PROXY_CRLFILE.3
index 68f396fd2..0f2847e43 100644
--- a/docs/libcurl/opts/CURLOPT_PROXY_CRLFILE.3
+++ b/docs/libcurl/opts/GNURLOPT_PROXY_CRLFILE.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_PROXY_CRLFILE \- specify a proxy Certificate Revocation List file
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_PROXY_CRLFILE, char *file);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_PROXY_KEYPASSWD.3 b/docs/libcurl/opts/GNURLOPT_PROXY_KEYPASSWD.3
index 694c0fe2a..89316a28b 100644
--- a/docs/libcurl/opts/CURLOPT_PROXY_KEYPASSWD.3
+++ b/docs/libcurl/opts/GNURLOPT_PROXY_KEYPASSWD.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_PROXY_KEYPASSWD \- set passphrase to proxy private key
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_PROXY_KEYPASSWD, char *pwd);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_PROXY_PINNEDPUBLICKEY.3 b/docs/libcurl/opts/GNURLOPT_PROXY_PINNEDPUBLICKEY.3
index f6d56ebe9..14a011e87 100644
--- a/docs/libcurl/opts/CURLOPT_PROXY_PINNEDPUBLICKEY.3
+++ b/docs/libcurl/opts/GNURLOPT_PROXY_PINNEDPUBLICKEY.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_PROXY_PINNEDPUBLICKEY \- set pinned public key for https proxy
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_PROXY_PINNEDPUBLICKEY, char *pinnedpubkey);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_PROXY_SERVICE_NAME.3 b/docs/libcurl/opts/GNURLOPT_PROXY_SERVICE_NAME.3
index 4baa6a0ed..17c027721 100644
--- a/docs/libcurl/opts/CURLOPT_PROXY_SERVICE_NAME.3
+++ b/docs/libcurl/opts/GNURLOPT_PROXY_SERVICE_NAME.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_PROXY_SERVICE_NAME \- proxy authentication service name
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_PROXY_SERVICE_NAME, char *name);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_PROXY_SSLCERT.3 b/docs/libcurl/opts/GNURLOPT_PROXY_SSLCERT.3
index 019f62873..5fe61e347 100644
--- a/docs/libcurl/opts/CURLOPT_PROXY_SSLCERT.3
+++ b/docs/libcurl/opts/GNURLOPT_PROXY_SSLCERT.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_PROXY_SSLCERT \- set SSL proxy client certificate
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_PROXY_SSLCERT, char *cert);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_PROXY_SSLCERTTYPE.3 b/docs/libcurl/opts/GNURLOPT_PROXY_SSLCERTTYPE.3
index fff12f805..96a81b810 100644
--- a/docs/libcurl/opts/CURLOPT_PROXY_SSLCERTTYPE.3
+++ b/docs/libcurl/opts/GNURLOPT_PROXY_SSLCERTTYPE.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_PROXY_SSLCERTTYPE \- specify type of the proxy client SSL certificate
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_PROXY_SSLCERTTYPE, char *type);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_PROXY_SSLKEY.3 b/docs/libcurl/opts/GNURLOPT_PROXY_SSLKEY.3
index 8df1c1ee6..585ff00fc 100644
--- a/docs/libcurl/opts/CURLOPT_PROXY_SSLKEY.3
+++ b/docs/libcurl/opts/GNURLOPT_PROXY_SSLKEY.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_PROXY_SSLKEY \- specify private keyfile for TLS and SSL proxy client cert
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_PROXY_SSLKEY, char *keyfile);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_PROXY_SSLKEYTYPE.3 b/docs/libcurl/opts/GNURLOPT_PROXY_SSLKEYTYPE.3
index 055d620eb..d8106cba0 100644
--- a/docs/libcurl/opts/CURLOPT_PROXY_SSLKEYTYPE.3
+++ b/docs/libcurl/opts/GNURLOPT_PROXY_SSLKEYTYPE.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_PROXY_SSLKEYTYPE \- set type of the proxy private key file
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_PROXY_SSLKEYTYPE, char *type);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_PROXY_SSLVERSION.3 b/docs/libcurl/opts/GNURLOPT_PROXY_SSLVERSION.3
index 9dc69959c..be027ee16 100644
--- a/docs/libcurl/opts/CURLOPT_PROXY_SSLVERSION.3
+++ b/docs/libcurl/opts/GNURLOPT_PROXY_SSLVERSION.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_PROXY_SSLVERSION \- set preferred proxy TLS/SSL version
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_PROXY_SSLVERSION, long version);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_PROXY_SSL_CIPHER_LIST.3 b/docs/libcurl/opts/GNURLOPT_PROXY_SSL_CIPHER_LIST.3
index fc866d6bb..592bb22ea 100644
--- a/docs/libcurl/opts/CURLOPT_PROXY_SSL_CIPHER_LIST.3
+++ b/docs/libcurl/opts/GNURLOPT_PROXY_SSL_CIPHER_LIST.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_PROXY_SSL_CIPHER_LIST \- specify ciphers to use for proxy TLS
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_PROXY_SSL_CIPHER_LIST, char *list);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_PROXY_SSL_OPTIONS.3 b/docs/libcurl/opts/GNURLOPT_PROXY_SSL_OPTIONS.3
index 0d09a2ce7..01a0f032e 100644
--- a/docs/libcurl/opts/CURLOPT_PROXY_SSL_OPTIONS.3
+++ b/docs/libcurl/opts/GNURLOPT_PROXY_SSL_OPTIONS.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_PROXY_SSL_OPTIONS \- set proxy SSL behavior options
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_PROXY_SSL_OPTIONS, long bitmask);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_PROXY_SSL_VERIFYHOST.3 b/docs/libcurl/opts/GNURLOPT_PROXY_SSL_VERIFYHOST.3
index 85b0c6d96..00efb8e0d 100644
--- a/docs/libcurl/opts/CURLOPT_PROXY_SSL_VERIFYHOST.3
+++ b/docs/libcurl/opts/GNURLOPT_PROXY_SSL_VERIFYHOST.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_PROXY_SSL_VERIFYHOST \- verify the proxy certificate's name against host
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_PROXY_SSL_VERIFYHOST, long verify);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_PROXY_SSL_VERIFYPEER.3 b/docs/libcurl/opts/GNURLOPT_PROXY_SSL_VERIFYPEER.3
index 9473495cf..9f156d1f2 100644
--- a/docs/libcurl/opts/CURLOPT_PROXY_SSL_VERIFYPEER.3
+++ b/docs/libcurl/opts/GNURLOPT_PROXY_SSL_VERIFYPEER.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_PROXY_SSL_VERIFYPEER \- verify the proxy's SSL certificate
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_PROXY_SSL_VERIFYPEER, long verify);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_PROXY_TLS13_CIPHERS.3 b/docs/libcurl/opts/GNURLOPT_PROXY_TLS13_CIPHERS.3
index fe3a6b71c..490c663e5 100644
--- a/docs/libcurl/opts/CURLOPT_PROXY_TLS13_CIPHERS.3
+++ b/docs/libcurl/opts/GNURLOPT_PROXY_TLS13_CIPHERS.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_PROXY_TLS13_CIPHERS \- ciphers suites for proxy TLS 1.3
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_PROXY_TLS13_CIPHERS, char *list);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_PROXY_TLSAUTH_PASSWORD.3 b/docs/libcurl/opts/GNURLOPT_PROXY_TLSAUTH_PASSWORD.3
index db3a3d1bb..3bde5392b 100644
--- a/docs/libcurl/opts/CURLOPT_PROXY_TLSAUTH_PASSWORD.3
+++ b/docs/libcurl/opts/GNURLOPT_PROXY_TLSAUTH_PASSWORD.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_PROXY_TLSAUTH_PASSWORD \- password to use for proxy TLS authentication
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_PROXY_TLSAUTH_PASSWORD, char *pwd);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_PROXY_TLSAUTH_TYPE.3 b/docs/libcurl/opts/GNURLOPT_PROXY_TLSAUTH_TYPE.3
index 47f4dae4a..6130577d3 100644
--- a/docs/libcurl/opts/CURLOPT_PROXY_TLSAUTH_TYPE.3
+++ b/docs/libcurl/opts/GNURLOPT_PROXY_TLSAUTH_TYPE.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_PROXY_TLSAUTH_TYPE \- set proxy TLS authentication methods
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_PROXY_TLSAUTH_TYPE, char *type);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_PROXY_TLSAUTH_USERNAME.3 b/docs/libcurl/opts/GNURLOPT_PROXY_TLSAUTH_USERNAME.3
index 6a2c4388d..7623ba37a 100644
--- a/docs/libcurl/opts/CURLOPT_PROXY_TLSAUTH_USERNAME.3
+++ b/docs/libcurl/opts/GNURLOPT_PROXY_TLSAUTH_USERNAME.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_PROXY_TLSAUTH_USERNAME \- user name to use for proxy TLS authentication
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_PROXY_TLSAUTH_USERNAME, char *user);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_PROXY_TRANSFER_MODE.3 b/docs/libcurl/opts/GNURLOPT_PROXY_TRANSFER_MODE.3
index 9060364fe..587e7a3d6 100644
--- a/docs/libcurl/opts/CURLOPT_PROXY_TRANSFER_MODE.3
+++ b/docs/libcurl/opts/GNURLOPT_PROXY_TRANSFER_MODE.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_PROXY_TRANSFER_MODE \- append FTP transfer mode to URL for proxy
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_PROXY_TRANSFER_MODE, long enabled);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_PUT.3 b/docs/libcurl/opts/GNURLOPT_PUT.3
index 0753fad53..0c23e47c2 100644
--- a/docs/libcurl/opts/CURLOPT_PUT.3
+++ b/docs/libcurl/opts/GNURLOPT_PUT.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_PUT \- make an HTTP PUT request
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_PUT, long put);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_QUOTE.3 b/docs/libcurl/opts/GNURLOPT_QUOTE.3
index b547a1635..cfe062232 100644
--- a/docs/libcurl/opts/CURLOPT_QUOTE.3
+++ b/docs/libcurl/opts/GNURLOPT_QUOTE.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_QUOTE \- (S)FTP commands to run before transfer
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_QUOTE, struct curl_slist *cmds);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_RANDOM_FILE.3 b/docs/libcurl/opts/GNURLOPT_RANDOM_FILE.3
index 9f3e3876d..0d7a57ba8 100644
--- a/docs/libcurl/opts/CURLOPT_RANDOM_FILE.3
+++ b/docs/libcurl/opts/GNURLOPT_RANDOM_FILE.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_RANDOM_FILE \- specify a source for random data
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_RANDOM_FILE, char *path);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_RANGE.3 b/docs/libcurl/opts/GNURLOPT_RANGE.3
index e90696c01..af7a96594 100644
--- a/docs/libcurl/opts/CURLOPT_RANGE.3
+++ b/docs/libcurl/opts/GNURLOPT_RANGE.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_RANGE \- set byte range to request
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_RANGE, char *range);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_READDATA.3 b/docs/libcurl/opts/GNURLOPT_READDATA.3
index b1fff4c42..e2844da3b 100644
--- a/docs/libcurl/opts/CURLOPT_READDATA.3
+++ b/docs/libcurl/opts/GNURLOPT_READDATA.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_READDATA \- custom pointer passed to the read callback
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_READDATA, void *pointer);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_READFUNCTION.3 b/docs/libcurl/opts/GNURLOPT_READFUNCTION.3
index 0f2fb359d..8faf1465c 100644
--- a/docs/libcurl/opts/CURLOPT_READFUNCTION.3
+++ b/docs/libcurl/opts/GNURLOPT_READFUNCTION.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_READFUNCTION \- read callback for data uploads
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 size_t read_callback(char *buffer, size_t size, size_t nitems, void *userdata);
 
diff --git a/docs/libcurl/opts/CURLOPT_REDIR_PROTOCOLS.3 b/docs/libcurl/opts/GNURLOPT_REDIR_PROTOCOLS.3
index 3a5c3fcdc..1a2d099be 100644
--- a/docs/libcurl/opts/CURLOPT_REDIR_PROTOCOLS.3
+++ b/docs/libcurl/opts/GNURLOPT_REDIR_PROTOCOLS.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_REDIR_PROTOCOLS \- set protocols allowed to redirect to
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_REDIR_PROTOCOLS, long bitmask);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_REFERER.3 b/docs/libcurl/opts/GNURLOPT_REFERER.3
index 881f48c9e..d3dfbde38 100644
--- a/docs/libcurl/opts/CURLOPT_REFERER.3
+++ b/docs/libcurl/opts/GNURLOPT_REFERER.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_REFERER \- set the HTTP referer header
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_REFERER, char *where);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_REQUEST_TARGET.3 b/docs/libcurl/opts/GNURLOPT_REQUEST_TARGET.3
index eabefaa2d..88ae1397e 100644
--- a/docs/libcurl/opts/CURLOPT_REQUEST_TARGET.3
+++ b/docs/libcurl/opts/GNURLOPT_REQUEST_TARGET.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_REQUEST_TARGET \- specify an alternative target for this request
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_REQUEST_TARGET, string);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_RESOLVE.3 b/docs/libcurl/opts/GNURLOPT_RESOLVE.3
index d5f8ded64..fff2ea033 100644
--- a/docs/libcurl/opts/CURLOPT_RESOLVE.3
+++ b/docs/libcurl/opts/GNURLOPT_RESOLVE.3
@@ -25,7 +25,7 @@
 CURLOPT_RESOLVE \- provide custom host name to IP address resolves
 .SH SYNOPSIS
 .nf
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_RESOLVE,
                           struct curl_slist *hosts);
diff --git a/docs/libcurl/opts/CURLOPT_RESOLVER_START_DATA.3 b/docs/libcurl/opts/GNURLOPT_RESOLVER_START_DATA.3
index 4d8f8793e..a1612ca38 100644
--- a/docs/libcurl/opts/CURLOPT_RESOLVER_START_DATA.3
+++ b/docs/libcurl/opts/GNURLOPT_RESOLVER_START_DATA.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_RESOLVER_START_DATA \- custom pointer passed to the resolver start callback
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_RESOLVER_START_DATA, void *pointer);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_RESOLVER_START_FUNCTION.3 b/docs/libcurl/opts/GNURLOPT_RESOLVER_START_FUNCTION.3
index fd11910ce..4e3f111c2 100644
--- a/docs/libcurl/opts/CURLOPT_RESOLVER_START_FUNCTION.3
+++ b/docs/libcurl/opts/GNURLOPT_RESOLVER_START_FUNCTION.3
@@ -25,7 +25,7 @@
 CURLOPT_RESOLVER_START_FUNCTION \- set callback to be called before a new resolve request is started
 .SH SYNOPSIS
 .nf
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 int resolver_start_cb(void *resolver_state, void *reserved, void *userdata);
 
diff --git a/docs/libcurl/opts/CURLOPT_RESUME_FROM.3 b/docs/libcurl/opts/GNURLOPT_RESUME_FROM.3
index ac6986fd8..d97010d1a 100644
--- a/docs/libcurl/opts/CURLOPT_RESUME_FROM.3
+++ b/docs/libcurl/opts/GNURLOPT_RESUME_FROM.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_RESUME_FROM \- set a point to resume transfer from
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_RESUME_FROM, long from);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_RESUME_FROM_LARGE.3 b/docs/libcurl/opts/GNURLOPT_RESUME_FROM_LARGE.3
index 4905f3903..d99626e93 100644
--- a/docs/libcurl/opts/CURLOPT_RESUME_FROM_LARGE.3
+++ b/docs/libcurl/opts/GNURLOPT_RESUME_FROM_LARGE.3
@@ -25,7 +25,7 @@
 CURLOPT_RESUME_FROM_LARGE \- set a point to resume transfer from
 .SH SYNOPSIS
 .nf
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_RESUME_FROM_LARGE,
                           curl_off_t from);
diff --git a/docs/libcurl/opts/CURLOPT_RTSP_CLIENT_CSEQ.3 b/docs/libcurl/opts/GNURLOPT_RTSP_CLIENT_CSEQ.3
index 3f86a3a82..084c47282 100644
--- a/docs/libcurl/opts/CURLOPT_RTSP_CLIENT_CSEQ.3
+++ b/docs/libcurl/opts/GNURLOPT_RTSP_CLIENT_CSEQ.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_RTSP_CLIENT_CSEQ \- set the RTSP client CSEQ number
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_RTSP_CLIENT_CSEQ, long cseq);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_RTSP_REQUEST.3 b/docs/libcurl/opts/GNURLOPT_RTSP_REQUEST.3
index 07ac517df..a82b725f1 100644
--- a/docs/libcurl/opts/CURLOPT_RTSP_REQUEST.3
+++ b/docs/libcurl/opts/GNURLOPT_RTSP_REQUEST.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_RTSP_REQUEST \- specify RTSP request
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_RTSP_REQUEST, long request);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_RTSP_SERVER_CSEQ.3 b/docs/libcurl/opts/GNURLOPT_RTSP_SERVER_CSEQ.3
index 7bba1ecd5..f59938e88 100644
--- a/docs/libcurl/opts/CURLOPT_RTSP_SERVER_CSEQ.3
+++ b/docs/libcurl/opts/GNURLOPT_RTSP_SERVER_CSEQ.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_RTSP_SERVER_CSEQ \- set the RTSP server CSEQ number
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_RTSP_SERVER_CSEQ, long cseq);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_RTSP_SESSION_ID.3 b/docs/libcurl/opts/GNURLOPT_RTSP_SESSION_ID.3
index b3dcf8b41..f127e0c5b 100644
--- a/docs/libcurl/opts/CURLOPT_RTSP_SESSION_ID.3
+++ b/docs/libcurl/opts/GNURLOPT_RTSP_SESSION_ID.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_RTSP_SESSION_ID \- set RTSP session ID
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_RTSP_SESSION_ID, char *id);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_RTSP_STREAM_URI.3 b/docs/libcurl/opts/GNURLOPT_RTSP_STREAM_URI.3
index 3bdf4e414..f2ad42650 100644
--- a/docs/libcurl/opts/CURLOPT_RTSP_STREAM_URI.3
+++ b/docs/libcurl/opts/GNURLOPT_RTSP_STREAM_URI.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_RTSP_STREAM_URI \- set RTSP stream URI
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_RTSP_STREAM_URI, char *URI);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_RTSP_TRANSPORT.3 b/docs/libcurl/opts/GNURLOPT_RTSP_TRANSPORT.3
index 82de2ef4a..a7f7ed005 100644
--- a/docs/libcurl/opts/CURLOPT_RTSP_TRANSPORT.3
+++ b/docs/libcurl/opts/GNURLOPT_RTSP_TRANSPORT.3
@@ -25,7 +25,7 @@
 CURLOPT_RTSP_TRANSPORT \- set RTSP Transport: header
 .SH SYNOPSIS
 .nf
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_RTSP_TRANSPORT,
                           char *transport);
diff --git a/docs/libcurl/opts/CURLOPT_SASL_IR.3 b/docs/libcurl/opts/GNURLOPT_SASL_IR.3
index cc5da8c66..70a067cf0 100644
--- a/docs/libcurl/opts/CURLOPT_SASL_IR.3
+++ b/docs/libcurl/opts/GNURLOPT_SASL_IR.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_SASL_IR \- enable sending initial response in first packet
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_SASL_IR, long enable);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_SEEKDATA.3 b/docs/libcurl/opts/GNURLOPT_SEEKDATA.3
index 6ffa7d12a..b42049c9b 100644
--- a/docs/libcurl/opts/CURLOPT_SEEKDATA.3
+++ b/docs/libcurl/opts/GNURLOPT_SEEKDATA.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_SEEKDATA \- custom pointer passed to the seek callback
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_SEEKDATA, void *pointer);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_SEEKFUNCTION.3 b/docs/libcurl/opts/GNURLOPT_SEEKFUNCTION.3
index 205f59cb9..c5ad6988a 100644
--- a/docs/libcurl/opts/CURLOPT_SEEKFUNCTION.3
+++ b/docs/libcurl/opts/GNURLOPT_SEEKFUNCTION.3
@@ -25,7 +25,7 @@
 CURLOPT_SEEKFUNCTION \- user callback for seeking in input stream
 .SH SYNOPSIS
 .nf
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 /* These are the return codes for the seek callbacks */
 #define CURL_SEEKFUNC_OK       0
diff --git a/docs/libcurl/opts/CURLOPT_SERVICE_NAME.3 b/docs/libcurl/opts/GNURLOPT_SERVICE_NAME.3
index 303d0acb3..f0e19284a 100644
--- a/docs/libcurl/opts/CURLOPT_SERVICE_NAME.3
+++ b/docs/libcurl/opts/GNURLOPT_SERVICE_NAME.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_SERVICE_NAME \- authentication service name
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_SERVICE_NAME, char *name);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_SHARE.3 b/docs/libcurl/opts/GNURLOPT_SHARE.3
index d2a5d2dac..279f256b8 100644
--- a/docs/libcurl/opts/CURLOPT_SHARE.3
+++ b/docs/libcurl/opts/GNURLOPT_SHARE.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_SHARE \- specify share handle to use
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_SHARE, CURLSH *share);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_SOCKOPTDATA.3 b/docs/libcurl/opts/GNURLOPT_SOCKOPTDATA.3
index 54d9ea052..2b14a69c8 100644
--- a/docs/libcurl/opts/CURLOPT_SOCKOPTDATA.3
+++ b/docs/libcurl/opts/GNURLOPT_SOCKOPTDATA.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_SOCKOPTDATA \- custom pointer to pass to sockopt callback
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_SOCKOPTDATA, void *pointer);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_SOCKOPTFUNCTION.3 b/docs/libcurl/opts/GNURLOPT_SOCKOPTFUNCTION.3
index c04d8aa33..2f8a2c9ea 100644
--- a/docs/libcurl/opts/CURLOPT_SOCKOPTFUNCTION.3
+++ b/docs/libcurl/opts/GNURLOPT_SOCKOPTFUNCTION.3
@@ -25,7 +25,7 @@
 CURLOPT_SOCKOPTFUNCTION \- set callback for setting socket options
 .SH SYNOPSIS
 .nf
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 typedef enum  {
   CURLSOCKTYPE_IPCXN,  /* socket created for a specific IP connection */
diff --git a/docs/libcurl/opts/CURLOPT_SOCKS5_AUTH.3 b/docs/libcurl/opts/GNURLOPT_SOCKS5_AUTH.3
index 7b5e5822b..2b66830db 100644
--- a/docs/libcurl/opts/CURLOPT_SOCKS5_AUTH.3
+++ b/docs/libcurl/opts/GNURLOPT_SOCKS5_AUTH.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_SOCKS5_AUTH \- set allowed methods for SOCKS5 proxy authentication
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_SOCKS5_AUTH, long bitmask);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_SOCKS5_GSSAPI_NEC.3 b/docs/libcurl/opts/GNURLOPT_SOCKS5_GSSAPI_NEC.3
index 1ff5a1f23..bd59b28c9 100644
--- a/docs/libcurl/opts/CURLOPT_SOCKS5_GSSAPI_NEC.3
+++ b/docs/libcurl/opts/GNURLOPT_SOCKS5_GSSAPI_NEC.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_SOCKS5_GSSAPI_NEC \- set socks proxy gssapi negotiation protection
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_SOCKS5_GSSAPI_NEC, long nec);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_SOCKS5_GSSAPI_SERVICE.3 b/docs/libcurl/opts/GNURLOPT_SOCKS5_GSSAPI_SERVICE.3
index 1ac38a2de..30ac40d58 100644
--- a/docs/libcurl/opts/CURLOPT_SOCKS5_GSSAPI_SERVICE.3
+++ b/docs/libcurl/opts/GNURLOPT_SOCKS5_GSSAPI_SERVICE.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_SOCKS5_GSSAPI_SERVICE \- SOCKS5 proxy authentication service name
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_SOCKS5_GSSAPI_SERVICE, char *name);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_SSH_AUTH_TYPES.3 b/docs/libcurl/opts/GNURLOPT_SSH_AUTH_TYPES.3
index 5377531cc..2911e2899 100644
--- a/docs/libcurl/opts/CURLOPT_SSH_AUTH_TYPES.3
+++ b/docs/libcurl/opts/GNURLOPT_SSH_AUTH_TYPES.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_SSH_AUTH_TYPES \- set desired auth types for SFTP and SCP
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_SSH_AUTH_TYPES, long bitmask);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_SSH_COMPRESSION.3 b/docs/libcurl/opts/GNURLOPT_SSH_COMPRESSION.3
index 5c34a9813..e6c22e4a9 100644
--- a/docs/libcurl/opts/CURLOPT_SSH_COMPRESSION.3
+++ b/docs/libcurl/opts/GNURLOPT_SSH_COMPRESSION.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_SSH_COMPRESSION \- enables compression / decompression of SSH traffic
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_SSH_COMPRESSION, long enable);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_SSH_HOST_PUBLIC_KEY_MD5.3 b/docs/libcurl/opts/GNURLOPT_SSH_HOST_PUBLIC_KEY_MD5.3
index 5ea5a0fe1..e7f489ed3 100644
--- a/docs/libcurl/opts/CURLOPT_SSH_HOST_PUBLIC_KEY_MD5.3
+++ b/docs/libcurl/opts/GNURLOPT_SSH_HOST_PUBLIC_KEY_MD5.3
@@ -25,7 +25,7 @@
 CURLOPT_SSH_HOST_PUBLIC_KEY_MD5 \- checksum of SSH server public key
 .SH SYNOPSIS
 .nf
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_SSH_HOST_PUBLIC_KEY_MD5,
                           char *md5);
diff --git a/docs/libcurl/opts/CURLOPT_SSH_KEYDATA.3 b/docs/libcurl/opts/GNURLOPT_SSH_KEYDATA.3
index aace0ffd5..1967538a0 100644
--- a/docs/libcurl/opts/CURLOPT_SSH_KEYDATA.3
+++ b/docs/libcurl/opts/GNURLOPT_SSH_KEYDATA.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_SSH_KEYDATA \- pointer to pass to the SSH key callback
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_SSH_KEYDATA, void *pointer);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_SSH_KEYFUNCTION.3 b/docs/libcurl/opts/GNURLOPT_SSH_KEYFUNCTION.3
index dc025d6ee..8aecb149c 100644
--- a/docs/libcurl/opts/CURLOPT_SSH_KEYFUNCTION.3
+++ b/docs/libcurl/opts/GNURLOPT_SSH_KEYFUNCTION.3
@@ -25,7 +25,7 @@
 CURLOPT_SSH_KEYFUNCTION \- callback for known host matching logic
 .SH SYNOPSIS
 .nf
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 enum curl_khstat {
   CURLKHSTAT_FINE_ADD_TO_FILE,
diff --git a/docs/libcurl/opts/CURLOPT_SSH_KNOWNHOSTS.3 b/docs/libcurl/opts/GNURLOPT_SSH_KNOWNHOSTS.3
index 8da76a9f4..58dc47831 100644
--- a/docs/libcurl/opts/CURLOPT_SSH_KNOWNHOSTS.3
+++ b/docs/libcurl/opts/GNURLOPT_SSH_KNOWNHOSTS.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_SSH_KNOWNHOSTS \- file name holding the SSH known hosts
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_SSH_KNOWNHOSTS, char *fname);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_SSH_PRIVATE_KEYFILE.3 b/docs/libcurl/opts/GNURLOPT_SSH_PRIVATE_KEYFILE.3
index 9a7ddfc89..c2c0ff896 100644
--- a/docs/libcurl/opts/CURLOPT_SSH_PRIVATE_KEYFILE.3
+++ b/docs/libcurl/opts/GNURLOPT_SSH_PRIVATE_KEYFILE.3
@@ -25,7 +25,7 @@
 CURLOPT_SSH_PRIVATE_KEYFILE \- set private key file for SSH auth
 .SH SYNOPSIS
 .nf
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_SSH_PRIVATE_KEYFILE,
                           char *filename);
diff --git a/docs/libcurl/opts/CURLOPT_SSH_PUBLIC_KEYFILE.3 b/docs/libcurl/opts/GNURLOPT_SSH_PUBLIC_KEYFILE.3
index 518a19b38..a651d6ee8 100644
--- a/docs/libcurl/opts/CURLOPT_SSH_PUBLIC_KEYFILE.3
+++ b/docs/libcurl/opts/GNURLOPT_SSH_PUBLIC_KEYFILE.3
@@ -25,7 +25,7 @@
 CURLOPT_SSH_PUBLIC_KEYFILE \- set public key file for SSH auth
 .SH SYNOPSIS
 .nf
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_SSH_PUBLIC_KEYFILE,
                           char *filename);
diff --git a/docs/libcurl/opts/CURLOPT_SSLCERT.3 b/docs/libcurl/opts/GNURLOPT_SSLCERT.3
index 4321e473f..8f99bcad5 100644
--- a/docs/libcurl/opts/CURLOPT_SSLCERT.3
+++ b/docs/libcurl/opts/GNURLOPT_SSLCERT.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_SSLCERT \- set SSL client certificate
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_SSLCERT, char *cert);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_SSLCERTTYPE.3 b/docs/libcurl/opts/GNURLOPT_SSLCERTTYPE.3
index 294ceb56f..1ffc6c43e 100644
--- a/docs/libcurl/opts/CURLOPT_SSLCERTTYPE.3
+++ b/docs/libcurl/opts/GNURLOPT_SSLCERTTYPE.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_SSLCERTTYPE \- specify type of the client SSL certificate
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_SSLCERTTYPE, char *type);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_SSLENGINE.3 b/docs/libcurl/opts/GNURLOPT_SSLENGINE.3
index 179c56839..18de59da3 100644
--- a/docs/libcurl/opts/CURLOPT_SSLENGINE.3
+++ b/docs/libcurl/opts/GNURLOPT_SSLENGINE.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_SSLENGINE \- set SSL engine identifier
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_SSLENGINE, char *id);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_SSLENGINE_DEFAULT.3 b/docs/libcurl/opts/GNURLOPT_SSLENGINE_DEFAULT.3
index 15069d19e..b10a03a02 100644
--- a/docs/libcurl/opts/CURLOPT_SSLENGINE_DEFAULT.3
+++ b/docs/libcurl/opts/GNURLOPT_SSLENGINE_DEFAULT.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_SSLENGINE_DEFAULT \- make SSL engine default
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_SSLENGINE_DEFAULT, long val);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_SSLKEY.3 b/docs/libcurl/opts/GNURLOPT_SSLKEY.3
index e3216992d..786fbc5f9 100644
--- a/docs/libcurl/opts/CURLOPT_SSLKEY.3
+++ b/docs/libcurl/opts/GNURLOPT_SSLKEY.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_SSLKEY \- specify private keyfile for TLS and SSL client cert
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_SSLKEY, char *keyfile);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_SSLKEYTYPE.3 b/docs/libcurl/opts/GNURLOPT_SSLKEYTYPE.3
index 42368fbee..c5870e2a6 100644
--- a/docs/libcurl/opts/CURLOPT_SSLKEYTYPE.3
+++ b/docs/libcurl/opts/GNURLOPT_SSLKEYTYPE.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_SSLKEYTYPE \- set type of the private key file
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_SSLKEYTYPE, char *type);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_SSLVERSION.3 b/docs/libcurl/opts/GNURLOPT_SSLVERSION.3
index 42ef20abc..65d41249c 100644
--- a/docs/libcurl/opts/CURLOPT_SSLVERSION.3
+++ b/docs/libcurl/opts/GNURLOPT_SSLVERSION.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_SSLVERSION \- set preferred TLS/SSL version
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_SSLVERSION, long version);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_SSL_CIPHER_LIST.3 b/docs/libcurl/opts/GNURLOPT_SSL_CIPHER_LIST.3
index 8ddb5ad50..d26624adb 100644
--- a/docs/libcurl/opts/CURLOPT_SSL_CIPHER_LIST.3
+++ b/docs/libcurl/opts/GNURLOPT_SSL_CIPHER_LIST.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_SSL_CIPHER_LIST \- specify ciphers to use for TLS
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_SSL_CIPHER_LIST, char *list);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_SSL_CTX_DATA.3 b/docs/libcurl/opts/GNURLOPT_SSL_CTX_DATA.3
index 216bdec3a..7b6dec4b3 100644
--- a/docs/libcurl/opts/CURLOPT_SSL_CTX_DATA.3
+++ b/docs/libcurl/opts/GNURLOPT_SSL_CTX_DATA.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_SSL_CTX_DATA \- custom pointer passed to ssl_ctx callback
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_SSL_CTX_DATA, void *pointer);
 .SH DESCRIPTION
@@ -40,7 +40,7 @@ All TLS based protocols: HTTPS, FTPS, IMAPS, POP3S, SMTPS etc.
 /* OpenSSL specific */
 
 #include <openssl/ssl.h>
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 #include <stdio.h>
 
 static CURLcode sslctx_function(CURL *curl, void *sslctx, void *parm)
diff --git a/docs/libcurl/opts/CURLOPT_SSL_CTX_FUNCTION.3 b/docs/libcurl/opts/GNURLOPT_SSL_CTX_FUNCTION.3
index 04d8e297e..427375657 100644
--- a/docs/libcurl/opts/CURLOPT_SSL_CTX_FUNCTION.3
+++ b/docs/libcurl/opts/GNURLOPT_SSL_CTX_FUNCTION.3
@@ -25,7 +25,7 @@
 CURLOPT_SSL_CTX_FUNCTION \- SSL context callback for OpenSSL, wolfSSL/CyaSSL or mbedTLS
 .SH SYNOPSIS
 .nf
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode ssl_ctx_callback(CURL *curl, void *ssl_ctx, void *userptr);
 
diff --git a/docs/libcurl/opts/CURLOPT_SSL_ENABLE_ALPN.3 b/docs/libcurl/opts/GNURLOPT_SSL_ENABLE_ALPN.3
index bf23a72a9..95acceaf6 100644
--- a/docs/libcurl/opts/CURLOPT_SSL_ENABLE_ALPN.3
+++ b/docs/libcurl/opts/GNURLOPT_SSL_ENABLE_ALPN.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_SSL_ENABLE_ALPN \- enable ALPN
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_SSL_ENABLE_ALPN, long npn);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_SSL_ENABLE_NPN.3 b/docs/libcurl/opts/GNURLOPT_SSL_ENABLE_NPN.3
index 3e8240f30..3a7746095 100644
--- a/docs/libcurl/opts/CURLOPT_SSL_ENABLE_NPN.3
+++ b/docs/libcurl/opts/GNURLOPT_SSL_ENABLE_NPN.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_SSL_ENABLE_NPN \- enable NPN
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_SSL_ENABLE_NPN, long npn);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_SSL_FALSESTART.3 b/docs/libcurl/opts/GNURLOPT_SSL_FALSESTART.3
index 150e02f12..41f9b7ed6 100644
--- a/docs/libcurl/opts/CURLOPT_SSL_FALSESTART.3
+++ b/docs/libcurl/opts/GNURLOPT_SSL_FALSESTART.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_SSL_FALSESTART \- enable TLS false start
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_SSL_FALSESTART, long enable);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_SSL_OPTIONS.3 b/docs/libcurl/opts/GNURLOPT_SSL_OPTIONS.3
index cd65409c5..28af1c4ad 100644
--- a/docs/libcurl/opts/CURLOPT_SSL_OPTIONS.3
+++ b/docs/libcurl/opts/GNURLOPT_SSL_OPTIONS.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_SSL_OPTIONS \- set SSL behavior options
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_SSL_OPTIONS, long bitmask);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_SSL_SESSIONID_CACHE.3 b/docs/libcurl/opts/GNURLOPT_SSL_SESSIONID_CACHE.3
index a72928421..4bed85c8a 100644
--- a/docs/libcurl/opts/CURLOPT_SSL_SESSIONID_CACHE.3
+++ b/docs/libcurl/opts/GNURLOPT_SSL_SESSIONID_CACHE.3
@@ -25,7 +25,7 @@
 CURLOPT_SSL_SESSIONID_CACHE \- enable/disable use of the SSL session-ID cache
 .SH SYNOPSIS
 .nf
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_SSL_SESSIONID_CACHE,
                          long enabled);
diff --git a/docs/libcurl/opts/CURLOPT_SSL_VERIFYHOST.3 b/docs/libcurl/opts/GNURLOPT_SSL_VERIFYHOST.3
index acadd0774..72e743457 100644
--- a/docs/libcurl/opts/CURLOPT_SSL_VERIFYHOST.3
+++ b/docs/libcurl/opts/GNURLOPT_SSL_VERIFYHOST.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_SSL_VERIFYHOST \- verify the certificate's name against host
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_SSL_VERIFYHOST, long verify);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_SSL_VERIFYPEER.3 b/docs/libcurl/opts/GNURLOPT_SSL_VERIFYPEER.3
index 5f361c60a..65b8ea988 100644
--- a/docs/libcurl/opts/CURLOPT_SSL_VERIFYPEER.3
+++ b/docs/libcurl/opts/GNURLOPT_SSL_VERIFYPEER.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_SSL_VERIFYPEER \- verify the peer's SSL certificate
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_SSL_VERIFYPEER, long verify);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_SSL_VERIFYSTATUS.3 b/docs/libcurl/opts/GNURLOPT_SSL_VERIFYSTATUS.3
index 1b4326661..2910a0ff2 100644
--- a/docs/libcurl/opts/CURLOPT_SSL_VERIFYSTATUS.3
+++ b/docs/libcurl/opts/GNURLOPT_SSL_VERIFYSTATUS.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_SSL_VERIFYSTATUS \- verify the certificate's status
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_SSL_VERIFYSTATUS, long verify);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_STDERR.3 b/docs/libcurl/opts/GNURLOPT_STDERR.3
index 7dfe371fb..53f09a2d3 100644
--- a/docs/libcurl/opts/CURLOPT_STDERR.3
+++ b/docs/libcurl/opts/GNURLOPT_STDERR.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_STDERR \- redirect stderr to another stream
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_STDERR, FILE *stream);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_STREAM_DEPENDS.3 b/docs/libcurl/opts/GNURLOPT_STREAM_DEPENDS.3
index c09d9b1cc..ccf49a8d1 100644
--- a/docs/libcurl/opts/CURLOPT_STREAM_DEPENDS.3
+++ b/docs/libcurl/opts/GNURLOPT_STREAM_DEPENDS.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_STREAM_DEPENDS \- set stream this transfer depends on
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_STREAM_DEPENDS, CURL *dephandle);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_STREAM_DEPENDS_E.3 b/docs/libcurl/opts/GNURLOPT_STREAM_DEPENDS_E.3
index a0f59c43c..18e8cef04 100644
--- a/docs/libcurl/opts/CURLOPT_STREAM_DEPENDS_E.3
+++ b/docs/libcurl/opts/GNURLOPT_STREAM_DEPENDS_E.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_STREAM_DEPENDS_E \- set stream this transfer depends on exclusively
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_STREAM_DEPENDS_E, CURL *dephandle);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_STREAM_WEIGHT.3 b/docs/libcurl/opts/GNURLOPT_STREAM_WEIGHT.3
index bc6d9fbe4..325a68070 100644
--- a/docs/libcurl/opts/CURLOPT_STREAM_WEIGHT.3
+++ b/docs/libcurl/opts/GNURLOPT_STREAM_WEIGHT.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_STREAM_WEIGHT \- set numerical stream weight
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_STREAM_WEIGHT, long weight);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_SUPPRESS_CONNECT_HEADERS.3 b/docs/libcurl/opts/GNURLOPT_SUPPRESS_CONNECT_HEADERS.3
index 8cfec7a8f..22f83790f 100644
--- a/docs/libcurl/opts/CURLOPT_SUPPRESS_CONNECT_HEADERS.3
+++ b/docs/libcurl/opts/GNURLOPT_SUPPRESS_CONNECT_HEADERS.3
@@ -25,7 +25,7 @@
 CURLOPT_SUPPRESS_CONNECT_HEADERS \- Suppress proxy CONNECT response headers from user callbacks
 .SH SYNOPSIS
 .nf
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_SUPPRESS_CONNECT_HEADERS, long onoff);
 .fi
diff --git a/docs/libcurl/opts/CURLOPT_TCP_FASTOPEN.3 b/docs/libcurl/opts/GNURLOPT_TCP_FASTOPEN.3
index 5949e3e44..0c3817411 100644
--- a/docs/libcurl/opts/CURLOPT_TCP_FASTOPEN.3
+++ b/docs/libcurl/opts/GNURLOPT_TCP_FASTOPEN.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_TCP_FASTOPEN \- enable TCP Fast Open
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_TCP_FASTOPEN, long enable);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_TCP_KEEPALIVE.3 b/docs/libcurl/opts/GNURLOPT_TCP_KEEPALIVE.3
index cc3642feb..ee5f07ecd 100644
--- a/docs/libcurl/opts/CURLOPT_TCP_KEEPALIVE.3
+++ b/docs/libcurl/opts/GNURLOPT_TCP_KEEPALIVE.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_TCP_KEEPALIVE \- enable TCP keep-alive probing
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_TCP_KEEPALIVE, long probe);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_TCP_KEEPIDLE.3 b/docs/libcurl/opts/GNURLOPT_TCP_KEEPIDLE.3
index 4d587a9b4..6bd604761 100644
--- a/docs/libcurl/opts/CURLOPT_TCP_KEEPIDLE.3
+++ b/docs/libcurl/opts/GNURLOPT_TCP_KEEPIDLE.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_TCP_KEEPIDLE \- set TCP keep-alive idle time wait
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_TCP_KEEPIDLE, long delay);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_TCP_KEEPINTVL.3 b/docs/libcurl/opts/GNURLOPT_TCP_KEEPINTVL.3
index a755c0546..dd5944a85 100644
--- a/docs/libcurl/opts/CURLOPT_TCP_KEEPINTVL.3
+++ b/docs/libcurl/opts/GNURLOPT_TCP_KEEPINTVL.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_TCP_KEEPINTVL \- set TCP keep-alive interval
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_TCP_KEEPINTVL, long interval);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_TCP_NODELAY.3 b/docs/libcurl/opts/GNURLOPT_TCP_NODELAY.3
index bbfa6f3ee..ddc22f1b5 100644
--- a/docs/libcurl/opts/CURLOPT_TCP_NODELAY.3
+++ b/docs/libcurl/opts/GNURLOPT_TCP_NODELAY.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_TCP_NODELAY \- set the TCP_NODELAY option
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_TCP_NODELAY, long nodelay);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_TELNETOPTIONS.3 b/docs/libcurl/opts/GNURLOPT_TELNETOPTIONS.3
index b20dfaf6e..7abfe156e 100644
--- a/docs/libcurl/opts/CURLOPT_TELNETOPTIONS.3
+++ b/docs/libcurl/opts/GNURLOPT_TELNETOPTIONS.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_TELNETOPTIONS \- custom telnet options
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_TELNETOPTIONS,
                           struct curl_slist *cmds);
diff --git a/docs/libcurl/opts/CURLOPT_TFTP_BLKSIZE.3 b/docs/libcurl/opts/GNURLOPT_TFTP_BLKSIZE.3
index b4e9365cc..a15d88bce 100644
--- a/docs/libcurl/opts/CURLOPT_TFTP_BLKSIZE.3
+++ b/docs/libcurl/opts/GNURLOPT_TFTP_BLKSIZE.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_TFTP_BLKSIZE \- TFTP block size
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_TFTP_BLKSIZE, long blocksize);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_TFTP_NO_OPTIONS.3 b/docs/libcurl/opts/GNURLOPT_TFTP_NO_OPTIONS.3
index 97940fbb3..c54ae6f05 100644
--- a/docs/libcurl/opts/CURLOPT_TFTP_NO_OPTIONS.3
+++ b/docs/libcurl/opts/GNURLOPT_TFTP_NO_OPTIONS.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_TFTP_NO_OPTIONS \- Do not send TFTP options requests.
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_TFTP_NO_OPTIONS, long onoff);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_TIMECONDITION.3 b/docs/libcurl/opts/GNURLOPT_TIMECONDITION.3
index a8fcea7b1..f261f8a1c 100644
--- a/docs/libcurl/opts/CURLOPT_TIMECONDITION.3
+++ b/docs/libcurl/opts/GNURLOPT_TIMECONDITION.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_TIMECONDITION \- select condition for a time request
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_TIMECONDITION, long cond);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_TIMEOUT.3 b/docs/libcurl/opts/GNURLOPT_TIMEOUT.3
index dafe142d0..b645cde6d 100644
--- a/docs/libcurl/opts/CURLOPT_TIMEOUT.3
+++ b/docs/libcurl/opts/GNURLOPT_TIMEOUT.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_TIMEOUT \- set maximum time the request is allowed to take
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_TIMEOUT, long timeout);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_TIMEOUT_MS.3 b/docs/libcurl/opts/GNURLOPT_TIMEOUT_MS.3
index 00981b3bd..8536de841 100644
--- a/docs/libcurl/opts/CURLOPT_TIMEOUT_MS.3
+++ b/docs/libcurl/opts/GNURLOPT_TIMEOUT_MS.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_TIMEOUT_MS \- set maximum time the request is allowed to take
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_TIMEOUT_MS, long timeout);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_TIMEVALUE.3 b/docs/libcurl/opts/GNURLOPT_TIMEVALUE.3
index 66c582d07..3cd2f02b9 100644
--- a/docs/libcurl/opts/CURLOPT_TIMEVALUE.3
+++ b/docs/libcurl/opts/GNURLOPT_TIMEVALUE.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_TIMEVALUE \- set time value for conditional
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_TIMEVALUE, long val);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_TIMEVALUE_LARGE.3 b/docs/libcurl/opts/GNURLOPT_TIMEVALUE_LARGE.3
index 884b51236..b41ffb000 100644
--- a/docs/libcurl/opts/CURLOPT_TIMEVALUE_LARGE.3
+++ b/docs/libcurl/opts/GNURLOPT_TIMEVALUE_LARGE.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_TIMEVALUE_LARGE \- set time value for conditional
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_TIMEVALUE_LARGE, curl_off_t val);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_TLS13_CIPHERS.3 b/docs/libcurl/opts/GNURLOPT_TLS13_CIPHERS.3
index 4c452deca..5e44bee54 100644
--- a/docs/libcurl/opts/CURLOPT_TLS13_CIPHERS.3
+++ b/docs/libcurl/opts/GNURLOPT_TLS13_CIPHERS.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_TLS13_CIPHERS \- specify ciphers suites to use for TLS 1.3
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_TLS13_CIPHERS, char *list);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_TLSAUTH_PASSWORD.3 b/docs/libcurl/opts/GNURLOPT_TLSAUTH_PASSWORD.3
index ba2d9e488..633a63b87 100644
--- a/docs/libcurl/opts/CURLOPT_TLSAUTH_PASSWORD.3
+++ b/docs/libcurl/opts/GNURLOPT_TLSAUTH_PASSWORD.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_TLSAUTH_PASSWORD \- password to use for TLS authentication
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_TLSAUTH_PASSWORD, char *pwd);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_TLSAUTH_TYPE.3 b/docs/libcurl/opts/GNURLOPT_TLSAUTH_TYPE.3
index 6d1e131e7..df5fe682a 100644
--- a/docs/libcurl/opts/CURLOPT_TLSAUTH_TYPE.3
+++ b/docs/libcurl/opts/GNURLOPT_TLSAUTH_TYPE.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_TLSAUTH_TYPE \- set TLS authentication methods
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_TLSAUTH_TYPE, char *type);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_TLSAUTH_USERNAME.3 b/docs/libcurl/opts/GNURLOPT_TLSAUTH_USERNAME.3
index 56bb6377d..af6011acf 100644
--- a/docs/libcurl/opts/CURLOPT_TLSAUTH_USERNAME.3
+++ b/docs/libcurl/opts/GNURLOPT_TLSAUTH_USERNAME.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_TLSAUTH_USERNAME \- user name to use for TLS authentication
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_TLSAUTH_USERNAME, char *user);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_TRAILERDATA.3 b/docs/libcurl/opts/GNURLOPT_TRAILERDATA.3
index 8162340d4..8162340d4 100644
--- a/docs/libcurl/opts/CURLOPT_TRAILERDATA.3
+++ b/docs/libcurl/opts/GNURLOPT_TRAILERDATA.3
diff --git a/docs/libcurl/opts/CURLOPT_TRAILERFUNCTION.3 b/docs/libcurl/opts/GNURLOPT_TRAILERFUNCTION.3
index 54974078c..2aaffa28a 100644
--- a/docs/libcurl/opts/CURLOPT_TRAILERFUNCTION.3
+++ b/docs/libcurl/opts/GNURLOPT_TRAILERFUNCTION.3
@@ -61,7 +61,7 @@ NULL
 .SH PROTOCOLS:
 HTTP
 .SH EXAMPLE:
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 static int trailer_cb(struct curl_slist **tr, void *data)
 {
diff --git a/docs/libcurl/opts/CURLOPT_TRANSFERTEXT.3 b/docs/libcurl/opts/GNURLOPT_TRANSFERTEXT.3
index 55f7e4e6c..2d21cf482 100644
--- a/docs/libcurl/opts/CURLOPT_TRANSFERTEXT.3
+++ b/docs/libcurl/opts/GNURLOPT_TRANSFERTEXT.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_TRANSFERTEXT \- request a text based transfer for FTP
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_TRANSFERTEXT, long text);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_TRANSFER_ENCODING.3 b/docs/libcurl/opts/GNURLOPT_TRANSFER_ENCODING.3
index 9d5046e26..f8e45eb5e 100644
--- a/docs/libcurl/opts/CURLOPT_TRANSFER_ENCODING.3
+++ b/docs/libcurl/opts/GNURLOPT_TRANSFER_ENCODING.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_TRANSFER_ENCODING \- ask for HTTP Transfer Encoding
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_TRANSFER_ENCODING, long enable);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_UNIX_SOCKET_PATH.3 b/docs/libcurl/opts/GNURLOPT_UNIX_SOCKET_PATH.3
index b5ac58814..c79c5e2bc 100644
--- a/docs/libcurl/opts/CURLOPT_UNIX_SOCKET_PATH.3
+++ b/docs/libcurl/opts/GNURLOPT_UNIX_SOCKET_PATH.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_UNIX_SOCKET_PATH \- set Unix domain socket
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_UNIX_SOCKET_PATH, char *path);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_UNRESTRICTED_AUTH.3 b/docs/libcurl/opts/GNURLOPT_UNRESTRICTED_AUTH.3
index a0099b2ef..f1ade4873 100644
--- a/docs/libcurl/opts/CURLOPT_UNRESTRICTED_AUTH.3
+++ b/docs/libcurl/opts/GNURLOPT_UNRESTRICTED_AUTH.3
@@ -25,7 +25,7 @@
 CURLOPT_UNRESTRICTED_AUTH \- send credentials to other hosts too
 .SH SYNOPSIS
 .nf
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_UNRESTRICTED_AUTH,
                           long goahead);
diff --git a/docs/libcurl/opts/CURLOPT_UPKEEP_INTERVAL_MS.3 b/docs/libcurl/opts/GNURLOPT_UPKEEP_INTERVAL_MS.3
index 91eea1ba6..36aaa3df9 100644
--- a/docs/libcurl/opts/CURLOPT_UPKEEP_INTERVAL_MS.3
+++ b/docs/libcurl/opts/GNURLOPT_UPKEEP_INTERVAL_MS.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_UPKEEP_INTERVAL_MS \- connection upkeep interval
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_UPKEEP_INTERVAL_MS, long upkeep_interval_ms);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_UPLOAD.3 b/docs/libcurl/opts/GNURLOPT_UPLOAD.3
index 95088aa73..d50b8dfa7 100644
--- a/docs/libcurl/opts/CURLOPT_UPLOAD.3
+++ b/docs/libcurl/opts/GNURLOPT_UPLOAD.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_UPLOAD \- enable data upload
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_UPLOAD, long upload);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_UPLOAD_BUFFERSIZE.3 b/docs/libcurl/opts/GNURLOPT_UPLOAD_BUFFERSIZE.3
index c35888cbf..7c75403b5 100644
--- a/docs/libcurl/opts/CURLOPT_UPLOAD_BUFFERSIZE.3
+++ b/docs/libcurl/opts/GNURLOPT_UPLOAD_BUFFERSIZE.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_UPLOAD_BUFFERSIZE \- set preferred upload buffer size
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_UPLOAD_BUFFERSIZE, long size);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_URL.3 b/docs/libcurl/opts/GNURLOPT_URL.3
index 265c62b74..70fbe7f0c 100644
--- a/docs/libcurl/opts/CURLOPT_URL.3
+++ b/docs/libcurl/opts/GNURLOPT_URL.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_URL \- provide the URL to use in the request
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_URL, char *URL);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_USERAGENT.3 b/docs/libcurl/opts/GNURLOPT_USERAGENT.3
index bf58f2bc9..864b8e31f 100644
--- a/docs/libcurl/opts/CURLOPT_USERAGENT.3
+++ b/docs/libcurl/opts/GNURLOPT_USERAGENT.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_USERAGENT \- set HTTP user-agent header
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_USERAGENT, char *ua);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_USERNAME.3 b/docs/libcurl/opts/GNURLOPT_USERNAME.3
index 116b205da..cec9226ab 100644
--- a/docs/libcurl/opts/CURLOPT_USERNAME.3
+++ b/docs/libcurl/opts/GNURLOPT_USERNAME.3
@@ -25,7 +25,7 @@
 CURLOPT_USERNAME \- user name to use in authentication
 .SH SYNOPSIS
 .nf
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_USERNAME,
                           char *username);
diff --git a/docs/libcurl/opts/CURLOPT_USERPWD.3 b/docs/libcurl/opts/GNURLOPT_USERPWD.3
index 0dec56bfe..c303d39c3 100644
--- a/docs/libcurl/opts/CURLOPT_USERPWD.3
+++ b/docs/libcurl/opts/GNURLOPT_USERPWD.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_USERPWD \- user name and password to use in authentication
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_USERPWD, char *userpwd);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_USE_SSL.3 b/docs/libcurl/opts/GNURLOPT_USE_SSL.3
index 8fbf02369..af8e20906 100644
--- a/docs/libcurl/opts/CURLOPT_USE_SSL.3
+++ b/docs/libcurl/opts/GNURLOPT_USE_SSL.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_USE_SSL \- request using SSL / TLS for the transfer
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_USE_SSL, long level);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_VERBOSE.3 b/docs/libcurl/opts/GNURLOPT_VERBOSE.3
index e6a6fd191..9e6f1a17a 100644
--- a/docs/libcurl/opts/CURLOPT_VERBOSE.3
+++ b/docs/libcurl/opts/GNURLOPT_VERBOSE.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_VERBOSE \- set verbose mode on/off
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_VERBOSE, long onoff);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_WILDCARDMATCH.3 b/docs/libcurl/opts/GNURLOPT_WILDCARDMATCH.3
index da1fea9fb..8964602bf 100644
--- a/docs/libcurl/opts/CURLOPT_WILDCARDMATCH.3
+++ b/docs/libcurl/opts/GNURLOPT_WILDCARDMATCH.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_WILDCARDMATCH \- enable directory wildcard transfers
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_WILDCARDMATCH, long onoff);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_WRITEDATA.3 b/docs/libcurl/opts/GNURLOPT_WRITEDATA.3
index 221e0e3ed..d8b63b220 100644
--- a/docs/libcurl/opts/CURLOPT_WRITEDATA.3
+++ b/docs/libcurl/opts/GNURLOPT_WRITEDATA.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_WRITEDATA \- custom pointer passed to the write callback
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_WRITEDATA, void *pointer);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_WRITEFUNCTION.3 b/docs/libcurl/opts/GNURLOPT_WRITEFUNCTION.3
index 11edeb2e9..3a5162306 100644
--- a/docs/libcurl/opts/CURLOPT_WRITEFUNCTION.3
+++ b/docs/libcurl/opts/GNURLOPT_WRITEFUNCTION.3
@@ -25,7 +25,7 @@
 CURLOPT_WRITEFUNCTION \- set callback for writing received data
 .SH SYNOPSIS
 .nf
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 size_t write_callback(char *ptr, size_t size, size_t nmemb, void *userdata);
 
diff --git a/docs/libcurl/opts/CURLOPT_XFERINFODATA.3 b/docs/libcurl/opts/GNURLOPT_XFERINFODATA.3
index dbdbf3e77..c7281c781 100644
--- a/docs/libcurl/opts/CURLOPT_XFERINFODATA.3
+++ b/docs/libcurl/opts/GNURLOPT_XFERINFODATA.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_XFERINFODATA \- custom pointer passed to the progress callback
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_XFERINFODATA, void *pointer);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/CURLOPT_XFERINFOFUNCTION.3 b/docs/libcurl/opts/GNURLOPT_XFERINFOFUNCTION.3
index 9bd89db70..f7385773c 100644
--- a/docs/libcurl/opts/CURLOPT_XFERINFOFUNCTION.3
+++ b/docs/libcurl/opts/GNURLOPT_XFERINFOFUNCTION.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_XFERINFOFUNCTION \- callback to progress meter function
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 int progress_callback(void *clientp,
                       curl_off_t dltotal,
diff --git a/docs/libcurl/opts/CURLOPT_XOAUTH2_BEARER.3 b/docs/libcurl/opts/GNURLOPT_XOAUTH2_BEARER.3
index 8f86ae9ee..3f13e4e47 100644
--- a/docs/libcurl/opts/CURLOPT_XOAUTH2_BEARER.3
+++ b/docs/libcurl/opts/GNURLOPT_XOAUTH2_BEARER.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_XOAUTH2_BEARER \- specify OAuth 2.0 access token
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_XOAUTH2_BEARER, char *token);
 .SH DESCRIPTION
diff --git a/docs/libcurl/opts/Makefile.am b/docs/libcurl/opts/Makefile.am
index 3765ea7bf..f3cffc22a 100644
--- a/docs/libcurl/opts/Makefile.am
+++ b/docs/libcurl/opts/Makefile.am
@@ -52,7 +52,7 @@ pdf: $(PDFPAGES)
 	echo "converted $< to $@")
 
 mancheck:
-	@cd $(top_srcdir)/docs/libcurl/opts && ls `awk -F, '!/OBSOLETE/ && /^  CINIT/ { a=substr($$1, 9); print "CURLOPT_" a ".3"}' $(top_srcdir)/include/curl/curl.h`
+	@cd $(top_srcdir)/docs/libcurl/opts && ls `awk -F, '!/OBSOLETE/ && /^  CINIT/ { a=substr($$1, 9); print "CURLOPT_" a ".3"}' $(top_srcdir)/include/gnurl/curl.h`
 	rm -f in_temp
 	@(for a in $(man_MANS); do echo $$a >>in_temp; done)
 	sort in_temp > in_makefile
diff --git a/docs/libcurl/opts/Makefile.inc b/docs/libcurl/opts/Makefile.inc
index 07547503b..c6c2abdc4 100644
--- a/docs/libcurl/opts/Makefile.inc
+++ b/docs/libcurl/opts/Makefile.inc
@@ -1,349 +1,349 @@
 # Shared between Makefile.am and CMakeLists.txt
 
 man_MANS =                                      \
-  CURLINFO_ACTIVESOCKET.3                       \
-  CURLINFO_APPCONNECT_TIME.3                    \
-  CURLINFO_APPCONNECT_TIME_T.3                  \
-  CURLINFO_CERTINFO.3                           \
-  CURLINFO_CONDITION_UNMET.3                    \
-  CURLINFO_CONNECT_TIME.3                       \
-  CURLINFO_CONNECT_TIME_T.3                     \
-  CURLINFO_CONTENT_LENGTH_DOWNLOAD.3            \
-  CURLINFO_CONTENT_LENGTH_DOWNLOAD_T.3          \
-  CURLINFO_CONTENT_LENGTH_UPLOAD.3              \
-  CURLINFO_CONTENT_LENGTH_UPLOAD_T.3            \
-  CURLINFO_CONTENT_TYPE.3                       \
-  CURLINFO_COOKIELIST.3                         \
-  CURLINFO_EFFECTIVE_URL.3                      \
-  CURLINFO_FILETIME.3                           \
-  CURLINFO_FILETIME_T.3                         \
-  CURLINFO_FTP_ENTRY_PATH.3                     \
-  CURLINFO_HEADER_SIZE.3                        \
-  CURLINFO_HTTPAUTH_AVAIL.3                     \
-  CURLINFO_HTTP_CONNECTCODE.3                   \
-  CURLINFO_HTTP_VERSION.3                       \
-  CURLINFO_LASTSOCKET.3                         \
-  CURLINFO_LOCAL_IP.3                           \
-  CURLINFO_LOCAL_PORT.3                         \
-  CURLINFO_NAMELOOKUP_TIME.3                    \
-  CURLINFO_NAMELOOKUP_TIME_T.3                  \
-  CURLINFO_NUM_CONNECTS.3                       \
-  CURLINFO_OS_ERRNO.3                           \
-  CURLINFO_PRETRANSFER_TIME.3                   \
-  CURLINFO_PRETRANSFER_TIME_T.3                 \
-  CURLINFO_PRIMARY_IP.3                         \
-  CURLINFO_PRIMARY_PORT.3                       \
-  CURLINFO_PRIVATE.3                            \
-  CURLINFO_PROTOCOL.3                           \
-  CURLINFO_PROXYAUTH_AVAIL.3                    \
-  CURLINFO_PROXY_SSL_VERIFYRESULT.3             \
-  CURLINFO_REDIRECT_COUNT.3                     \
-  CURLINFO_REDIRECT_TIME.3                      \
-  CURLINFO_REDIRECT_TIME_T.3                    \
-  CURLINFO_REDIRECT_URL.3                       \
-  CURLINFO_REQUEST_SIZE.3                       \
-  CURLINFO_RESPONSE_CODE.3                      \
-  CURLINFO_RTSP_CLIENT_CSEQ.3                   \
-  CURLINFO_RTSP_CSEQ_RECV.3                     \
-  CURLINFO_RTSP_SERVER_CSEQ.3                   \
-  CURLINFO_RTSP_SESSION_ID.3                    \
-  CURLINFO_SCHEME.3                             \
-  CURLINFO_SIZE_DOWNLOAD.3                      \
-  CURLINFO_SIZE_DOWNLOAD_T.3                    \
-  CURLINFO_SIZE_UPLOAD.3                        \
-  CURLINFO_SIZE_UPLOAD_T.3                      \
-  CURLINFO_SPEED_DOWNLOAD.3                     \
-  CURLINFO_SPEED_DOWNLOAD_T.3                   \
-  CURLINFO_SPEED_UPLOAD.3                       \
-  CURLINFO_SPEED_UPLOAD_T.3                     \
-  CURLINFO_SSL_ENGINES.3                        \
-  CURLINFO_SSL_VERIFYRESULT.3                   \
-  CURLINFO_STARTTRANSFER_TIME.3                 \
-  CURLINFO_STARTTRANSFER_TIME_T.3               \
-  CURLINFO_TLS_SESSION.3                        \
-  CURLINFO_TLS_SSL_PTR.3                        \
-  CURLINFO_TOTAL_TIME.3                         \
-  CURLINFO_TOTAL_TIME_T.3                       \
-  CURLMOPT_CHUNK_LENGTH_PENALTY_SIZE.3          \
-  CURLMOPT_CONTENT_LENGTH_PENALTY_SIZE.3        \
-  CURLMOPT_MAXCONNECTS.3                        \
-  CURLMOPT_MAX_HOST_CONNECTIONS.3               \
-  CURLMOPT_MAX_PIPELINE_LENGTH.3                \
-  CURLMOPT_MAX_TOTAL_CONNECTIONS.3              \
-  CURLMOPT_PIPELINING.3                         \
-  CURLMOPT_PIPELINING_SERVER_BL.3               \
-  CURLMOPT_PIPELINING_SITE_BL.3                 \
-  CURLMOPT_PUSHDATA.3                           \
-  CURLMOPT_PUSHFUNCTION.3                       \
-  CURLMOPT_SOCKETDATA.3                         \
-  CURLMOPT_SOCKETFUNCTION.3                     \
-  CURLMOPT_TIMERDATA.3                          \
-  CURLMOPT_TIMERFUNCTION.3                      \
-  CURLOPT_ABSTRACT_UNIX_SOCKET.3                \
-  CURLOPT_ACCEPTTIMEOUT_MS.3                    \
-  CURLOPT_ACCEPT_ENCODING.3                     \
-  CURLOPT_ADDRESS_SCOPE.3                       \
-  CURLOPT_ALTSVC.3                              \
-  CURLOPT_ALTSVC_CTRL.3                         \
-  CURLOPT_APPEND.3                              \
-  CURLOPT_AUTOREFERER.3                         \
-  CURLOPT_BUFFERSIZE.3                          \
-  CURLOPT_CAINFO.3                              \
-  CURLOPT_CAPATH.3                              \
-  CURLOPT_CERTINFO.3                            \
-  CURLOPT_CHUNK_BGN_FUNCTION.3                  \
-  CURLOPT_CHUNK_DATA.3                          \
-  CURLOPT_CHUNK_END_FUNCTION.3                  \
-  CURLOPT_CLOSESOCKETDATA.3                     \
-  CURLOPT_CLOSESOCKETFUNCTION.3                 \
-  CURLOPT_UPKEEP_INTERVAL_MS.3             \
-  CURLOPT_CONNECTTIMEOUT.3                      \
-  CURLOPT_CONNECTTIMEOUT_MS.3                   \
-  CURLOPT_CONNECT_ONLY.3                        \
-  CURLOPT_CONNECT_TO.3                          \
-  CURLOPT_CONV_FROM_NETWORK_FUNCTION.3          \
-  CURLOPT_CONV_FROM_UTF8_FUNCTION.3             \
-  CURLOPT_CONV_TO_NETWORK_FUNCTION.3            \
-  CURLOPT_COOKIE.3                              \
-  CURLOPT_COOKIEFILE.3                          \
-  CURLOPT_COOKIEJAR.3                           \
-  CURLOPT_COOKIELIST.3                          \
-  CURLOPT_COOKIESESSION.3                       \
-  CURLOPT_COPYPOSTFIELDS.3                      \
-  CURLOPT_CRLF.3                                \
-  CURLOPT_CRLFILE.3                             \
-  CURLOPT_CUSTOMREQUEST.3                       \
-  CURLOPT_CURLU.3                               \
-  CURLOPT_DEBUGDATA.3                           \
-  CURLOPT_DEBUGFUNCTION.3                       \
-  CURLOPT_DEFAULT_PROTOCOL.3                    \
-  CURLOPT_DIRLISTONLY.3                         \
-  CURLOPT_DISALLOW_USERNAME_IN_URL.3            \
-  CURLOPT_DNS_CACHE_TIMEOUT.3                   \
-  CURLOPT_DNS_INTERFACE.3                       \
-  CURLOPT_DNS_LOCAL_IP4.3                       \
-  CURLOPT_DNS_LOCAL_IP6.3                       \
-  CURLOPT_DNS_SERVERS.3                         \
-  CURLOPT_DNS_SHUFFLE_ADDRESSES.3               \
-  CURLOPT_DNS_USE_GLOBAL_CACHE.3                \
-  CURLOPT_DOH_URL.3                             \
-  CURLOPT_EGDSOCKET.3                           \
-  CURLOPT_ERRORBUFFER.3                         \
-  CURLOPT_EXPECT_100_TIMEOUT_MS.3               \
-  CURLOPT_FAILONERROR.3                         \
-  CURLOPT_FILETIME.3                            \
-  CURLOPT_FNMATCH_DATA.3                        \
-  CURLOPT_FNMATCH_FUNCTION.3                    \
-  CURLOPT_FOLLOWLOCATION.3                      \
-  CURLOPT_FORBID_REUSE.3                        \
-  CURLOPT_FRESH_CONNECT.3                       \
-  CURLOPT_FTPPORT.3                             \
-  CURLOPT_FTPSSLAUTH.3                          \
-  CURLOPT_FTP_ACCOUNT.3                         \
-  CURLOPT_FTP_ALTERNATIVE_TO_USER.3             \
-  CURLOPT_FTP_CREATE_MISSING_DIRS.3             \
-  CURLOPT_FTP_FILEMETHOD.3                      \
-  CURLOPT_FTP_RESPONSE_TIMEOUT.3                \
-  CURLOPT_FTP_SKIP_PASV_IP.3                    \
-  CURLOPT_FTP_SSL_CCC.3                         \
-  CURLOPT_FTP_USE_EPRT.3                        \
-  CURLOPT_FTP_USE_EPSV.3                        \
-  CURLOPT_FTP_USE_PRET.3                        \
-  CURLOPT_GSSAPI_DELEGATION.3                   \
-  CURLOPT_HAPPY_EYEBALLS_TIMEOUT_MS.3           \
-  CURLOPT_HAPROXYPROTOCOL.3                     \
-  CURLOPT_HEADER.3                              \
-  CURLOPT_HEADERDATA.3                          \
-  CURLOPT_HEADERFUNCTION.3                      \
-  CURLOPT_HEADEROPT.3                           \
-  CURLOPT_HTTP09_ALLOWED.3                      \
-  CURLOPT_HTTP200ALIASES.3                      \
-  CURLOPT_HTTPAUTH.3                            \
-  CURLOPT_HTTPGET.3                             \
-  CURLOPT_HTTPHEADER.3                          \
-  CURLOPT_HTTPPOST.3                            \
-  CURLOPT_HTTPPROXYTUNNEL.3                     \
-  CURLOPT_HTTP_CONTENT_DECODING.3               \
-  CURLOPT_HTTP_TRANSFER_DECODING.3              \
-  CURLOPT_HTTP_VERSION.3                        \
-  CURLOPT_IGNORE_CONTENT_LENGTH.3               \
-  CURLOPT_TRAILERDATA.3                         \
-  CURLOPT_TRAILERFUNCTION.3                     \
-  CURLOPT_INFILESIZE.3                          \
-  CURLOPT_INFILESIZE_LARGE.3                    \
-  CURLOPT_INTERFACE.3                           \
-  CURLOPT_INTERLEAVEDATA.3                      \
-  CURLOPT_INTERLEAVEFUNCTION.3                  \
-  CURLOPT_IOCTLDATA.3                           \
-  CURLOPT_IOCTLFUNCTION.3                       \
-  CURLOPT_IPRESOLVE.3                           \
-  CURLOPT_ISSUERCERT.3                          \
-  CURLOPT_KEEP_SENDING_ON_ERROR.3               \
-  CURLOPT_KEYPASSWD.3                           \
-  CURLOPT_KRBLEVEL.3                            \
-  CURLOPT_LOCALPORT.3                           \
-  CURLOPT_LOCALPORTRANGE.3                      \
-  CURLOPT_LOGIN_OPTIONS.3                       \
-  CURLOPT_LOW_SPEED_LIMIT.3                     \
-  CURLOPT_LOW_SPEED_TIME.3                      \
-  CURLOPT_MAIL_AUTH.3                           \
-  CURLOPT_MAIL_FROM.3                           \
-  CURLOPT_MAIL_RCPT.3                           \
-  CURLOPT_MAXCONNECTS.3                         \
-  CURLOPT_MAXFILESIZE.3                         \
-  CURLOPT_MAXFILESIZE_LARGE.3                   \
-  CURLOPT_MAXREDIRS.3                           \
-  CURLOPT_MAX_RECV_SPEED_LARGE.3                \
-  CURLOPT_MAX_SEND_SPEED_LARGE.3                \
-  CURLOPT_MIMEPOST.3                            \
-  CURLOPT_NETRC.3                               \
-  CURLOPT_NETRC_FILE.3                          \
-  CURLOPT_NEW_DIRECTORY_PERMS.3                 \
-  CURLOPT_NEW_FILE_PERMS.3                      \
-  CURLOPT_NOBODY.3                              \
-  CURLOPT_NOPROGRESS.3                          \
-  CURLOPT_NOPROXY.3                             \
-  CURLOPT_NOSIGNAL.3                            \
-  CURLOPT_OPENSOCKETDATA.3                      \
-  CURLOPT_OPENSOCKETFUNCTION.3                  \
-  CURLOPT_PASSWORD.3                            \
-  CURLOPT_PATH_AS_IS.3                          \
-  CURLOPT_PINNEDPUBLICKEY.3                     \
-  CURLOPT_PIPEWAIT.3                            \
-  CURLOPT_PORT.3                                \
-  CURLOPT_POST.3                                \
-  CURLOPT_POSTFIELDS.3                          \
-  CURLOPT_POSTFIELDSIZE.3                       \
-  CURLOPT_POSTFIELDSIZE_LARGE.3                 \
-  CURLOPT_POSTQUOTE.3                           \
-  CURLOPT_POSTREDIR.3                           \
-  CURLOPT_PREQUOTE.3                            \
-  CURLOPT_PRE_PROXY.3                           \
-  CURLOPT_PRIVATE.3                             \
-  CURLOPT_PROGRESSDATA.3                        \
-  CURLOPT_PROGRESSFUNCTION.3                    \
-  CURLOPT_PROTOCOLS.3                           \
-  CURLOPT_PROXY.3                               \
-  CURLOPT_PROXYAUTH.3                           \
-  CURLOPT_PROXYHEADER.3                         \
-  CURLOPT_PROXYPASSWORD.3                       \
-  CURLOPT_PROXYPORT.3                           \
-  CURLOPT_PROXYTYPE.3                           \
-  CURLOPT_PROXYUSERNAME.3                       \
-  CURLOPT_PROXYUSERPWD.3                        \
-  CURLOPT_PROXY_CAINFO.3                        \
-  CURLOPT_PROXY_CAPATH.3                        \
-  CURLOPT_PROXY_CRLFILE.3                       \
-  CURLOPT_PROXY_KEYPASSWD.3                     \
-  CURLOPT_PROXY_PINNEDPUBLICKEY.3               \
-  CURLOPT_PROXY_SERVICE_NAME.3                  \
-  CURLOPT_PROXY_SSLCERT.3                       \
-  CURLOPT_PROXY_SSLCERTTYPE.3                   \
-  CURLOPT_PROXY_SSLKEY.3                        \
-  CURLOPT_PROXY_SSLKEYTYPE.3                    \
-  CURLOPT_PROXY_SSLVERSION.3                    \
-  CURLOPT_PROXY_SSL_CIPHER_LIST.3               \
-  CURLOPT_PROXY_SSL_OPTIONS.3                   \
-  CURLOPT_PROXY_SSL_VERIFYHOST.3                \
-  CURLOPT_PROXY_SSL_VERIFYPEER.3                \
-  CURLOPT_PROXY_TLS13_CIPHERS.3                 \
-  CURLOPT_PROXY_TLSAUTH_PASSWORD.3              \
-  CURLOPT_PROXY_TLSAUTH_TYPE.3                  \
-  CURLOPT_PROXY_TLSAUTH_USERNAME.3              \
-  CURLOPT_PROXY_TRANSFER_MODE.3                 \
-  CURLOPT_PUT.3                                 \
-  CURLOPT_QUOTE.3                               \
-  CURLOPT_RANDOM_FILE.3                         \
-  CURLOPT_RANGE.3                               \
-  CURLOPT_READDATA.3                            \
-  CURLOPT_READFUNCTION.3                        \
-  CURLOPT_REDIR_PROTOCOLS.3                     \
-  CURLOPT_REFERER.3                             \
-  CURLOPT_REQUEST_TARGET.3                      \
-  CURLOPT_RESOLVE.3                             \
-  CURLOPT_RESOLVER_START_DATA.3                 \
-  CURLOPT_RESOLVER_START_FUNCTION.3             \
-  CURLOPT_RESUME_FROM.3                         \
-  CURLOPT_RESUME_FROM_LARGE.3                   \
-  CURLOPT_RTSP_CLIENT_CSEQ.3                    \
-  CURLOPT_RTSP_REQUEST.3                        \
-  CURLOPT_RTSP_SERVER_CSEQ.3                    \
-  CURLOPT_RTSP_SESSION_ID.3                     \
-  CURLOPT_RTSP_STREAM_URI.3                     \
-  CURLOPT_RTSP_TRANSPORT.3                      \
-  CURLOPT_SASL_IR.3                             \
-  CURLOPT_SEEKDATA.3                            \
-  CURLOPT_SEEKFUNCTION.3                        \
-  CURLOPT_SERVICE_NAME.3                        \
-  CURLOPT_SHARE.3                               \
-  CURLOPT_SOCKOPTDATA.3                         \
-  CURLOPT_SOCKOPTFUNCTION.3                     \
-  CURLOPT_SOCKS5_AUTH.3                         \
-  CURLOPT_SOCKS5_GSSAPI_NEC.3                   \
-  CURLOPT_SOCKS5_GSSAPI_SERVICE.3               \
-  CURLOPT_SSH_AUTH_TYPES.3                      \
-  CURLOPT_SSH_COMPRESSION.3                     \
-  CURLOPT_SSH_HOST_PUBLIC_KEY_MD5.3             \
-  CURLOPT_SSH_KEYDATA.3                         \
-  CURLOPT_SSH_KEYFUNCTION.3                     \
-  CURLOPT_SSH_KNOWNHOSTS.3                      \
-  CURLOPT_SSH_PRIVATE_KEYFILE.3                 \
-  CURLOPT_SSH_PUBLIC_KEYFILE.3                  \
-  CURLOPT_SSLCERT.3                             \
-  CURLOPT_SSLCERTTYPE.3                         \
-  CURLOPT_SSLENGINE.3                           \
-  CURLOPT_SSLENGINE_DEFAULT.3                   \
-  CURLOPT_SSLKEY.3                              \
-  CURLOPT_SSLKEYTYPE.3                          \
-  CURLOPT_SSLVERSION.3                          \
-  CURLOPT_SSL_CIPHER_LIST.3                     \
-  CURLOPT_SSL_CTX_DATA.3                        \
-  CURLOPT_SSL_CTX_FUNCTION.3                    \
-  CURLOPT_SSL_ENABLE_ALPN.3                     \
-  CURLOPT_SSL_ENABLE_NPN.3                      \
-  CURLOPT_SSL_FALSESTART.3                      \
-  CURLOPT_SSL_OPTIONS.3                         \
-  CURLOPT_SSL_SESSIONID_CACHE.3                 \
-  CURLOPT_SSL_VERIFYHOST.3                      \
-  CURLOPT_SSL_VERIFYPEER.3                      \
-  CURLOPT_SSL_VERIFYSTATUS.3                    \
-  CURLOPT_STDERR.3                              \
-  CURLOPT_STREAM_DEPENDS.3                      \
-  CURLOPT_STREAM_DEPENDS_E.3                    \
-  CURLOPT_STREAM_WEIGHT.3                       \
-  CURLOPT_SUPPRESS_CONNECT_HEADERS.3            \
-  CURLOPT_TCP_FASTOPEN.3                        \
-  CURLOPT_TCP_KEEPALIVE.3                       \
-  CURLOPT_TCP_KEEPIDLE.3                        \
-  CURLOPT_TCP_KEEPINTVL.3                       \
-  CURLOPT_TCP_NODELAY.3                         \
-  CURLOPT_TELNETOPTIONS.3                       \
-  CURLOPT_TFTP_BLKSIZE.3                        \
-  CURLOPT_TFTP_NO_OPTIONS.3                     \
-  CURLOPT_TIMECONDITION.3                       \
-  CURLOPT_TIMEOUT.3                             \
-  CURLOPT_TIMEOUT_MS.3                          \
-  CURLOPT_TIMEVALUE.3                           \
-  CURLOPT_TIMEVALUE_LARGE.3                     \
-  CURLOPT_TLS13_CIPHERS.3                       \
-  CURLOPT_TLSAUTH_PASSWORD.3                    \
-  CURLOPT_TLSAUTH_TYPE.3                        \
-  CURLOPT_TLSAUTH_USERNAME.3                    \
-  CURLOPT_TRANSFERTEXT.3                        \
-  CURLOPT_TRANSFER_ENCODING.3                   \
-  CURLOPT_UNIX_SOCKET_PATH.3                    \
-  CURLOPT_UNRESTRICTED_AUTH.3                   \
-  CURLOPT_UPLOAD.3                              \
-  CURLOPT_UPLOAD_BUFFERSIZE.3                   \
-  CURLOPT_URL.3                                 \
-  CURLOPT_USERAGENT.3                           \
-  CURLOPT_USERNAME.3                            \
-  CURLOPT_USERPWD.3                             \
-  CURLOPT_USE_SSL.3                             \
-  CURLOPT_VERBOSE.3                             \
-  CURLOPT_WILDCARDMATCH.3                       \
-  CURLOPT_WRITEDATA.3                           \
-  CURLOPT_WRITEFUNCTION.3                       \
-  CURLOPT_XFERINFODATA.3                        \
-  CURLOPT_XFERINFOFUNCTION.3                    \
-  CURLOPT_XOAUTH2_BEARER.3
+  GNURLINFO_ACTIVESOCKET.3                       \
+  GNURLINFO_APPCONNECT_TIME.3                    \
+  GNURLINFO_APPCONNECT_TIME_T.3                  \
+  GNURLINFO_CERTINFO.3                           \
+  GNURLINFO_CONDITION_UNMET.3                    \
+  GNURLINFO_CONNECT_TIME.3                       \
+  GNURLINFO_CONNECT_TIME_T.3                     \
+  GNURLINFO_CONTENT_LENGTH_DOWNLOAD.3            \
+  GNURLINFO_CONTENT_LENGTH_DOWNLOAD_T.3          \
+  GNURLINFO_CONTENT_LENGTH_UPLOAD.3              \
+  GNURLINFO_CONTENT_LENGTH_UPLOAD_T.3            \
+  GNURLINFO_CONTENT_TYPE.3                       \
+  GNURLINFO_COOKIELIST.3                         \
+  GNURLINFO_EFFECTIVE_URL.3                      \
+  GNURLINFO_FILETIME.3                           \
+  GNURLINFO_FILETIME_T.3                         \
+  GNURLINFO_FTP_ENTRY_PATH.3                     \
+  GNURLINFO_HEADER_SIZE.3                        \
+  GNURLINFO_HTTPAUTH_AVAIL.3                     \
+  GNURLINFO_HTTP_CONNECTCODE.3                   \
+  GNURLINFO_HTTP_VERSION.3                       \
+  GNURLINFO_LASTSOCKET.3                         \
+  GNURLINFO_LOCAL_IP.3                           \
+  GNURLINFO_LOCAL_PORT.3                         \
+  GNURLINFO_NAMELOOKUP_TIME.3                    \
+  GNURLINFO_NAMELOOKUP_TIME_T.3                  \
+  GNURLINFO_NUM_CONNECTS.3                       \
+  GNURLINFO_OS_ERRNO.3                           \
+  GNURLINFO_PRETRANSFER_TIME.3                   \
+  GNURLINFO_PRETRANSFER_TIME_T.3                 \
+  GNURLINFO_PRIMARY_IP.3                         \
+  GNURLINFO_PRIMARY_PORT.3                       \
+  GNURLINFO_PRIVATE.3                            \
+  GNURLINFO_PROTOCOL.3                           \
+  GNURLINFO_PROXYAUTH_AVAIL.3                    \
+  GNURLINFO_PROXY_SSL_VERIFYRESULT.3             \
+  GNURLINFO_REDIRECT_COUNT.3                     \
+  GNURLINFO_REDIRECT_TIME.3                      \
+  GNURLINFO_REDIRECT_TIME_T.3                    \
+  GNURLINFO_REDIRECT_URL.3                       \
+  GNURLINFO_REQUEST_SIZE.3                       \
+  GNURLINFO_RESPONSE_CODE.3                      \
+  GNURLINFO_RTSP_CLIENT_CSEQ.3                   \
+  GNURLINFO_RTSP_CSEQ_RECV.3                     \
+  GNURLINFO_RTSP_SERVER_CSEQ.3                   \
+  GNURLINFO_RTSP_SESSION_ID.3                    \
+  GNURLINFO_SCHEME.3                             \
+  GNURLINFO_SIZE_DOWNLOAD.3                      \
+  GNURLINFO_SIZE_DOWNLOAD_T.3                    \
+  GNURLINFO_SIZE_UPLOAD.3                        \
+  GNURLINFO_SIZE_UPLOAD_T.3                      \
+  GNURLINFO_SPEED_DOWNLOAD.3                     \
+  GNURLINFO_SPEED_DOWNLOAD_T.3                   \
+  GNURLINFO_SPEED_UPLOAD.3                       \
+  GNURLINFO_SPEED_UPLOAD_T.3                     \
+  GNURLINFO_SSL_ENGINES.3                        \
+  GNURLINFO_SSL_VERIFYRESULT.3                   \
+  GNURLINFO_STARTTRANSFER_TIME.3                 \
+  GNURLINFO_STARTTRANSFER_TIME_T.3               \
+  GNURLINFO_TLS_SESSION.3                        \
+  GNURLINFO_TLS_SSL_PTR.3                        \
+  GNURLINFO_TOTAL_TIME.3                         \
+  GNURLINFO_TOTAL_TIME_T.3                       \
+  GNURLMOPT_CHUNK_LENGTH_PENALTY_SIZE.3          \
+  GNURLMOPT_CONTENT_LENGTH_PENALTY_SIZE.3        \
+  GNURLMOPT_MAXCONNECTS.3                        \
+  GNURLMOPT_MAX_HOST_CONNECTIONS.3               \
+  GNURLMOPT_MAX_PIPELINE_LENGTH.3                \
+  GNURLMOPT_MAX_TOTAL_CONNECTIONS.3              \
+  GNURLMOPT_PIPELINING.3                         \
+  GNURLMOPT_PIPELINING_SERVER_BL.3               \
+  GNURLMOPT_PIPELINING_SITE_BL.3                 \
+  GNURLMOPT_PUSHDATA.3                           \
+  GNURLMOPT_PUSHFUNCTION.3                       \
+  GNURLMOPT_SOCKETDATA.3                         \
+  GNURLMOPT_SOCKETFUNCTION.3                     \
+  GNURLMOPT_TIMERDATA.3                          \
+  GNURLMOPT_TIMERFUNCTION.3                      \
+  GNURLOPT_ABSTRACT_UNIX_SOCKET.3                \
+  GNURLOPT_ACCEPTTIMEOUT_MS.3                    \
+  GNURLOPT_ACCEPT_ENCODING.3                     \
+  GNURLOPT_ADDRESS_SCOPE.3                       \
+  GNURLOPT_ALTSVC.3                              \
+  GNURLOPT_ALTSVC_CTRL.3                         \
+  GNURLOPT_APPEND.3                              \
+  GNURLOPT_AUTOREFERER.3                         \
+  GNURLOPT_BUFFERSIZE.3                          \
+  GNURLOPT_CAINFO.3                              \
+  GNURLOPT_CAPATH.3                              \
+  GNURLOPT_CERTINFO.3                            \
+  GNURLOPT_CHUNK_BGN_FUNCTION.3                  \
+  GNURLOPT_CHUNK_DATA.3                          \
+  GNURLOPT_CHUNK_END_FUNCTION.3                  \
+  GNURLOPT_CLOSESOCKETDATA.3                     \
+  GNURLOPT_CLOSESOCKETFUNCTION.3                 \
+  GNURLOPT_UPKEEP_INTERVAL_MS.3             \
+  GNURLOPT_CONNECTTIMEOUT.3                      \
+  GNURLOPT_CONNECTTIMEOUT_MS.3                   \
+  GNURLOPT_CONNECT_ONLY.3                        \
+  GNURLOPT_CONNECT_TO.3                          \
+  GNURLOPT_CONV_FROM_NETWORK_FUNCTION.3          \
+  GNURLOPT_CONV_FROM_UTF8_FUNCTION.3             \
+  GNURLOPT_CONV_TO_NETWORK_FUNCTION.3            \
+  GNURLOPT_COOKIE.3                              \
+  GNURLOPT_COOKIEFILE.3                          \
+  GNURLOPT_COOKIEJAR.3                           \
+  GNURLOPT_COOKIELIST.3                          \
+  GNURLOPT_COOKIESESSION.3                       \
+  GNURLOPT_COPYPOSTFIELDS.3                      \
+  GNURLOPT_CRLF.3                                \
+  GNURLOPT_CRLFILE.3                             \
+  GNURLOPT_CUSTOMREQUEST.3                       \
+  GNURLOPT_CURLU.3                               \
+  GNURLOPT_DEBUGDATA.3                           \
+  GNURLOPT_DEBUGFUNCTION.3                       \
+  GNURLOPT_DEFAULT_PROTOCOL.3                    \
+  GNURLOPT_DIRLISTONLY.3                         \
+  GNURLOPT_DISALLOW_USERNAME_IN_URL.3            \
+  GNURLOPT_DNS_CACHE_TIMEOUT.3                   \
+  GNURLOPT_DNS_INTERFACE.3                       \
+  GNURLOPT_DNS_LOCAL_IP4.3                       \
+  GNURLOPT_DNS_LOCAL_IP6.3                       \
+  GNURLOPT_DNS_SERVERS.3                         \
+  GNURLOPT_DNS_SHUFFLE_ADDRESSES.3               \
+  GNURLOPT_DNS_USE_GLOBAL_CACHE.3                \
+  GNURLOPT_DOH_URL.3                             \
+  GNURLOPT_EGDSOCKET.3                           \
+  GNURLOPT_ERRORBUFFER.3                         \
+  GNURLOPT_EXPECT_100_TIMEOUT_MS.3               \
+  GNURLOPT_FAILONERROR.3                         \
+  GNURLOPT_FILETIME.3                            \
+  GNURLOPT_FNMATCH_DATA.3                        \
+  GNURLOPT_FNMATCH_FUNCTION.3                    \
+  GNURLOPT_FOLLOWLOCATION.3                      \
+  GNURLOPT_FORBID_REUSE.3                        \
+  GNURLOPT_FRESH_CONNECT.3                       \
+  GNURLOPT_FTPPORT.3                             \
+  GNURLOPT_FTPSSLAUTH.3                          \
+  GNURLOPT_FTP_ACCOUNT.3                         \
+  GNURLOPT_FTP_ALTERNATIVE_TO_USER.3             \
+  GNURLOPT_FTP_CREATE_MISSING_DIRS.3             \
+  GNURLOPT_FTP_FILEMETHOD.3                      \
+  GNURLOPT_FTP_RESPONSE_TIMEOUT.3                \
+  GNURLOPT_FTP_SKIP_PASV_IP.3                    \
+  GNURLOPT_FTP_SSL_CCC.3                         \
+  GNURLOPT_FTP_USE_EPRT.3                        \
+  GNURLOPT_FTP_USE_EPSV.3                        \
+  GNURLOPT_FTP_USE_PRET.3                        \
+  GNURLOPT_GSSAPI_DELEGATION.3                   \
+  GNURLOPT_HAPPY_EYEBALLS_TIMEOUT_MS.3           \
+  GNURLOPT_HAPROXYPROTOCOL.3                     \
+  GNURLOPT_HEADER.3                              \
+  GNURLOPT_HEADERDATA.3                          \
+  GNURLOPT_HEADERFUNCTION.3                      \
+  GNURLOPT_HEADEROPT.3                           \
+  GNURLOPT_HTTP09_ALLOWED.3                      \
+  GNURLOPT_HTTP200ALIASES.3                      \
+  GNURLOPT_HTTPAUTH.3                            \
+  GNURLOPT_HTTPGET.3                             \
+  GNURLOPT_HTTPHEADER.3                          \
+  GNURLOPT_HTTPPOST.3                            \
+  GNURLOPT_HTTPPROXYTUNNEL.3                     \
+  GNURLOPT_HTTP_CONTENT_DECODING.3               \
+  GNURLOPT_HTTP_TRANSFER_DECODING.3              \
+  GNURLOPT_HTTP_VERSION.3                        \
+  GNURLOPT_IGNORE_CONTENT_LENGTH.3               \
+  GNURLOPT_TRAILERDATA.3                         \
+  GNURLOPT_TRAILERFUNCTION.3                     \
+  GNURLOPT_INFILESIZE.3                          \
+  GNURLOPT_INFILESIZE_LARGE.3                    \
+  GNURLOPT_INTERFACE.3                           \
+  GNURLOPT_INTERLEAVEDATA.3                      \
+  GNURLOPT_INTERLEAVEFUNCTION.3                  \
+  GNURLOPT_IOCTLDATA.3                           \
+  GNURLOPT_IOCTLFUNCTION.3                       \
+  GNURLOPT_IPRESOLVE.3                           \
+  GNURLOPT_ISSUERCERT.3                          \
+  GNURLOPT_KEEP_SENDING_ON_ERROR.3               \
+  GNURLOPT_KEYPASSWD.3                           \
+  GNURLOPT_KRBLEVEL.3                            \
+  GNURLOPT_LOCALPORT.3                           \
+  GNURLOPT_LOCALPORTRANGE.3                      \
+  GNURLOPT_LOGIN_OPTIONS.3                       \
+  GNURLOPT_LOW_SPEED_LIMIT.3                     \
+  GNURLOPT_LOW_SPEED_TIME.3                      \
+  GNURLOPT_MAIL_AUTH.3                           \
+  GNURLOPT_MAIL_FROM.3                           \
+  GNURLOPT_MAIL_RCPT.3                           \
+  GNURLOPT_MAXCONNECTS.3                         \
+  GNURLOPT_MAXFILESIZE.3                         \
+  GNURLOPT_MAXFILESIZE_LARGE.3                   \
+  GNURLOPT_MAXREDIRS.3                           \
+  GNURLOPT_MAX_RECV_SPEED_LARGE.3                \
+  GNURLOPT_MAX_SEND_SPEED_LARGE.3                \
+  GNURLOPT_MIMEPOST.3                            \
+  GNURLOPT_NETRC.3                               \
+  GNURLOPT_NETRC_FILE.3                          \
+  GNURLOPT_NEW_DIRECTORY_PERMS.3                 \
+  GNURLOPT_NEW_FILE_PERMS.3                      \
+  GNURLOPT_NOBODY.3                              \
+  GNURLOPT_NOPROGRESS.3                          \
+  GNURLOPT_NOPROXY.3                             \
+  GNURLOPT_NOSIGNAL.3                            \
+  GNURLOPT_OPENSOCKETDATA.3                      \
+  GNURLOPT_OPENSOCKETFUNCTION.3                  \
+  GNURLOPT_PASSWORD.3                            \
+  GNURLOPT_PATH_AS_IS.3                          \
+  GNURLOPT_PINNEDPUBLICKEY.3                     \
+  GNURLOPT_PIPEWAIT.3                            \
+  GNURLOPT_PORT.3                                \
+  GNURLOPT_POST.3                                \
+  GNURLOPT_POSTFIELDS.3                          \
+  GNURLOPT_POSTFIELDSIZE.3                       \
+  GNURLOPT_POSTFIELDSIZE_LARGE.3                 \
+  GNURLOPT_POSTQUOTE.3                           \
+  GNURLOPT_POSTREDIR.3                           \
+  GNURLOPT_PREQUOTE.3                            \
+  GNURLOPT_PRE_PROXY.3                           \
+  GNURLOPT_PRIVATE.3                             \
+  GNURLOPT_PROGRESSDATA.3                        \
+  GNURLOPT_PROGRESSFUNCTION.3                    \
+  GNURLOPT_PROTOCOLS.3                           \
+  GNURLOPT_PROXY.3                               \
+  GNURLOPT_PROXYAUTH.3                           \
+  GNURLOPT_PROXYHEADER.3                         \
+  GNURLOPT_PROXYPASSWORD.3                       \
+  GNURLOPT_PROXYPORT.3                           \
+  GNURLOPT_PROXYTYPE.3                           \
+  GNURLOPT_PROXYUSERNAME.3                       \
+  GNURLOPT_PROXYUSERPWD.3                        \
+  GNURLOPT_PROXY_CAINFO.3                        \
+  GNURLOPT_PROXY_CAPATH.3                        \
+  GNURLOPT_PROXY_CRLFILE.3                       \
+  GNURLOPT_PROXY_KEYPASSWD.3                     \
+  GNURLOPT_PROXY_PINNEDPUBLICKEY.3               \
+  GNURLOPT_PROXY_SERVICE_NAME.3                  \
+  GNURLOPT_PROXY_SSLCERT.3                       \
+  GNURLOPT_PROXY_SSLCERTTYPE.3                   \
+  GNURLOPT_PROXY_SSLKEY.3                        \
+  GNURLOPT_PROXY_SSLKEYTYPE.3                    \
+  GNURLOPT_PROXY_SSLVERSION.3                    \
+  GNURLOPT_PROXY_SSL_CIPHER_LIST.3               \
+  GNURLOPT_PROXY_SSL_OPTIONS.3                   \
+  GNURLOPT_PROXY_SSL_VERIFYHOST.3                \
+  GNURLOPT_PROXY_SSL_VERIFYPEER.3                \
+  GNURLOPT_PROXY_TLS13_CIPHERS.3                 \
+  GNURLOPT_PROXY_TLSAUTH_PASSWORD.3              \
+  GNURLOPT_PROXY_TLSAUTH_TYPE.3                  \
+  GNURLOPT_PROXY_TLSAUTH_USERNAME.3              \
+  GNURLOPT_PROXY_TRANSFER_MODE.3                 \
+  GNURLOPT_PUT.3                                 \
+  GNURLOPT_QUOTE.3                               \
+  GNURLOPT_RANDOM_FILE.3                         \
+  GNURLOPT_RANGE.3                               \
+  GNURLOPT_READDATA.3                            \
+  GNURLOPT_READFUNCTION.3                        \
+  GNURLOPT_REDIR_PROTOCOLS.3                     \
+  GNURLOPT_REFERER.3                             \
+  GNURLOPT_REQUEST_TARGET.3                      \
+  GNURLOPT_RESOLVE.3                             \
+  GNURLOPT_RESOLVER_START_DATA.3                 \
+  GNURLOPT_RESOLVER_START_FUNCTION.3             \
+  GNURLOPT_RESUME_FROM.3                         \
+  GNURLOPT_RESUME_FROM_LARGE.3                   \
+  GNURLOPT_RTSP_CLIENT_CSEQ.3                    \
+  GNURLOPT_RTSP_REQUEST.3                        \
+  GNURLOPT_RTSP_SERVER_CSEQ.3                    \
+  GNURLOPT_RTSP_SESSION_ID.3                     \
+  GNURLOPT_RTSP_STREAM_URI.3                     \
+  GNURLOPT_RTSP_TRANSPORT.3                      \
+  GNURLOPT_SASL_IR.3                             \
+  GNURLOPT_SEEKDATA.3                            \
+  GNURLOPT_SEEKFUNCTION.3                        \
+  GNURLOPT_SERVICE_NAME.3                        \
+  GNURLOPT_SHARE.3                               \
+  GNURLOPT_SOCKOPTDATA.3                         \
+  GNURLOPT_SOCKOPTFUNCTION.3                     \
+  GNURLOPT_SOCKS5_AUTH.3                         \
+  GNURLOPT_SOCKS5_GSSAPI_NEC.3                   \
+  GNURLOPT_SOCKS5_GSSAPI_SERVICE.3               \
+  GNURLOPT_SSH_AUTH_TYPES.3                      \
+  GNURLOPT_SSH_COMPRESSION.3                     \
+  GNURLOPT_SSH_HOST_PUBLIC_KEY_MD5.3             \
+  GNURLOPT_SSH_KEYDATA.3                         \
+  GNURLOPT_SSH_KEYFUNCTION.3                     \
+  GNURLOPT_SSH_KNOWNHOSTS.3                      \
+  GNURLOPT_SSH_PRIVATE_KEYFILE.3                 \
+  GNURLOPT_SSH_PUBLIC_KEYFILE.3                  \
+  GNURLOPT_SSLCERT.3                             \
+  GNURLOPT_SSLCERTTYPE.3                         \
+  GNURLOPT_SSLENGINE.3                           \
+  GNURLOPT_SSLENGINE_DEFAULT.3                   \
+  GNURLOPT_SSLKEY.3                              \
+  GNURLOPT_SSLKEYTYPE.3                          \
+  GNURLOPT_SSLVERSION.3                          \
+  GNURLOPT_SSL_CIPHER_LIST.3                     \
+  GNURLOPT_SSL_CTX_DATA.3                        \
+  GNURLOPT_SSL_CTX_FUNCTION.3                    \
+  GNURLOPT_SSL_ENABLE_ALPN.3                     \
+  GNURLOPT_SSL_ENABLE_NPN.3                      \
+  GNURLOPT_SSL_FALSESTART.3                      \
+  GNURLOPT_SSL_OPTIONS.3                         \
+  GNURLOPT_SSL_SESSIONID_CACHE.3                 \
+  GNURLOPT_SSL_VERIFYHOST.3                      \
+  GNURLOPT_SSL_VERIFYPEER.3                      \
+  GNURLOPT_SSL_VERIFYSTATUS.3                    \
+  GNURLOPT_STDERR.3                              \
+  GNURLOPT_STREAM_DEPENDS.3                      \
+  GNURLOPT_STREAM_DEPENDS_E.3                    \
+  GNURLOPT_STREAM_WEIGHT.3                       \
+  GNURLOPT_SUPPRESS_CONNECT_HEADERS.3            \
+  GNURLOPT_TCP_FASTOPEN.3                        \
+  GNURLOPT_TCP_KEEPALIVE.3                       \
+  GNURLOPT_TCP_KEEPIDLE.3                        \
+  GNURLOPT_TCP_KEEPINTVL.3                       \
+  GNURLOPT_TCP_NODELAY.3                         \
+  GNURLOPT_TELNETOPTIONS.3                       \
+  GNURLOPT_TFTP_BLKSIZE.3                        \
+  GNURLOPT_TFTP_NO_OPTIONS.3                     \
+  GNURLOPT_TIMECONDITION.3                       \
+  GNURLOPT_TIMEOUT.3                             \
+  GNURLOPT_TIMEOUT_MS.3                          \
+  GNURLOPT_TIMEVALUE.3                           \
+  GNURLOPT_TIMEVALUE_LARGE.3                     \
+  GNURLOPT_TLS13_CIPHERS.3                       \
+  GNURLOPT_TLSAUTH_PASSWORD.3                    \
+  GNURLOPT_TLSAUTH_TYPE.3                        \
+  GNURLOPT_TLSAUTH_USERNAME.3                    \
+  GNURLOPT_TRANSFERTEXT.3                        \
+  GNURLOPT_TRANSFER_ENCODING.3                   \
+  GNURLOPT_UNIX_SOCKET_PATH.3                    \
+  GNURLOPT_UNRESTRICTED_AUTH.3                   \
+  GNURLOPT_UPLOAD.3                              \
+  GNURLOPT_UPLOAD_BUFFERSIZE.3                   \
+  GNURLOPT_URL.3                                 \
+  GNURLOPT_USERAGENT.3                           \
+  GNURLOPT_USERNAME.3                            \
+  GNURLOPT_USERPWD.3                             \
+  GNURLOPT_USE_SSL.3                             \
+  GNURLOPT_VERBOSE.3                             \
+  GNURLOPT_WILDCARDMATCH.3                       \
+  GNURLOPT_WRITEDATA.3                           \
+  GNURLOPT_WRITEFUNCTION.3                       \
+  GNURLOPT_XFERINFODATA.3                        \
+  GNURLOPT_XFERINFOFUNCTION.3                    \
+  GNURLOPT_XOAUTH2_BEARER.3
diff --git a/docs/libcurl/opts/template.3 b/docs/libcurl/opts/template.3
index 7ba220e8f..2e76f35e2 100644
--- a/docs/libcurl/opts/template.3
+++ b/docs/libcurl/opts/template.3
@@ -24,7 +24,7 @@
 .SH NAME
 CURLOPT_TEMPLATE \- [short desc]
 .SH SYNOPSIS
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_TEMPLATE, [argument]);
 .SH DESCRIPTION
diff --git a/docs/libcurl/symbols.pl b/docs/libcurl/symbols.pl
index d61bd048f..b8add8ca1 100755
--- a/docs/libcurl/symbols.pl
+++ b/docs/libcurl/symbols.pl
@@ -53,7 +53,7 @@ sub str2num {
 
 print <<EOS
 
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 #define LIBCURL_HAS(x) \\
   (defined(x ## _FIRST) && (x ## _FIRST <= LIBCURL_VERSION_NUM) && \\
diff --git a/docs/mk-ca-bundle.1 b/docs/mk-ca-bundle.1
index f754e74c7..470f407e8 100644
--- a/docs/mk-ca-bundle.1
+++ b/docs/mk-ca-bundle.1
@@ -20,100 +20,134 @@
 .\" *
 .\" **************************************************************************
 .\"
-.TH mk-ca-bundle 1 "24 Oct 2016" "version 1.27" "mk-ca-bundle manual"
-.SH NAME
-mk-ca-bundle \- convert mozilla's certdata.txt to PEM format
-.SH SYNOPSIS
-mk-ca-bundle [options]
-.I [outputfile]
-.SH DESCRIPTION
+.Dd $Mdocdate: October 24 2016$
+.Dt MK-CA-BUNDLE 1
+.Os
+.Sh NAME
+.Nm mk-ca-bundle
+.Nd convert mozilla's certdata.txt to PEM format
+.Sh SYNOPSIS
+.Nm mk-ca-bundle
+.Op Fl fiklmnqt
+.Op Fl d Ar name
+.Op Fl p Ar purposes:levels
+.Op Fl s Ar algorithms
+.Op Ar outputfile
+.Sh DESCRIPTION
 The mk-ca-bundle tool downloads the certdata.txt file from Mozilla's source
 tree over HTTPS, then parses certdata.txt and extracts certificates into PEM
-format. By default, only CA root certificates trusted to issue SSL server
-authentication certificates are extracted. These are then processed with the
-OpenSSL commandline tool to produce the final ca-bundle file.
-
-The default \fIoutputfile\fP name is \fBca-bundle.crt\fP. By setting it to '-'
-(a single dash) you will get the output sent to STDOUT instead of a file.
-
+format.
+By default, only CA root certificates trusted to issue SSL server
+authentication certificates are extracted.
+These are then processed with the OpenSSL commandline tool to produce
+the final ca-bundle file.
+.sp
+The default
+.Pa outputfile
+name is
+.Pa ca-bundle.crt .
+By setting it to '-' (a single dash) you will get the output sent to
+STDOUT instead of a file.
+.sp
 The PEM format this scripts uses for output makes the result readily available
 for use by just about all OpenSSL or GnuTLS powered applications, such as
 curl, wget and more.
-.SH OPTIONS
+.Sh OPTIONS
 The following options are supported:
-.IP -b
-backup an existing version of \fIoutputfilename\fP
-.IP "-d [name]"
-specify which Mozilla tree to pull certdata.txt from (or a custom URL). Valid
-names are: aurora, beta, central, mozilla, nss, release (default). They are
-shortcuts for which source tree to get the cert data from.
-.IP -f
-force rebuild even if certdata.txt is current (Added in version 1.17)
-.IP -i
+.Bl -tag -width Ds
+.It Fl b
+backup an existing version of
+.Pa outputfile
+.It Fl d\ [name]
+specify which Mozilla tree to pull
+.Pa certdata.txt
+from (or a custom URL).
+Valid names are: aurora, beta, central, mozilla, nss, release (default).
+They are shortcuts for which source tree to get the cert data from.
+.It Fl f
+force rebuild even if
+.Pa certdata.txt
+is current (Added in version 1.17)
+.It Fl i
 print version info about used modules
-.IP -k
-Allow insecure data transfer. By default (since 1.27) this command will fail
-if the HTTPS transfer fails. This overrides that decision (and opens for
-man-in-the-middle attacks).
-.IP -l
-print license info about certdata.txt
-.IP -m
-(Added in 1.26) Include meta data comments in the output. The meta data is
-specific information about each certificate that is stored in the original
-file as comments and using this option will make those comments get passed on
-to the output file. The meta data is not parsed in any way by mk-ca-bundle.
-.IP -n
-no download of certdata.txt (to use existing)
-.IP "-p [purposes]:[levels]"
+.It Fl k
+Allow insecure data transfer.
+By default (since 1.27) this command will fail if the HTTPS transfer fails.
+This overrides that decision (and opens for man-in-the-middle attacks).
+.It Fl l
+print license info about
+.Pa certdata.txt
+.It Fl m
+(Added in 1.26) Include meta data comments in the output.
+The meta data is specific information about each certificate that is
+stored in the original file as comments and using this option will
+make those comments get passed on to the output file.
+The meta data is not parsed in any way by
+.Nm .
+.It Fl n
+no download of
+.Pa certdata.txt
+(to use existing)
+.It Fl p\ [purposes]:[levels]
 list of Mozilla trust purposes and levels for certificates to include in output.
 Takes the form of a comma separated list of purposes, a colon, and a comma
-separated list of levels. The default is to include all certificates trusted
-to issue SSL Server certificates (SERVER_AUTH:TRUSTED_DELEGATOR).
-
+separated list of levels.
+The default is to include all certificates trusted to issue SSL Server
+certificates (SERVER_AUTH:TRUSTED_DELEGATOR).
+.sp
 (Added in version 1.21, Perl only)
-
+.sp
 Valid purposes are:
-.RS
+.Bd -literal -offset indent -compact
 ALL, DIGITAL_SIGNATURE, NON_REPUDIATION, KEY_ENCIPHERMENT,
 DATA_ENCIPHERMENT, KEY_AGREEMENT, KEY_CERT_SIGN, CRL_SIGN,
 SERVER_AUTH (default), CLIENT_AUTH, CODE_SIGNING, EMAIL_PROTECTION,
 IPSEC_END_SYSTEM, IPSEC_TUNNEL, IPSEC_USER, TIME_STAMPING, STEP_UP_APPROVED
-.RE
-.IP
+.Ed
+.sp
 Valid trust levels are:
-.RS
+.Bd -literal -offset indent -compact
 ALL, TRUSTED_DELEGATOR (default), NOT_TRUSTED, MUST_VERIFY_TRUST, TRUSTED
-.RE
-.IP -q
+.Ed
+.sp
+.It Fl q
 be really quiet (no progress output at all)
-.IP -t
+.It Fl t
 include plain text listing of certificates
-.IP "-s [algorithms]"
+.It Fl s\ [algorithms]
 comma separated list of signature algorithms with which to hash/fingerprint
 each certificate and output when run in plain text mode.
-
+.sp
 (Added in version 1.21, Perl only)
-
+.sp
 Valid algorithms are:
-.RS
+.Bd -literal -offset indent -compact
 ALL, NONE, MD5 (default), SHA1, SHA256, SHA384, SHA512
-.RE
-.IP -u
+.Ed
+.It Fl u
 unlink (remove) certdata.txt after processing
-.IP -v
+.It Fl v
 be verbose and print out processed CAs
-.SH EXIT STATUS
-Returns 0 on success. Returns 1 if it fails to download data.
-.SH CERTDATA FORMAT
+.El
+.Sh EXIT STATUS
+Returns 0 on success.
+Returns 1 if it fails to download data.
+.Sh AUTHORS
+This manual page was initially written by
+.An Jan Schaumann Aq Mt jschauma@netmeister.org
+and converted to mdoc format by
+.An Nils Gillmann Aq Mt ng0@n0.is .
+.Sh SEE ALSO
+.Xr curl 1
+.Sh STANDARDS
 The file format used by Mozilla for this trust information seems to be documented here:
-.nf
-https://p11-glue.freedesktop.org/doc/storing-trust-policy/storing-trust-existing.html
-.fi
-.SH SEE ALSO
-.BR curl (1)
-.SH HISTORY
-\fBmk-ca-bundle\fP is a command line tool that is shipped as part of every
-curl and libcurl release (see https://curl.haxx.se/). It was originally based
+.Lk https://p11-glue.freedesktop.org/doc/storing-trust-policy/storing-trust-existing.html
+.Sh HISTORY
+.Nm
+is a command line tool that is shipped as part of every
+curl and libcurl release (see
+.Lk https://curl.haxx.se/
+).
+It was originally based
 on the parse-certs script written by Roland Krikava and was later much
-improved by Guenter Knauf.  This manual page was initially written by Jan
-Schaumann \&<jschauma@netmeister.org>.
+improved by Guenter Knauf.
diff --git a/curl-config.in b/gnurl-config.in
index 0a7e0353f..4e12de840 100644
--- a/curl-config.in
+++ b/gnurl-config.in
@@ -24,28 +24,28 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 includedir=@includedir@
-cppflag_curl_staticlib=@CPPFLAG_CURL_STATICLIB@
+cppflag_gnurl_staticlib=@CPPFLAG_CURL_STATICLIB@
 
 usage()
 {
     cat <<EOF
-Usage: curl-config [OPTION]
+Usage: gnurl-config [OPTION]
 
 Available values for OPTION include:
 
-  --built-shared says 'yes' if libcurl was built shared
+  --built-shared says 'yes' if libgnurl was built shared
   --ca        ca bundle install path
   --cc        compiler
   --cflags    pre-processor and compiler flags
-  --checkfor [version] check for (lib)curl of the specified version
-  --configure the arguments given to configure when building curl
+  --checkfor [version] check for (lib)gnurl of the specified version
+  --configure the arguments given to configure when building gnurl
   --features  newline separated list of enabled features
   --help      display this help and exit
   --libs      library linking information
-  --prefix    curl install prefix
+  --prefix    gnurl install prefix
   --protocols newline separated list of enabled protocols
   --ssl-backends output the SSL backends libcurl was built to support
-  --static-libs static libcurl library linking information
+  --static-libs static libgnurl library linking information
   --version   output version information
   --vernum    output the version information as a number (hexadecimal)
 EOF
@@ -96,7 +96,7 @@ while test $# -gt 0; do
         ;;
 
     --version)
-        echo libcurl @CURLVERSION@
+        echo libgnurl @CURLVERSION@
         exit 0
         ;;
 
@@ -142,7 +142,7 @@ while test $# -gt 0; do
         ;;
 
     --cflags)
-        if test "X$cppflag_curl_staticlib" = "X-DCURL_STATICLIB"; then
+        if test "X$cppflag_gnurl_staticlib" = "X-DCURL_STATICLIB"; then
           CPPFLAG_CURL_STATICLIB="-DCURL_STATICLIB "
         else
           CPPFLAG_CURL_STATICLIB=""
@@ -161,9 +161,9 @@ while test $# -gt 0; do
            CURLLIBDIR=""
         fi
         if test "X@REQUIRE_LIB_DEPS@" = "Xyes"; then
-          echo ${CURLLIBDIR}-lcurl @LIBCURL_LIBS@
+          echo @LDFLAGS@ ${CURLLIBDIR}-lgnurl @LIBCURL_LIBS@
         else
-          echo ${CURLLIBDIR}-lcurl
+          echo @LDFLAGS@ ${CURLLIBDIR}-lgnurl
         fi
         ;;
     --ssl-backends)
@@ -172,9 +172,9 @@ while test $# -gt 0; do
 
     --static-libs)
         if test "X@ENABLE_STATIC@" != "Xno" ; then
-          echo @libdir@/libcurl.@libext@ @LDFLAGS@ @LIBCURL_LIBS@
+          echo @libdir@/libgnurl.@libext@ @LDFLAGS@ @LIBCURL_LIBS@
         else
-          echo "curl was built with static libraries disabled" >&2
+          echo "gnurl was built with static libraries disabled" >&2
           exit 1
         fi
         ;;
diff --git a/include/Makefile.am b/include/Makefile.am
index 3b2486029..3d036b8ff 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = curl
+SUBDIRS = gnurl
 
 EXTRA_DIST = README
 
diff --git a/include/README b/include/README
index 091ef76d1..f4cfd9a68 100644
--- a/include/README
+++ b/include/README
@@ -9,7 +9,7 @@ Include files for libcurl, external users.
 They're all placed in the curl subdirectory here for better fit in any kind
 of environment. You must include files from here using...
 
-        #include <curl/curl.h>
+        #include <gnurl/curl.h>
 
 ... style and point the compiler's include path to the directory holding the
 curl subdirectory. It makes it more likely to survive future modifications.
diff --git a/include/curl/.gitignore b/include/gnurl/.gitignore
index 555795fae..555795fae 100644
--- a/include/curl/.gitignore
+++ b/include/gnurl/.gitignore
diff --git a/include/curl/Makefile.am b/include/gnurl/Makefile.am
index a31f61b10..b8298f29b 100644
--- a/include/curl/Makefile.am
+++ b/include/gnurl/Makefile.am
@@ -23,7 +23,7 @@ pkginclude_HEADERS = \
   curl.h curlver.h easy.h mprintf.h stdcheaders.h multi.h \
   typecheck-gcc.h system.h urlapi.h
 
-pkgincludedir= $(includedir)/curl
+pkgincludedir= $(includedir)/gnurl
 
 CHECKSRC = $(CS_$(V))
 CS_0 = @echo "  RUN     " $@;
@@ -31,7 +31,7 @@ CS_1 =
 CS_ = $(CS_0)
 
 checksrc:
-	$(CHECKSRC)@PERL@ $(top_srcdir)/lib/checksrc.pl -D$(top_srcdir)/include/curl $(pkginclude_HEADERS)
+	$(CHECKSRC)@PERL@ $(top_srcdir)/lib/checksrc.pl -D$(top_srcdir)/include/gnurl $(pkginclude_HEADERS)
 
 if CURLDEBUG
 # for debug builds, we scan the sources on all regular make invokes
diff --git a/include/curl/curl.h b/include/gnurl/curl.h
index 86a24184a..86a24184a 100644
--- a/include/curl/curl.h
+++ b/include/gnurl/curl.h
diff --git a/include/curl/curlver.h b/include/gnurl/curlver.h
index 479cd8e6c..479cd8e6c 100644
--- a/include/curl/curlver.h
+++ b/include/gnurl/curlver.h
diff --git a/include/curl/easy.h b/include/gnurl/easy.h
index f42a8a969..f42a8a969 100644
--- a/include/curl/easy.h
+++ b/include/gnurl/easy.h
diff --git a/include/curl/mprintf.h b/include/gnurl/mprintf.h
index e20f546e1..e20f546e1 100644
--- a/include/curl/mprintf.h
+++ b/include/gnurl/mprintf.h
diff --git a/include/curl/multi.h b/include/gnurl/multi.h
index b19dbaf79..eab23c08e 100644
--- a/include/curl/multi.h
+++ b/include/gnurl/multi.h
@@ -40,7 +40,7 @@
 /*
  * This header file should not really need to include "curl.h" since curl.h
  * itself includes this file and we expect user applications to do #include
- * <curl/curl.h> without the need for especially including multi.h.
+ * <gnurl/curl.h> without the need for especially including multi.h.
  *
  * For some reason we added this include here at one point, and rather than to
  * break existing (wrongly written) libcurl applications, we leave it as-is
diff --git a/include/curl/stdcheaders.h b/include/gnurl/stdcheaders.h
index 027b6f421..027b6f421 100644
--- a/include/curl/stdcheaders.h
+++ b/include/gnurl/stdcheaders.h
diff --git a/include/curl/system.h b/include/gnurl/system.h
index 1e555ec19..1e555ec19 100644
--- a/include/curl/system.h
+++ b/include/gnurl/system.h
diff --git a/include/curl/typecheck-gcc.h b/include/gnurl/typecheck-gcc.h
index 8018ea37f..8018ea37f 100644
--- a/include/curl/typecheck-gcc.h
+++ b/include/gnurl/typecheck-gcc.h
diff --git a/include/curl/urlapi.h b/include/gnurl/urlapi.h
index 850faa97a..850faa97a 100644
--- a/include/curl/urlapi.h
+++ b/include/gnurl/urlapi.h
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 7c258b3fa..6e8a83fad 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -25,13 +25,13 @@ CMAKE_DIST = CMakeLists.txt curl_config.h.cmake
 
 EXTRA_DIST = Makefile.m32 config-win32.h                            \
  config-win32ce.h config-riscos.h config-mac.h curl_config.h.in     \
- makefile.dj config-dos.h libcurl.plist libcurl.rc config-amigaos.h \
+ makefile.dj config-dos.h libgnurl.plist libcurl.rc config-amigaos.h \
  makefile.amiga Makefile.netware nwlib.c nwos.c config-win32ce.h    \
  config-os400.h setup-os400.h config-symbian.h Makefile.Watcom      \
  config-tpf.h mk-ca-bundle.pl mk-ca-bundle.vbs $(CMAKE_DIST)        \
  firefox-db2pem.sh config-vxworks.h Makefile.vxworks checksrc.pl
 
-lib_LTLIBRARIES = libcurl.la
+lib_LTLIBRARIES = libgnurl.la
 
 if BUILD_UNITTESTS
 noinst_LTLIBRARIES = libcurlu.la
@@ -83,43 +83,43 @@ AM_CPPFLAGS += -DBUILDING_LIBCURL
 AM_LDFLAGS =
 AM_CFLAGS =
 
-libcurl_la_CPPFLAGS_EXTRA =
-libcurl_la_LDFLAGS_EXTRA =
-libcurl_la_CFLAGS_EXTRA =
+libgnurl_la_CPPFLAGS_EXTRA =
+libgnurl_la_LDFLAGS_EXTRA =
+libgnurl_la_CFLAGS_EXTRA =
 
 if CURL_LT_SHLIB_USE_VERSION_INFO
-libcurl_la_LDFLAGS_EXTRA += $(VERSIONINFO)
+libgnurl_la_LDFLAGS_EXTRA += $(VERSIONINFO)
 endif
 
 if CURL_LT_SHLIB_USE_NO_UNDEFINED
-libcurl_la_LDFLAGS_EXTRA += -no-undefined
+libgnurl_la_LDFLAGS_EXTRA += -no-undefined
 endif
 
 if CURL_LT_SHLIB_USE_MIMPURE_TEXT
-libcurl_la_LDFLAGS_EXTRA += -mimpure-text
+libgnurl_la_LDFLAGS_EXTRA += -mimpure-text
 endif
 
 if CURL_LT_SHLIB_USE_VERSIONED_SYMBOLS
-libcurl_la_LDFLAGS_EXTRA += -Wl,--version-script=libcurl.vers
+libgnurl_la_LDFLAGS_EXTRA += -Wl,--version-script=libcurl.vers
 else
 # if symbol-hiding is enabled, hide them!
 if DOING_CURL_SYMBOL_HIDING
-libcurl_la_LDFLAGS_EXTRA += -export-symbols-regex '^curl_.*'
+libgnurl_la_LDFLAGS_EXTRA += -export-symbols-regex '^curl_.*'
 endif
 endif
 
 if USE_CPPFLAG_CURL_STATICLIB
-libcurl_la_CPPFLAGS_EXTRA += -DCURL_STATICLIB
+libgnurl_la_CPPFLAGS_EXTRA += -DCURL_STATICLIB
 endif
 
 if DOING_CURL_SYMBOL_HIDING
-libcurl_la_CPPFLAGS_EXTRA += -DCURL_HIDDEN_SYMBOLS
-libcurl_la_CFLAGS_EXTRA += $(CFLAG_CURL_SYMBOL_HIDING)
+libgnurl_la_CPPFLAGS_EXTRA += -DCURL_HIDDEN_SYMBOLS
+libgnurl_la_CFLAGS_EXTRA += $(CFLAG_CURL_SYMBOL_HIDING)
 endif
 
-libcurl_la_CPPFLAGS = $(AM_CPPFLAGS) $(libcurl_la_CPPFLAGS_EXTRA)
-libcurl_la_LDFLAGS = $(AM_LDFLAGS) $(libcurl_la_LDFLAGS_EXTRA) $(LDFLAGS) $(LIBCURL_LIBS)
-libcurl_la_CFLAGS = $(AM_CFLAGS) $(libcurl_la_CFLAGS_EXTRA)
+libgnurl_la_CPPFLAGS = $(AM_CPPFLAGS) $(libgnurl_la_CPPFLAGS_EXTRA)
+libgnurl_la_LDFLAGS = $(AM_LDFLAGS) $(libgnurl_la_LDFLAGS_EXTRA) $(LDFLAGS) $(LIBCURL_LIBS)
+libgnurl_la_CFLAGS = $(AM_CFLAGS) $(libgnurl_la_CFLAGS_EXTRA)
 
 libcurlu_la_CPPFLAGS = $(AM_CPPFLAGS) -DCURL_STATICLIB -DUNITTESTS
 libcurlu_la_LDFLAGS = $(AM_LDFLAGS) -static $(LIBCURL_LIBS)
@@ -128,7 +128,7 @@ libcurlu_la_CFLAGS = $(AM_CFLAGS)
 # Makefile.inc provides the CSOURCES and HHEADERS defines
 include Makefile.inc
 
-libcurl_la_SOURCES = $(CSOURCES) $(HHEADERS)
+libgnurl_la_SOURCES = $(CSOURCES) $(HHEADERS)
 libcurlu_la_SOURCES = $(CSOURCES) $(HHEADERS)
 
 CHECKSRC = $(CS_$(V))
diff --git a/lib/Makefile.netware b/lib/Makefile.netware
index 29885a19e..db946968f 100644
--- a/lib/Makefile.netware
+++ b/lib/Makefile.netware
@@ -345,7 +345,7 @@ $(OBJDIR)/%.o: %.c
 #	@echo Compiling $<
 	$(CC) $(CFLAGS) -c $< -o $@
 
-$(OBJDIR)/version.inc: $(CURL_INC)/curl/curlver.h $(OBJDIR)
+$(OBJDIR)/version.inc: $(CURL_INC)/gnurl/curlver.h $(OBJDIR)
 	@echo Creating $@
 	@$(AWK) -f ../packages/NetWare/get_ver.awk $< > $@
 
@@ -676,7 +676,7 @@ else
 	@echo $(DL)#define CURL_CA_BUNDLE getenv("CURL_CA_BUNDLE")$(DL) >> $@
 endif
 
-$(EXPORTF): $(CURL_INC)/curl/curl.h $(CURL_INC)/curl/easy.h $(CURL_INC)/curl/multi.h $(CURL_INC)/curl/mprintf.h
+$(EXPORTF): $(CURL_INC)/gnurl/curl.h $(CURL_INC)/gnurl/easy.h $(CURL_INC)/gnurl/multi.h $(CURL_INC)/gnurl/mprintf.h
 	@echo Creating $@
 	@$(AWK) -f ../packages/NetWare/get_exp.awk $^ > $@
 
diff --git a/lib/conncache.c b/lib/conncache.c
index 39302ba7b..2c5d6b443 100644
--- a/lib/conncache.c
+++ b/lib/conncache.c
@@ -23,7 +23,7 @@
 
 #include "curl_setup.h"
 
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 #include "urldata.h"
 #include "url.h"
diff --git a/lib/content_encoding.c b/lib/content_encoding.c
index 6d4753788..5074b246e 100644
--- a/lib/content_encoding.c
+++ b/lib/content_encoding.c
@@ -23,7 +23,7 @@
 #include "curl_setup.h"
 
 #include "urldata.h"
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 #include <stddef.h>
 
 #ifdef HAVE_ZLIB_H
diff --git a/lib/cookie.h b/lib/cookie.h
index 6ac4a6ac0..6e4108bb1 100644
--- a/lib/cookie.h
+++ b/lib/cookie.h
@@ -23,7 +23,7 @@
  ***************************************************************************/
 #include "curl_setup.h"
 
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 struct Cookie {
   struct Cookie *next; /* next in the chain */
diff --git a/lib/curl_addrinfo.c b/lib/curl_addrinfo.c
index 16c4779c1..05287fa9e 100644
--- a/lib/curl_addrinfo.c
+++ b/lib/curl_addrinfo.c
@@ -22,7 +22,7 @@
 
 #include "curl_setup.h"
 
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 #ifdef HAVE_NETINET_IN_H
 #  include <netinet/in.h>
diff --git a/lib/curl_fnmatch.c b/lib/curl_fnmatch.c
index 846ecaec3..3b7fc5026 100644
--- a/lib/curl_fnmatch.c
+++ b/lib/curl_fnmatch.c
@@ -22,7 +22,7 @@
 
 #include "curl_setup.h"
 #ifndef CURL_DISABLE_FTP
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 #include "curl_fnmatch.h"
 #include "curl_memory.h"
diff --git a/lib/curl_memory.h b/lib/curl_memory.h
index fccf46879..6d024a743 100644
--- a/lib/curl_memory.h
+++ b/lib/curl_memory.h
@@ -86,8 +86,8 @@
 #ifndef CURL_DID_MEMORY_FUNC_TYPEDEFS /* only if not already done */
 /*
  * The following memory function replacement typedef's are COPIED from
- * curl/curl.h and MUST match the originals. We copy them to avoid having to
- * include curl/curl.h here. We avoid that include since it includes stdio.h
+ * gnurl/curl.h and MUST match the originals. We copy them to avoid having to
+ * include gnurl/curl.h here. We avoid that include since it includes stdio.h
  * and other headers that may get messed up with defines done here.
  */
 typedef void *(*curl_malloc_callback)(size_t size);
diff --git a/lib/curl_memrchr.c b/lib/curl_memrchr.c
index eeb3044a9..d17c100a3 100644
--- a/lib/curl_memrchr.c
+++ b/lib/curl_memrchr.c
@@ -22,7 +22,7 @@
 
 #include "curl_setup.h"
 
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 #include "curl_memrchr.h"
 #include "curl_memory.h"
diff --git a/lib/curl_multibyte.c b/lib/curl_multibyte.c
index e48334faf..74cc459f3 100644
--- a/lib/curl_multibyte.c
+++ b/lib/curl_multibyte.c
@@ -22,7 +22,7 @@
 
 #include "curl_setup.h"
 
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 #if defined(USE_WIN32_IDN) || ((defined(USE_WINDOWS_SSPI) || \
                                 defined(USE_WIN32_LDAP)) && defined(UNICODE))
diff --git a/lib/curl_path.c b/lib/curl_path.c
index ad386e743..74406ace4 100644
--- a/lib/curl_path.c
+++ b/lib/curl_path.c
@@ -24,7 +24,7 @@
 
 #if defined(USE_LIBSSH2) || defined(USE_LIBSSH)
 
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 #include "curl_memory.h"
 #include "curl_path.h"
 #include "escape.h"
diff --git a/lib/curl_path.h b/lib/curl_path.h
index 636c37f20..2f0eae1ca 100644
--- a/lib/curl_path.h
+++ b/lib/curl_path.h
@@ -23,7 +23,7 @@
  ***************************************************************************/
 
 #include "curl_setup.h"
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 #include "urldata.h"
 
 #ifdef WIN32
diff --git a/lib/curl_printf.h b/lib/curl_printf.h
index 0d37b8e57..426468fb5 100644
--- a/lib/curl_printf.h
+++ b/lib/curl_printf.h
@@ -27,7 +27,7 @@
  * *rintf() functions.
  */
 
-#include <curl/mprintf.h>
+#include <gnurl/mprintf.h>
 
 # undef printf
 # undef fprintf
diff --git a/lib/curl_range.c b/lib/curl_range.c
index aa3c49332..c9314eba8 100644
--- a/lib/curl_range.c
+++ b/lib/curl_range.c
@@ -21,7 +21,7 @@
  ***************************************************************************/
 
 #include "curl_setup.h"
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 #include "curl_range.h"
 #include "sendf.h"
 #include "strtoofft.h"
diff --git a/lib/curl_rtmp.c b/lib/curl_rtmp.c
index 16b1de1ae..d92b0b39d 100644
--- a/lib/curl_rtmp.c
+++ b/lib/curl_rtmp.c
@@ -31,7 +31,7 @@
 #include "progress.h" /* for Curl_pgrsSetUploadSize */
 #include "transfer.h"
 #include "warnless.h"
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 #include <librtmp/rtmp.h>
 #include "curl_memory.h"
 /* The last #include file should be: */
diff --git a/lib/curl_sasl.c b/lib/curl_sasl.c
index 9e1a72e5e..437a9f66a 100644
--- a/lib/curl_sasl.c
+++ b/lib/curl_sasl.c
@@ -31,7 +31,7 @@
 
 #include "curl_setup.h"
 
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 #include "urldata.h"
 
 #include "curl_base64.h"
diff --git a/lib/curl_sasl.h b/lib/curl_sasl.h
index 7647a48be..9b780f5d9 100644
--- a/lib/curl_sasl.h
+++ b/lib/curl_sasl.h
@@ -22,7 +22,7 @@
  *
  ***************************************************************************/
 
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 struct Curl_easy;
 struct connectdata;
diff --git a/lib/curl_setup.h b/lib/curl_setup.h
index 4c3a17359..26c3646e8 100644
--- a/lib/curl_setup.h
+++ b/lib/curl_setup.h
@@ -142,7 +142,7 @@
 /*  please, do it beyond the point further indicated in this file.  */
 /* ================================================================ */
 
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 #define CURL_SIZEOF_CURL_OFF_T SIZEOF_CURL_OFF_T
 
@@ -199,7 +199,7 @@
 
 /* ================================================================ */
 /* No system header file shall be included in this file before this */
-/* point. The only allowed ones are those included from curl/system.h */
+/* point. The only allowed ones are those included from gnurl/system.h */
 /* ================================================================ */
 
 /*
@@ -330,7 +330,7 @@
 #endif
 
 #ifndef STDC_HEADERS /* no standard C headers! */
-#include <curl/stdcheaders.h>
+#include <gnurl/stdcheaders.h>
 #endif
 
 #ifdef __POCC__
diff --git a/lib/curl_sspi.c b/lib/curl_sspi.c
index 1d0de4ed3..a00210ec1 100644
--- a/lib/curl_sspi.c
+++ b/lib/curl_sspi.c
@@ -24,7 +24,7 @@
 
 #ifdef USE_WINDOWS_SSPI
 
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 #include "curl_sspi.h"
 #include "curl_multibyte.h"
 #include "system_win32.h"
diff --git a/lib/curl_sspi.h b/lib/curl_sspi.h
index 2bbf9477b..694289900 100644
--- a/lib/curl_sspi.h
+++ b/lib/curl_sspi.h
@@ -26,7 +26,7 @@
 
 #ifdef USE_WINDOWS_SSPI
 
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 /*
  * When including the following three headers, it is mandatory to define either
diff --git a/lib/curl_threads.c b/lib/curl_threads.c
index 8e5937aa0..2b36c87b4 100644
--- a/lib/curl_threads.c
+++ b/lib/curl_threads.c
@@ -22,7 +22,7 @@
 
 #include "curl_setup.h"
 
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 #if defined(USE_THREADS_POSIX)
 #  ifdef HAVE_PTHREAD_H
diff --git a/lib/curlx.h b/lib/curlx.h
index 3e9b516f8..a81ddcdb5 100644
--- a/lib/curlx.h
+++ b/lib/curlx.h
@@ -29,7 +29,7 @@
  * be.
  */
 
-#include <curl/mprintf.h>
+#include <gnurl/mprintf.h>
 /* this is still a public header file that provides the curl_mprintf()
    functions while they still are offered publicly. They will be made library-
    private one day */
diff --git a/lib/dict.c b/lib/dict.c
index 208a2336f..c93bf575a 100644
--- a/lib/dict.c
+++ b/lib/dict.c
@@ -49,7 +49,7 @@
 #endif
 
 #include "urldata.h"
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 #include "transfer.h"
 #include "sendf.h"
 #include "escape.h"
diff --git a/lib/dotdot.c b/lib/dotdot.c
index 2c6177aea..bb15426c6 100644
--- a/lib/dotdot.c
+++ b/lib/dotdot.c
@@ -22,7 +22,7 @@
 
 #include "curl_setup.h"
 
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 #include "dotdot.h"
 #include "curl_memory.h"
diff --git a/lib/easy.c b/lib/easy.c
index ae6176f25..9e902623b 100644
--- a/lib/easy.c
+++ b/lib/easy.c
@@ -51,7 +51,7 @@
 #endif
 
 #include "urldata.h"
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 #include "transfer.h"
 #include "vtls/vtls.h"
 #include "url.h"
@@ -973,7 +973,7 @@ void curl_easy_reset(struct Curl_easy *data)
  * NOTE: if you have the receiving paused and you call this function to remove
  * the pausing, you may get your write callback called at this point.
  *
- * Action is a bitmask consisting of CURLPAUSE_* bits in curl/curl.h
+ * Action is a bitmask consisting of CURLPAUSE_* bits in gnurl/curl.h
  *
  * NOTE: This is one of few API functions that are allowed to be called from
  * within a callback.
diff --git a/lib/escape.c b/lib/escape.c
index 7121db31c..a352b8cf6 100644
--- a/lib/escape.c
+++ b/lib/escape.c
@@ -25,7 +25,7 @@
 
 #include "curl_setup.h"
 
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 #include "urldata.h"
 #include "warnless.h"
diff --git a/lib/file.c b/lib/file.c
index d349cd924..45b16de48 100644
--- a/lib/file.c
+++ b/lib/file.c
@@ -50,7 +50,7 @@
 
 #include "strtoofft.h"
 #include "urldata.h"
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 #include "progress.h"
 #include "sendf.h"
 #include "escape.h"
diff --git a/lib/fileinfo.h b/lib/fileinfo.h
index f4d8f3b90..ed3347de4 100644
--- a/lib/fileinfo.h
+++ b/lib/fileinfo.h
@@ -22,7 +22,7 @@
  *
  ***************************************************************************/
 
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 #include "llist.h"
 
 struct fileinfo {
diff --git a/lib/formdata.c b/lib/formdata.c
index 202d930c7..5a6cdd644 100644
--- a/lib/formdata.c
+++ b/lib/formdata.c
@@ -22,7 +22,7 @@
 
 #include "curl_setup.h"
 
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 #ifndef CURL_DISABLE_HTTP
 
@@ -45,7 +45,6 @@
 #include "curl_memory.h"
 #include "memdebug.h"
 
-
 #define HTTPPOST_PTRNAME CURL_HTTPPOST_PTRNAME
 #define HTTPPOST_FILENAME CURL_HTTPPOST_FILENAME
 #define HTTPPOST_PTRCONTENTS CURL_HTTPPOST_PTRCONTENTS
diff --git a/lib/ftp.c b/lib/ftp.c
index 825aaaa1d..132813666 100644
--- a/lib/ftp.c
+++ b/lib/ftp.c
@@ -46,7 +46,7 @@
 #define in_addr_t unsigned long
 #endif
 
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 #include "urldata.h"
 #include "sendf.h"
 #include "if2ip.h"
diff --git a/lib/ftplistparser.c b/lib/ftplistparser.c
index 1b1de5c3c..c13b0fe70 100644
--- a/lib/ftplistparser.c
+++ b/lib/ftplistparser.c
@@ -39,7 +39,7 @@
 
 #ifndef CURL_DISABLE_FTP
 
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 #include "urldata.h"
 #include "fileinfo.h"
diff --git a/lib/getenv.c b/lib/getenv.c
index 89d181de3..6acf70760 100644
--- a/lib/getenv.c
+++ b/lib/getenv.c
@@ -22,7 +22,7 @@
 
 #include "curl_setup.h"
 
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 #include "curl_memory.h"
 
 #include "memdebug.h"
diff --git a/lib/getinfo.c b/lib/getinfo.c
index e118da80d..5305090b4 100644
--- a/lib/getinfo.c
+++ b/lib/getinfo.c
@@ -22,7 +22,7 @@
 
 #include "curl_setup.h"
 
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 #include "urldata.h"
 #include "getinfo.h"
diff --git a/lib/gopher.c b/lib/gopher.c
index b296c62d1..a7e3ebb08 100644
--- a/lib/gopher.c
+++ b/lib/gopher.c
@@ -25,7 +25,7 @@
 #ifndef CURL_DISABLE_GOPHER
 
 #include "urldata.h"
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 #include "transfer.h"
 #include "sendf.h"
 #include "progress.h"
diff --git a/lib/hash.c b/lib/hash.c
index 421d68f76..9e6e3fcee 100644
--- a/lib/hash.c
+++ b/lib/hash.c
@@ -22,7 +22,7 @@
 
 #include "curl_setup.h"
 
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 #include "hash.h"
 #include "llist.h"
diff --git a/lib/hmac.c b/lib/hmac.c
index bf49ebec5..f6a033c00 100644
--- a/lib/hmac.c
+++ b/lib/hmac.c
@@ -26,7 +26,7 @@
 
 #ifndef CURL_DISABLE_CRYPTO_AUTH
 
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 #include "curl_hmac.h"
 #include "curl_memory.h"
diff --git a/lib/hostcheck.h b/lib/hostcheck.h
index f562df9ae..fcc5d40d6 100644
--- a/lib/hostcheck.h
+++ b/lib/hostcheck.h
@@ -22,7 +22,7 @@
  *
  ***************************************************************************/
 
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 #define CURL_HOST_NOMATCH 0
 #define CURL_HOST_MATCH   1
diff --git a/lib/http.c b/lib/http.c
index a0520b40e..5a70c4d23 100644
--- a/lib/http.c
+++ b/lib/http.c
@@ -46,7 +46,7 @@
 #endif
 
 #include "urldata.h"
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 #include "transfer.h"
 #include "sendf.h"
 #include "formdata.h"
diff --git a/lib/http.h b/lib/http.h
index a59fe7af0..15fe22d37 100644
--- a/lib/http.h
+++ b/lib/http.h
@@ -99,7 +99,7 @@ CURLcode Curl_http_perhapsrewind(struct connectdata *conn);
 /* If only the PICKNONE bit is set, there has been a round-trip and we
    selected to use no auth at all. Ie, we actively select no auth, as opposed
    to not having one selected. The other CURLAUTH_* defines are present in the
-   public curl/curl.h header. */
+   public gnurl/curl.h header. */
 #define CURLAUTH_PICKNONE (1<<30) /* don't use auth */
 
 /* MAX_INITIAL_POST_SIZE indicates the number of bytes that will make the POST
diff --git a/lib/http2.c b/lib/http2.c
index b5c53cdf6..ef74704ac 100644
--- a/lib/http2.c
+++ b/lib/http2.c
@@ -2418,7 +2418,7 @@ bool Curl_h2_http_1_1_error(struct connectdata *conn)
 /* Satisfy external references even if http2 is not compiled in. */
 
 #define CURL_DISABLE_TYPECHECK
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 char *curl_pushheader_bynum(struct curl_pushheaders *h, size_t num)
 {
diff --git a/lib/http_proxy.c b/lib/http_proxy.c
index d7ed11761..1b4294a3c 100644
--- a/lib/http_proxy.c
+++ b/lib/http_proxy.c
@@ -26,7 +26,7 @@
 
 #if !defined(CURL_DISABLE_PROXY) && !defined(CURL_DISABLE_HTTP)
 
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 #include "sendf.h"
 #include "http.h"
 #include "url.h"
diff --git a/lib/imap.c b/lib/imap.c
index 075b3ad20..df069647f 100644
--- a/lib/imap.c
+++ b/lib/imap.c
@@ -58,7 +58,7 @@
 #define in_addr_t unsigned long
 #endif
 
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 #include "urldata.h"
 #include "sendf.h"
 #include "hostip.h"
diff --git a/lib/ldap.c b/lib/ldap.c
index 79dc2f2ed..734a4ae24 100644
--- a/lib/ldap.c
+++ b/lib/ldap.c
@@ -55,7 +55,7 @@
 #endif
 
 #include "urldata.h"
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 #include "sendf.h"
 #include "escape.h"
 #include "progress.h"
diff --git a/lib/libcurl.rc b/lib/libcurl.rc
index 4839d0a65..97f490a25 100644
--- a/lib/libcurl.rc
+++ b/lib/libcurl.rc
@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 #include <winver.h>
-#include "../include/curl/curlver.h"
+#include "../include/gnurl/curlver.h"
 
 LANGUAGE  0, 0
 
diff --git a/lib/libcurl.plist b/lib/libgnurl.plist
index 622f66cfb..33c2fdefa 100644
--- a/lib/libcurl.plist
+++ b/lib/libgnurl.plist
@@ -9,7 +9,7 @@
 	<string>English</string>
 
 	<key>CFBundleExecutable</key>
-	<string>curl</string>
+	<string>gnurl</string>
 
 	<key>CFBundleIdentifier</key>
 	<string>se.haxx.curl.libcurl</string>
@@ -18,7 +18,7 @@
 	<string>7.12.3</string>
 
 	<key>CFBundleName</key>
-	<string>libcurl</string>
+	<string>libgnurl</string>
 
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
@@ -30,6 +30,6 @@
 	<string>libcurl 7.12.3</string>
 
 	<key>CFBundleGetInfoString</key>
-	<string>libcurl.plist 7.12.3</string>
+	<string>libgnurl.plist 7.12.3</string>
 </dict>
 </plist>
diff --git a/lib/llist.c b/lib/llist.c
index f8769c2af..59174c86e 100644
--- a/lib/llist.c
+++ b/lib/llist.c
@@ -22,7 +22,7 @@
 
 #include "curl_setup.h"
 
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 #include "llist.h"
 #include "curl_memory.h"
diff --git a/lib/md5.c b/lib/md5.c
index db4cc2656..f88688b34 100644
--- a/lib/md5.c
+++ b/lib/md5.c
@@ -24,7 +24,7 @@
 
 #ifndef CURL_DISABLE_CRYPTO_AUTH
 
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 #include "curl_md5.h"
 #include "curl_hmac.h"
diff --git a/lib/memdebug.c b/lib/memdebug.c
index e3ac8edf7..639a9bb45 100644
--- a/lib/memdebug.c
+++ b/lib/memdebug.c
@@ -24,7 +24,7 @@
 
 #ifdef CURLDEBUG
 
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 #include "urldata.h"
 
diff --git a/lib/mime.c b/lib/mime.c
index 48147d4f5..4f6789398 100644
--- a/lib/mime.c
+++ b/lib/mime.c
@@ -22,7 +22,7 @@
 
 #include "curl_setup.h"
 
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 #include "mime.h"
 #include "non-ascii.h"
diff --git a/lib/mprintf.c b/lib/mprintf.c
index e19093678..4c43ad7b2 100644
--- a/lib/mprintf.c
+++ b/lib/mprintf.c
@@ -36,7 +36,7 @@
  */
 
 #include "curl_setup.h"
-#include <curl/mprintf.h>
+#include <gnurl/mprintf.h>
 
 #include "curl_memory.h"
 /* The last #include file should be: */
diff --git a/lib/multi.c b/lib/multi.c
index cc16924a3..a3422c2ad 100644
--- a/lib/multi.c
+++ b/lib/multi.c
@@ -22,7 +22,7 @@
 
 #include "curl_setup.h"
 
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 #include "urldata.h"
 #include "transfer.h"
diff --git a/lib/netrc.c b/lib/netrc.c
index aba355b76..2c5ed33bb 100644
--- a/lib/netrc.c
+++ b/lib/netrc.c
@@ -26,7 +26,7 @@
 #include <pwd.h>
 #endif
 
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 #include "netrc.h"
 #include "strtok.h"
 #include "strcase.h"
diff --git a/lib/non-ascii.c b/lib/non-ascii.c
index 42beaec45..ba3240551 100644
--- a/lib/non-ascii.c
+++ b/lib/non-ascii.c
@@ -24,7 +24,7 @@
 
 #ifdef CURL_DOES_CONVERSIONS
 
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 #include "non-ascii.h"
 #include "formdata.h"
diff --git a/lib/nonblock.h b/lib/nonblock.h
index eb18ea1c3..eb45910c5 100644
--- a/lib/nonblock.h
+++ b/lib/nonblock.h
@@ -22,7 +22,7 @@
  *
  ***************************************************************************/
 
-#include <curl/curl.h> /* for curl_socket_t */
+#include <gnurl/curl.h> /* for curl_socket_t */
 
 int curlx_nonblock(curl_socket_t sockfd,    /* operate on this */
                    int nonblock   /* TRUE or FALSE */);
diff --git a/lib/openldap.c b/lib/openldap.c
index a98c50b46..935632a60 100644
--- a/lib/openldap.c
+++ b/lib/openldap.c
@@ -39,7 +39,7 @@
 #include <ldap.h>
 
 #include "urldata.h"
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 #include "sendf.h"
 #include "vtls/vtls.h"
 #include "transfer.h"
diff --git a/lib/parsedate.c b/lib/parsedate.c
index 3d3c00b4f..a97310e55 100644
--- a/lib/parsedate.c
+++ b/lib/parsedate.c
@@ -77,7 +77,7 @@
 
 #include <limits.h>
 
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 #include "strcase.h"
 #include "warnless.h"
 #include "parsedate.h"
diff --git a/lib/pipeline.c b/lib/pipeline.c
index 8de3babd7..0adc1cd48 100644
--- a/lib/pipeline.c
+++ b/lib/pipeline.c
@@ -23,7 +23,7 @@
 
 #include "curl_setup.h"
 
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 #include "urldata.h"
 #include "url.h"
diff --git a/lib/pop3.c b/lib/pop3.c
index 8dbd448b2..0edbad461 100644
--- a/lib/pop3.c
+++ b/lib/pop3.c
@@ -60,7 +60,7 @@
 #define in_addr_t unsigned long
 #endif
 
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 #include "urldata.h"
 #include "sendf.h"
 #include "hostip.h"
diff --git a/lib/psl.c b/lib/psl.c
index 568baff03..d50c6250f 100644
--- a/lib/psl.c
+++ b/lib/psl.c
@@ -22,7 +22,7 @@
 
 #include "curl_setup.h"
 
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 #ifdef USE_LIBPSL
 
diff --git a/lib/rand.c b/lib/rand.c
index 6ee45feb1..e252e7e54 100644
--- a/lib/rand.c
+++ b/lib/rand.c
@@ -26,7 +26,7 @@
 #include <fcntl.h>
 #endif
 
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 #include "vtls/vtls.h"
 #include "sendf.h"
 #include "rand.h"
diff --git a/lib/rtsp.c b/lib/rtsp.c
index b9a8ef5e8..73c681556 100644
--- a/lib/rtsp.c
+++ b/lib/rtsp.c
@@ -25,7 +25,7 @@
 #ifndef CURL_DISABLE_RTSP
 
 #include "urldata.h"
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 #include "transfer.h"
 #include "sendf.h"
 #include "multiif.h"
diff --git a/lib/select.c b/lib/select.c
index 8cd9eb2ad..f7c53e7b3 100644
--- a/lib/select.c
+++ b/lib/select.c
@@ -43,7 +43,7 @@
 #include <strings.h>  /* bzero() in FD_SET */
 #endif
 
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 #include "urldata.h"
 #include "connect.h"
diff --git a/lib/sendf.c b/lib/sendf.c
index 5008d9333..9a04b4af2 100644
--- a/lib/sendf.c
+++ b/lib/sendf.c
@@ -30,7 +30,7 @@
 #include <linux/tcp.h>
 #endif
 
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 #include "urldata.h"
 #include "sendf.h"
diff --git a/lib/share.c b/lib/share.c
index 3d5108610..7d51eebf1 100644
--- a/lib/share.c
+++ b/lib/share.c
@@ -22,7 +22,7 @@
 
 #include "curl_setup.h"
 
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 #include "urldata.h"
 #include "share.h"
 #include "psl.h"
diff --git a/lib/share.h b/lib/share.h
index a7dea41ad..da3bf1765 100644
--- a/lib/share.h
+++ b/lib/share.h
@@ -23,7 +23,7 @@
  ***************************************************************************/
 
 #include "curl_setup.h"
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 #include "cookie.h"
 #include "psl.h"
 #include "urldata.h"
diff --git a/lib/slist.c b/lib/slist.c
index 392b84d13..093465c97 100644
--- a/lib/slist.c
+++ b/lib/slist.c
@@ -22,7 +22,7 @@
 
 #include "curl_setup.h"
 
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 #include "slist.h"
 
diff --git a/lib/smtp.c b/lib/smtp.c
index f3db714b5..b9304a4f7 100644
--- a/lib/smtp.c
+++ b/lib/smtp.c
@@ -59,7 +59,7 @@
 #define in_addr_t unsigned long
 #endif
 
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 #include "urldata.h"
 #include "sendf.h"
 #include "hostip.h"
diff --git a/lib/speedcheck.c b/lib/speedcheck.c
index 3aeea9111..86920a078 100644
--- a/lib/speedcheck.c
+++ b/lib/speedcheck.c
@@ -22,7 +22,7 @@
 
 #include "curl_setup.h"
 
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 #include "urldata.h"
 #include "sendf.h"
 #include "multiif.h"
diff --git a/lib/ssh-libssh.c b/lib/ssh-libssh.c
index 609da1e09..f75fcd5ff 100644
--- a/lib/ssh-libssh.c
+++ b/lib/ssh-libssh.c
@@ -58,7 +58,7 @@
 #define in_addr_t unsigned long
 #endif
 
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 #include "urldata.h"
 #include "sendf.h"
 #include "hostip.h"
diff --git a/lib/ssh.c b/lib/ssh.c
index 46f52eceb..b1b7b730a 100644
--- a/lib/ssh.c
+++ b/lib/ssh.c
@@ -57,7 +57,7 @@
 #define in_addr_t unsigned long
 #endif
 
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 #include "urldata.h"
 #include "sendf.h"
 #include "hostip.h"
diff --git a/lib/strcase.c b/lib/strcase.c
index 24bcca932..c6732ff78 100644
--- a/lib/strcase.c
+++ b/lib/strcase.c
@@ -22,7 +22,7 @@
 
 #include "curl_setup.h"
 
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 #include "strcase.h"
 
diff --git a/lib/strcase.h b/lib/strcase.h
index 6fee3840e..6436e6937 100644
--- a/lib/strcase.h
+++ b/lib/strcase.h
@@ -22,7 +22,7 @@
  *
  ***************************************************************************/
 
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 /*
  * Only "raw" case insensitive strings. This is meant to be locale independent
diff --git a/lib/strdup.c b/lib/strdup.c
index 51e7978b7..e1330ddf1 100644
--- a/lib/strdup.c
+++ b/lib/strdup.c
@@ -22,7 +22,7 @@
 
 #include "curl_setup.h"
 
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 #include "strdup.h"
 #include "curl_memory.h"
diff --git a/lib/strerror.c b/lib/strerror.c
index e273f3765..bf027fc0c 100644
--- a/lib/strerror.c
+++ b/lib/strerror.c
@@ -33,7 +33,7 @@
 #  endif
 #endif
 
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 #ifdef USE_LIBIDN2
 #include <idn2.h>
diff --git a/lib/system_win32.c b/lib/system_win32.c
index f7f817dd4..258ef9f4f 100644
--- a/lib/system_win32.c
+++ b/lib/system_win32.c
@@ -24,7 +24,7 @@
 
 #if defined(WIN32)
 
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 #include "system_win32.h"
 #include "curl_sspi.h"
 #include "warnless.h"
diff --git a/lib/telnet.c b/lib/telnet.c
index 955255c36..fa51124dc 100644
--- a/lib/telnet.c
+++ b/lib/telnet.c
@@ -45,7 +45,7 @@
 #endif
 
 #include "urldata.h"
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 #include "transfer.h"
 #include "sendf.h"
 #include "telnet.h"
diff --git a/lib/tftp.c b/lib/tftp.c
index 8b92b7bd6..73ddc1376 100644
--- a/lib/tftp.c
+++ b/lib/tftp.c
@@ -45,7 +45,7 @@
 #endif
 
 #include "urldata.h"
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 #include "transfer.h"
 #include "sendf.h"
 #include "tftp.h"
diff --git a/lib/transfer.c b/lib/transfer.c
index ca6031724..ea1b1e16f 100644
--- a/lib/transfer.c
+++ b/lib/transfer.c
@@ -55,7 +55,7 @@
 #endif
 
 #include "urldata.h"
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 #include "netrc.h"
 
 #include "content_encoding.h"
diff --git a/lib/urldata.h b/lib/urldata.h
index 24187a4c4..0681e8da7 100644
--- a/lib/urldata.h
+++ b/lib/urldata.h
@@ -92,7 +92,7 @@
 
 #include "timeval.h"
 
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 #include "http_chunks.h" /* for the structs and enum stuff */
 #include "hostip.h"
@@ -205,6 +205,7 @@ struct ssl_connect_data {
      current state of the connection. */
   ssl_connection_state state;
   ssl_connect_state connecting_state;
+
 #if defined(USE_SSL)
   struct ssl_backend_data *backend;
 #endif
@@ -1616,7 +1617,7 @@ struct UserDefined {
   curl_sshkeycallback ssh_keyfunc; /* key matching callback */
   void *ssh_keyfunc_userp;         /* custom pointer to callback */
   enum CURL_NETRC_OPTION
-       use_netrc;        /* defined in include/curl.h */
+       use_netrc;        /* defined in include/gnurl.h */
   curl_usessl use_ssl;   /* if AUTH TLS is to be attempted etc, for FTP or
                             IMAP or POP3 or others! */
   curl_ftpauth ftpsslauth; /* what AUTH XXX to be attempted */
diff --git a/lib/vauth/cleartext.c b/lib/vauth/cleartext.c
index be6d6111e..27acbfec9 100644
--- a/lib/vauth/cleartext.c
+++ b/lib/vauth/cleartext.c
@@ -25,7 +25,7 @@
 
 #include "curl_setup.h"
 
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 #include "urldata.h"
 
 #include "vauth/vauth.h"
diff --git a/lib/vauth/cram.c b/lib/vauth/cram.c
index d148618b0..d266d2c7c 100644
--- a/lib/vauth/cram.c
+++ b/lib/vauth/cram.c
@@ -26,7 +26,7 @@
 
 #if !defined(CURL_DISABLE_CRYPTO_AUTH)
 
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 #include "urldata.h"
 
 #include "vauth/vauth.h"
diff --git a/lib/vauth/digest.c b/lib/vauth/digest.c
index 0f2e6509e..24de4677b 100644
--- a/lib/vauth/digest.c
+++ b/lib/vauth/digest.c
@@ -27,7 +27,7 @@
 
 #if !defined(CURL_DISABLE_CRYPTO_AUTH)
 
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 #include "vauth/vauth.h"
 #include "vauth/digest.h"
diff --git a/lib/vauth/digest.h b/lib/vauth/digest.h
index 8686c44a4..cb544da9b 100644
--- a/lib/vauth/digest.h
+++ b/lib/vauth/digest.h
@@ -22,7 +22,7 @@
  *
  ***************************************************************************/
 
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 #if !defined(CURL_DISABLE_CRYPTO_AUTH)
 
diff --git a/lib/vauth/digest_sspi.c b/lib/vauth/digest_sspi.c
index fe8093e8b..d9db534c4 100644
--- a/lib/vauth/digest_sspi.c
+++ b/lib/vauth/digest_sspi.c
@@ -27,7 +27,7 @@
 
 #if defined(USE_WINDOWS_SSPI) && !defined(CURL_DISABLE_CRYPTO_AUTH)
 
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 #include "vauth/vauth.h"
 #include "vauth/digest.h"
diff --git a/lib/vauth/krb5_gssapi.c b/lib/vauth/krb5_gssapi.c
index 55daec1ff..0ffbe5f96 100644
--- a/lib/vauth/krb5_gssapi.c
+++ b/lib/vauth/krb5_gssapi.c
@@ -27,7 +27,7 @@
 
 #if defined(HAVE_GSSAPI) && defined(USE_KERBEROS5)
 
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 #include "vauth/vauth.h"
 #include "curl_sasl.h"
diff --git a/lib/vauth/krb5_sspi.c b/lib/vauth/krb5_sspi.c
index cb11ed901..8dad8b3bc 100644
--- a/lib/vauth/krb5_sspi.c
+++ b/lib/vauth/krb5_sspi.c
@@ -26,7 +26,7 @@
 
 #if defined(USE_WINDOWS_SSPI) && defined(USE_KERBEROS5)
 
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 #include "vauth/vauth.h"
 #include "urldata.h"
diff --git a/lib/vauth/ntlm_sspi.c b/lib/vauth/ntlm_sspi.c
index 67112820e..177327b7a 100644
--- a/lib/vauth/ntlm_sspi.c
+++ b/lib/vauth/ntlm_sspi.c
@@ -24,7 +24,7 @@
 
 #if defined(USE_WINDOWS_SSPI) && defined(USE_NTLM)
 
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 #include "vauth/vauth.h"
 #include "urldata.h"
diff --git a/lib/vauth/oauth2.c b/lib/vauth/oauth2.c
index 6288f89a3..28f64e105 100644
--- a/lib/vauth/oauth2.c
+++ b/lib/vauth/oauth2.c
@@ -24,7 +24,7 @@
 
 #include "curl_setup.h"
 
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 #include "urldata.h"
 
 #include "vauth/vauth.h"
diff --git a/lib/vauth/spnego_gssapi.c b/lib/vauth/spnego_gssapi.c
index 7c4bd4b59..7d2b9ac31 100644
--- a/lib/vauth/spnego_gssapi.c
+++ b/lib/vauth/spnego_gssapi.c
@@ -26,7 +26,7 @@
 
 #if defined(HAVE_GSSAPI) && defined(USE_SPNEGO)
 
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 #include "vauth/vauth.h"
 #include "urldata.h"
diff --git a/lib/vauth/spnego_sspi.c b/lib/vauth/spnego_sspi.c
index 0171ec52b..ddd983cf2 100644
--- a/lib/vauth/spnego_sspi.c
+++ b/lib/vauth/spnego_sspi.c
@@ -26,7 +26,7 @@
 
 #if defined(USE_WINDOWS_SSPI) && defined(USE_SPNEGO)
 
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 #include "vauth/vauth.h"
 #include "urldata.h"
diff --git a/lib/vauth/vauth.c b/lib/vauth/vauth.c
index 502d443ab..612b7c3e8 100644
--- a/lib/vauth/vauth.c
+++ b/lib/vauth/vauth.c
@@ -22,7 +22,7 @@
 
 #include "curl_setup.h"
 
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 #include "vauth.h"
 #include "curl_multibyte.h"
diff --git a/lib/vauth/vauth.h b/lib/vauth/vauth.h
index f43064211..d0ca53ad9 100644
--- a/lib/vauth/vauth.h
+++ b/lib/vauth/vauth.h
@@ -22,7 +22,7 @@
  *
  ***************************************************************************/
 
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 struct Curl_easy;
 
diff --git a/lib/version.c b/lib/version.c
index 9369ae8e3..020b2b018 100644
--- a/lib/version.c
+++ b/lib/version.c
@@ -22,7 +22,7 @@
 
 #include "curl_setup.h"
 
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 #include "urldata.h"
 #include "vtls/vtls.h"
 #include "http2.h"
diff --git a/lib/vtls/gskit.c b/lib/vtls/gskit.c
index c4afc8904..519fbfb02 100644
--- a/lib/vtls/gskit.c
+++ b/lib/vtls/gskit.c
@@ -63,7 +63,7 @@
 
 #include <limits.h>
 
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 #include "urldata.h"
 #include "sendf.h"
 #include "gskit.h"
diff --git a/lib/warnless.h b/lib/warnless.h
index ea4c4395d..08792c2e1 100644
--- a/lib/warnless.h
+++ b/lib/warnless.h
@@ -23,7 +23,7 @@
  ***************************************************************************/
 
 #ifdef USE_WINSOCK
-#include <curl/curl.h> /* for curl_socket_t */
+#include <gnurl/curl.h> /* for curl_socket_t */
 #endif
 
 #define CURLX_FUNCTION_CAST(target_type, func) \
diff --git a/lib/wildcard.h b/lib/wildcard.h
index b7826123a..9e7035097 100644
--- a/lib/wildcard.h
+++ b/lib/wildcard.h
@@ -22,7 +22,7 @@
  *
  ***************************************************************************/
 
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 #include "llist.h"
 
diff --git a/lib/x509asn1.c b/lib/x509asn1.c
index 25231921c..ceab1bcf9 100644
--- a/lib/x509asn1.c
+++ b/lib/x509asn1.c
@@ -25,7 +25,7 @@
 #if defined(USE_GSKIT) || defined(USE_NSS) || defined(USE_GNUTLS) || \
     defined(USE_CYASSL) || defined(USE_SCHANNEL)
 
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 #include "urldata.h"
 #include "strcase.h"
 #include "hostcheck.h"
diff --git a/libcurl.pc.in b/libgnurl.pc.in
index feea1cd91..f61d6ab04 100644
--- a/libcurl.pc.in
+++ b/libgnurl.pc.in
@@ -30,10 +30,10 @@ includedir=@includedir@
 supported_protocols="@SUPPORT_PROTOCOLS@"
 supported_features="@SUPPORT_FEATURES@"
 
-Name: libcurl
-URL: https://curl.haxx.se/
-Description: Library to transfer files with ftp, http, etc.
+Name: libgnurl
+URL: https://gnunet.org/gnurl/
+Description: Library to transfer files with http or https
 Version: @CURLVERSION@
-Libs: -L${libdir} -lcurl
+Libs: -L${libdir} -lgnurl
 Libs.private: @LIBCURL_LIBS@
 Cflags: -I${includedir} @CPPFLAG_CURL_STATICLIB@
diff --git a/libgnurl.pub b/libgnurl.pub
new file mode 100644
index 000000000..4cd395c58
--- /dev/null
+++ b/libgnurl.pub
@@ -0,0 +1,2 @@
+untrusted comment: signify public key
+RWR26h6WR6+0U9xCGX9w2wV+NMoS4WbUENdcpOTL7/rCd/ZSyr1P5KTo
diff --git a/maketgz b/maketgz
index 55a57c1b3..556cca33f 100755
--- a/maketgz
+++ b/maketgz
@@ -59,9 +59,9 @@ find . -name "*.dist" -a ! -name Makefile.dist -exec rm {} \;
 
 numeric=`perl -e 'printf("%02x%02x%02x\n", '"$major, $minor, $patch);"`
 
-HEADER=include/curl/curlver.h
+HEADER=include/gnurl/curlver.h
 CHEADER=src/tool_version.h
-PLIST=lib/libcurl.plist
+PLIST=lib/libgnurl.plist
 
 if test -z "$only"; then
   ext=".dist"
@@ -102,8 +102,8 @@ if test -n "$only"; then
 fi
 
 echo "curl version $curlversion"
-echo "libcurl version $libversion"
-echo "libcurl numerical $numeric"
+echo "libgnurl version $libversion"
+echo "libgnurl numerical $numeric"
 echo "datestamp $datestamp"
 
 findprog() {
@@ -120,19 +120,12 @@ findprog() {
   return 0
 }
 
-############################################################################
-#
 # Enforce a rerun of configure (updates the VERSION)
-#
 
 echo "Re-running config.status"
 ./config.status --recheck >/dev/null
 
-############################################################################
-#
-# automake is needed to run to make a non-GNU Makefile.in if Makefile.am has
-# been modified.
-#
+# automake is needed to run to make a non-GNU Makefile.in if Makefile.am has been modified.
 
 if { findprog automake >/dev/null 2>/dev/null; } then
   echo "- Could not find or run automake, I hope you know what you're doing!"
@@ -141,10 +134,7 @@ else
   automake --include-deps Makefile >/dev/null
 fi
 
-############################################################################
-#
 # Modify the man pages to display the version number and date.
-#
 
 echo "update man pages"
 ./scripts/updatemanpages.pl $version
@@ -152,41 +142,39 @@ echo "update man pages"
 # make the generated file newer than the man page
 touch src/tool_hugehelp.c
 
-############################################################################
-#
 # Update the IDE files
-echo "make vc-ide"
-make -s vc-ide
+# echo "make vc-ide"
+# make -s vc-ide
 
 echo "produce CHANGES"
 git log --pretty=fuller --no-color --date=short --decorate=full -1000 | ./scripts/log2changes.pl > CHANGES.dist
 
-############################################################################
-#
 # Now run make dist to generate a tar.gz archive
-#
 
 echo "make dist"
-targz="curl-$version.tar.gz"
-make -sj dist VERSION=$version
+targz="gnurl-$version.tar.gz"
+tarball="gnurl-$version.tar"
+tardir="gnurl-$version"
+# TODO: Here's something we need to fix for nbsd make to work.
+# MAKE=gmake is required.
+gmake -sj dist VERSION=$version
 
-############################################################################
-#
-# Now make a bz2 archive from the tar.gz original
-#
+# Now make an Z archive from the tar.gz original
 
-bzip2="curl-$version.tar.bz2"
-echo "Generating $bzip2"
-gzip -dc $targz | bzip2 --best > $bzip2
-
-############################################################################
-#
-# Now make an xz archive from the tar.gz original
-#
+compressfile="gnurl-$version.tar.Z"
+tempdir=".builddir"
 
-xz="curl-$version.tar.xz"
-echo "Generating $xz"
-gzip -dc $targz | xz -6e - > $xz
+makeZ() {
+    rm -rf $tempdir
+    mkdir $tempdir
+    cd $tempdir
+    pax -rz < ../$targz
+    pax -wvf $tarball $tardir
+    compress -vc $tarball > $compressfile
+    mv $compressfile ../
+    cd ..
+    rm -rf $tempdir
+}
 
 ############################################################################
 #
@@ -203,15 +191,38 @@ makezip() {
   rm -rf $tempdir
 }
 
-zip="curl-$version.zip"
-echo "Generating $zip"
-tempdir=".builddir"
-makezip
+###########################################################################
+#
+# pax part
+#
+paxfile="gnurl-$version.pax"
+paxz="gnurl-$version.pax.Z"
+
+makepax(){
+	rm -rf $tempdir
+	mkdir $tempdir
+	cd $tempdir
+        pax -rz < ../$targz
+	pax -wvf $paxfile $tardir
+	compress -cv $paxfile > $paxz
+	mv $paxz ../
+        cd ..
+	rm -rf $tempdir
+}
+
+echo "Generating $compressfile"
+makeZ
+
+printf "%s" "Generating $paxz"
+makepax
 
 echo "------------------"
 echo "maketgz report:"
 echo ""
-ls -l $targz $bzip2 $zip $xz
+ls -l $targz $compressfile $paxz
 
 echo "Run this:"
-echo "gpg -b -a $targz && gpg -b -a $bzip2 && gpg -b -a $zip && gpg -b -a $xz"
+echo "gpg2 -b -a $targz && gpg2 -b -a $compressfile && gpg2 -b -a $paxz"
+sha1 $targz $compressfile $paxz
+md5 -a SHA512 $targz $compressfile $paxz
+rmd160 $targz $compressfile $paxz
diff --git a/packages/Android/Android.mk b/packages/Android/Android.mk
index 6a2ebff68..2b95dddff 100644
--- a/packages/Android/Android.mk
+++ b/packages/Android/Android.mk
@@ -73,7 +73,7 @@ LOCAL_C_INCLUDES += $(LOCAL_PATH)/include/
 LOCAL_CFLAGS += $(common_CFLAGS)
 
 LOCAL_COPY_HEADERS_TO := libcurl/curl
-LOCAL_COPY_HEADERS := $(addprefix include/curl/,$(CURL_HEADERS))
+LOCAL_COPY_HEADERS := $(addprefix include/gnurl/,$(CURL_HEADERS))
 
 LOCAL_MODULE:= libcurl
 LOCAL_MODULE_TAGS := optional
diff --git a/packages/OS400/README.OS400 b/packages/OS400/README.OS400
index c653ceceb..132d1b92f 100644
--- a/packages/OS400/README.OS400
+++ b/packages/OS400/README.OS400
@@ -282,7 +282,7 @@ _ CURL.INC member in file H. This defines everything needed by an ILE/RPG
   program using libcurl.
 _ LIBxxx modules and programs. Although the test environment is not supported
   on OS/400, the libcurl test programs are compiled for manual tests.
-_ IFS directory /curl/include/curl containing the C header files for IFS source
+_ IFS directory /curl/include/gnurl containing the C header files for IFS source
   C/C++ compilation and curl.inc.rpgle for IFS source ILE/RPG compilation.
 
 
@@ -298,7 +298,7 @@ _ The EBCDIC CCSID used by QADRT is 37 by default, NOT THE JOB'S CCSID. If
   object path before executing the program.
 _ Do not use original source include files unless you know what you are doing.
   Use the installed members instead (in /QSYS.LIB/CURL.LIB/H.FILE and
-  /curl/include/curl).
+  /curl/include/gnurl).
 
 
 
diff --git a/packages/OS400/initscript.sh b/packages/OS400/initscript.sh
index a13d651bc..c9932c49b 100644
--- a/packages/OS400/initscript.sh
+++ b/packages/OS400/initscript.sh
@@ -73,22 +73,22 @@ setenv LIBSSH2_BNDDIR   'LIBSSH2_A'             # LIBSSH2 binding directory.
 #       Need to get the version definitions.
 
 LIBCURL_VERSION=`grep '^#define  *LIBCURL_VERSION '                     \
-                        "${TOPDIR}/include/curl/curlver.h"              |
+                        "${TOPDIR}/include/gnurl/curlver.h"              |
                 sed 's/.*"\(.*\)".*/\1/'`
 LIBCURL_VERSION_MAJOR=`grep '^#define  *LIBCURL_VERSION_MAJOR '         \
-                        "${TOPDIR}/include/curl/curlver.h"              |
+                        "${TOPDIR}/include/gnurl/curlver.h"              |
                 sed 's/^#define  *LIBCURL_VERSION_MAJOR  *\([^ ]*\).*/\1/'`
 LIBCURL_VERSION_MINOR=`grep '^#define  *LIBCURL_VERSION_MINOR '         \
-                        "${TOPDIR}/include/curl/curlver.h"              |
+                        "${TOPDIR}/include/gnurl/curlver.h"              |
                 sed 's/^#define  *LIBCURL_VERSION_MINOR  *\([^ ]*\).*/\1/'`
 LIBCURL_VERSION_PATCH=`grep '^#define  *LIBCURL_VERSION_PATCH '         \
-                        "${TOPDIR}/include/curl/curlver.h"              |
+                        "${TOPDIR}/include/gnurl/curlver.h"              |
                 sed 's/^#define  *LIBCURL_VERSION_PATCH  *\([^ ]*\).*/\1/'`
 LIBCURL_VERSION_NUM=`grep '^#define  *LIBCURL_VERSION_NUM '             \
-                        "${TOPDIR}/include/curl/curlver.h"              |
+                        "${TOPDIR}/include/gnurl/curlver.h"              |
                 sed 's/^#define  *LIBCURL_VERSION_NUM  *0x\([^ ]*\).*/\1/'`
 LIBCURL_TIMESTAMP=`grep '^#define  *LIBCURL_TIMESTAMP '                 \
-                        "${TOPDIR}/include/curl/curlver.h"              |
+                        "${TOPDIR}/include/gnurl/curlver.h"              |
                 sed 's/.*"\(.*\)".*/\1/'`
 export LIBCURL_VERSION
 export LIBCURL_VERSION_MAJOR LIBCURL_VERSION_MINOR LIBCURL_VERSION_PATCH
@@ -190,7 +190,7 @@ make_module()
         CMD="${CMD} SYSIFCOPT(*IFS64IO) OPTION(*INCDIRFIRST)"
         CMD="${CMD} LOCALETYPE(*LOCALE) FLAG(10)"
         CMD="${CMD} INCDIR('/qibm/proddata/qadrt/include'"
-        CMD="${CMD} '${TOPDIR}/include/curl' '${TOPDIR}/include' '${SRCDIR}'"
+        CMD="${CMD} '${TOPDIR}/include/gnurl' '${TOPDIR}/include' '${SRCDIR}'"
         CMD="${CMD} '${TOPDIR}/packages/OS400'"
 
         if [ "${WITH_ZLIB}" != "0" ]
diff --git a/packages/OS400/make-include.sh b/packages/OS400/make-include.sh
index 3c50d2d5f..3b0900ff9 100644
--- a/packages/OS400/make-include.sh
+++ b/packages/OS400/make-include.sh
@@ -21,7 +21,7 @@ fi
 
 #       Create the IFS directory for the header files.
 
-IFSINCLUDE="${IFSDIR}/include/curl"
+IFSINCLUDE="${IFSDIR}/include/gnurl"
 
 if action_needed "${IFSINCLUDE}"
 then    mkdir -p "${IFSINCLUDE}"
diff --git a/packages/OS400/make-lib.sh b/packages/OS400/make-lib.sh
index 410bef05b..c1da92445 100644
--- a/packages/OS400/make-lib.sh
+++ b/packages/OS400/make-lib.sh
@@ -88,7 +88,7 @@ fi
 #       Gather the list of symbols to export.
 
 EXPORTS=`grep '^CURL_EXTERN[[:space:]]'                                 \
-              "${TOPDIR}"/include/curl/*.h                              \
+              "${TOPDIR}"/include/gnurl/*.h                              \
               "${SCRIPTDIR}/ccsidcurl.h"                                |
          sed -e 's/^.*CURL_EXTERN[[:space:]]\(.*\)(.*$/\1/'             \
              -e 's/[[:space:]]*$//'                                     \
diff --git a/packages/OS400/os400sys.c b/packages/OS400/os400sys.c
index c80f01080..849f23973 100644
--- a/packages/OS400/os400sys.c
+++ b/packages/OS400/os400sys.c
@@ -23,7 +23,7 @@
 
 /* OS/400 additional support. */
 
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 #include "config-os400.h"  /* Not curl_setup.h: we only need some defines. */
 
 #include <sys/types.h>
diff --git a/packages/Symbian/group/curl.mmp b/packages/Symbian/group/curl.mmp
index 14ccf1419..e802205b4 100644
--- a/packages/Symbian/group/curl.mmp
+++ b/packages/Symbian/group/curl.mmp
@@ -51,7 +51,7 @@ SOURCEPATH  ../../../lib
 SOURCE \
     strcase.c nonblock.c
 
-USERINCLUDE ../../../src ../../../lib ../../../include/curl
+USERINCLUDE ../../../src ../../../lib ../../../include/gnurl
 
 SYSTEMINCLUDE ../../../include /epoc32/include /epoc32/include/stdapis
 
diff --git a/packages/Symbian/group/libcurl.mmp b/packages/Symbian/group/libcurl.mmp
index 6e94d8489..f125654e0 100644
--- a/packages/Symbian/group/libcurl.mmp
+++ b/packages/Symbian/group/libcurl.mmp
@@ -45,7 +45,7 @@ SOURCE \
   vauth/ntlm.c vauth/ntlm_sspi.c vauth/oauth2.c vauth/spnego_gssapi.c  \
   vauth/spnego_sspi.c
 
-USERINCLUDE   ../../../lib ../../../include/curl
+USERINCLUDE   ../../../lib ../../../include/gnurl
 #ifdef ENABLE_SSL
 SYSTEMINCLUDE /epoc32/include/osextensions/stdapis
 // Older versions of the SDK need this instead:
diff --git a/packages/TPF/maketpf.env_curl b/packages/TPF/maketpf.env_curl
index 3ebf1d189..de3da637b 100644
--- a/packages/TPF/maketpf.env_curl
+++ b/packages/TPF/maketpf.env_curl
@@ -15,7 +15,7 @@ ROOTLIBDIRS := $(foreach d,$(TPF_ROOT),$d/opensource/curl/output/lib)
 ################################################################################
 
 ROOTINCDIRS := $(foreach d,$(TPF_ROOT_LM),$d/opensource/curl/include)
-ROOTINCDIRS += $(foreach d,$(TPF_ROOT_LM),$d/opensource/curl/include/curl)
+ROOTINCDIRS += $(foreach d,$(TPF_ROOT_LM),$d/opensource/curl/include/gnurl)
 
 ################################################################################
 # Define "TPF" to enable TPF-specific code in Curl files.
diff --git a/packages/TPF/maketpf.env_curllib b/packages/TPF/maketpf.env_curllib
index 30cc3169e..2810738c8 100644
--- a/packages/TPF/maketpf.env_curllib
+++ b/packages/TPF/maketpf.env_curllib
@@ -41,7 +41,7 @@ ROOTLSTDIRS := $(foreach d,$(TPF_ROOT),$d/opensource/curl/output/lst)
 
 ROOTINCDIRS := $(foreach d,$(TPF_ROOT_LM),$d/opensource/curl/lib)
 ROOTINCDIRS += $(foreach d,$(TPF_ROOT_LM),$d/opensource/curl/include)
-ROOTINCDIRS += $(foreach d,$(TPF_ROOT_LM),$d/opensource/curl/include/curl)
+ROOTINCDIRS += $(foreach d,$(TPF_ROOT_LM),$d/opensource/curl/include/gnurl)
 
 ################################################################################
 # Set the C file directories
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 297b8d29b..ec4747705 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -23,8 +23,8 @@ ZSH_FUNCTIONS_DIR = @ZSH_FUNCTIONS_DIR@
 FISH_FUNCTIONS_DIR = @FISH_FUNCTIONS_DIR@
 PERL = @PERL@
 
-ZSH_COMPLETION_FUNCTION_FILENAME = _curl
-FISH_COMPLETION_FUNCTION_FILENAME = curl.fish
+ZSH_COMPLETION_FUNCTION_FILENAME = _gnurl
+FISH_COMPLETION_FUNCTION_FILENAME = gnurl.fish
 
 CLEANFILES = $(ZSH_COMPLETION_FUNCTION_FILENAME) $(FISH_COMPLETION_FUNCTION_FILENAME)
 
@@ -35,7 +35,7 @@ if CROSSCOMPILING
 	@echo "NOTICE: we can't generate zsh completion when cross-compiling!"
 else # if not cross-compiling:
 	@if ! test -x "$(PERL)"; then echo "No perl: can't install completion.pl"; exit 0; fi
-	$(PERL) $(srcdir)/completion.pl --curl $(top_builddir)/src/curl$(EXEEXT) --shell zsh > $@
+	$(PERL) $(srcdir)/completion.pl --curl $(top_builddir)/src/gnurl$(EXEEXT) --shell zsh > $@
 endif
 
 $(FISH_COMPLETION_FUNCTION_FILENAME): completion.pl
@@ -43,7 +43,7 @@ if CROSSCOMPILING
 	@echo "NOTICE: we can't generate fish completion when cross-compiling!"
 else # if not cross-compiling:
 	@if ! test -x "$(PERL)"; then echo "No perl: can't install completion.pl"; exit 0; fi
-	$(PERL) $(srcdir)/completion.pl --curl $(top_builddir)/src/curl$(EXEEXT) --shell fish > $@
+	$(PERL) $(srcdir)/completion.pl --curl $(top_builddir)/src/gnurl$(EXEEXT) --shell fish > $@
 endif
 
 install-data-local:
diff --git a/scripts/installcheck.sh b/scripts/installcheck.sh
index b26ba60f6..b3aad68c8 100644
--- a/scripts/installcheck.sh
+++ b/scripts/installcheck.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 PREFIX=$1
 
diff --git a/scripts/log2changes.pl b/scripts/log2changes.pl
index 3aa326a07..283822513 100755
--- a/scripts/log2changes.pl
+++ b/scripts/log2changes.pl
@@ -32,7 +32,7 @@ while(<STDIN>) {
     if($l =~/^commit ([[:xdigit:]]*) ?(.*)/) {
         $co = $1;
         my $ref = $2;
-        if ($ref =~ /refs\/tags\/curl-([0-9_]*)/) {
+        if ($ref =~ /refs\/tags\/gnurl-([0-9_]*)/) {
             $tag = $1;
             $tag =~ tr/_/./;
         }
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 63e2b943d..c8119eaa4 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -53,7 +53,7 @@ source_group("curl header files" FILES ${CURL_HFILES})
 include_directories(
   ${CURL_SOURCE_DIR}/lib        # To be able to reach "curl_setup_once.h"
   ${CURL_BINARY_DIR}/lib        # To be able to reach "curl_config.h"
-  ${CURL_BINARY_DIR}/include    # To be able to reach "curl/curl.h"
+  ${CURL_BINARY_DIR}/include    # To be able to reach "gnurl/curl.h"
   # This is needed as tool_hugehelp.c is generated in the binary dir
   ${CURL_SOURCE_DIR}/src        # To be able to reach "tool_hugehelp.h"
   )
diff --git a/src/Makefile.Watcom b/src/Makefile.Watcom
index 25cd3bf88..67e542d7a 100644
--- a/src/Makefile.Watcom
+++ b/src/Makefile.Watcom
@@ -47,7 +47,7 @@
 !ifdef %libname
 LIBNAME = $(%libname)
 !else
-LIBNAME = libcurl
+LIBNAME = libgnurl
 !endif
 
 TARGETS = curl.exe
diff --git a/src/Makefile.am b/src/Makefile.am
index a26a57076..d5020093f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -41,7 +41,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/include        \
               -I$(top_srcdir)/lib            \
               -I$(top_srcdir)/src
 
-bin_PROGRAMS = curl
+bin_PROGRAMS = gnurl
 
 SUBDIRS = ../docs
 
@@ -52,7 +52,7 @@ endif
 include Makefile.inc
 
 # CURL_FILES comes from Makefile.inc
-curl_SOURCES = $(CURL_FILES)
+gnurl_SOURCES = $(CURL_FILES)
 
 # This might hold -Werror
 CFLAGS += @CURL_CFLAG_EXTRAS@
@@ -61,13 +61,13 @@ CFLAGS += @CURL_CFLAG_EXTRAS@
 LIBS = $(BLANK_AT_MAKETIME)
 
 if USE_EXPLICIT_LIB_DEPS
-curl_LDADD = $(top_builddir)/lib/libcurl.la @LIBMETALINK_LIBS@ @LIBCURL_LIBS@
+gnurl_LDADD = $(top_builddir)/lib/libgnurl.la @LIBCURL_LIBS@
 else
-curl_LDADD = $(top_builddir)/lib/libcurl.la @LIBMETALINK_LIBS@ @NSS_LIBS@ @SSL_LIBS@ @ZLIB_LIBS@ @CURL_NETWORK_AND_TIME_LIBS@
+gnurl_LDADD = $(top_builddir)/lib/libgnurl.la @ZLIB_LIBS@ @CURL_NETWORK_AND_TIME_LIBS@
 endif
 
-curl_LDFLAGS = @LIBMETALINK_LDFLAGS@
-curl_CPPFLAGS = $(AM_CPPFLAGS) $(LIBMETALINK_CPPFLAGS)
+gnurl_LDFLAGS = @LIBMETALINK_LDFLAGS@
+gnurl_CPPFLAGS = $(AM_CPPFLAGS) $(LIBMETALINK_CPPFLAGS)
 
 # if unit tests are enabled, build a static library to link them with
 if BUILD_UNITTESTS
@@ -76,7 +76,7 @@ libcurltool_la_CPPFLAGS = $(LIBMETALINK_CPPFLAGS) $(AM_CPPFLAGS) \
                           -DCURL_STATICLIB -DUNITTESTS
 libcurltool_la_CFLAGS =
 libcurltool_la_LDFLAGS = -static $(LINKFLAGS)
-libcurltool_la_SOURCES = $(curl_SOURCES)
+libcurltool_la_SOURCES = $(gnurl_SOURCES)
 endif
 
 CLEANFILES = tool_hugehelp.c
@@ -90,7 +90,7 @@ EXTRA_DIST = mkhelp.pl makefile.dj                                     \
  curl.rc Makefile.netware Makefile.inc Makefile.Watcom CMakeLists.txt
 
 # Use absolute directory to disable VPATH
-MANPAGE=$(abs_top_builddir)/docs/curl.1
+MANPAGE=$(abs_top_builddir)/docs/gnurl.1
 MKHELP=$(top_srcdir)/src/mkhelp.pl
 HUGE=tool_hugehelp.c
 
diff --git a/src/Makefile.m32 b/src/Makefile.m32
index e13db04b9..853ab7bcd 100644
--- a/src/Makefile.m32
+++ b/src/Makefile.m32
@@ -226,11 +226,11 @@ ifdef SSL
 endif
 
 ifdef DYN
-  curl_DEPENDENCIES = $(PROOT)/lib/libcurldll.a $(PROOT)/lib/libcurl.dll
-  curl_LDADD = -L$(PROOT)/lib -lcurldll
+  curl_DEPENDENCIES = $(PROOT)/lib/libgnurldll.a $(PROOT)/lib/libgnurl.dll
+  curl_LDADD = -L$(PROOT)/lib -lgnurldll
 else
-  curl_DEPENDENCIES = $(PROOT)/lib/libcurl.a
-  curl_LDADD = -L$(PROOT)/lib -lcurl
+  curl_DEPENDENCIES = $(PROOT)/lib/libgnurl.a
+  curl_LDADD = -L$(PROOT)/lib -lgnurl
   CFLAGS += -DCURL_STATICLIB
   LDFLAGS += -static
 endif
diff --git a/src/Makefile.netware b/src/Makefile.netware
index 20d980739..64a0222fd 100644
--- a/src/Makefile.netware
+++ b/src/Makefile.netware
@@ -255,13 +255,13 @@ ENABLE_IPV6 = 1
 endif
 
 ifdef LINK_STATIC
-  LDLIBS = $(CURL_LIB)/libcurl.$(LIBEXT)
+  LDLIBS = $(CURL_LIB)/libgnurl.$(LIBEXT)
 ifdef WITH_ARES
   LDLIBS += $(LIBCARES_PATH)/libcares.$(LIBEXT)
 endif
 else
-  MODULES  = libcurl.nlm
-  IMPORTS = @$(CURL_LIB)/libcurl.imp
+  MODULES  = libgnurl.nlm
+  IMPORTS = @$(CURL_LIB)/libgnurl.imp
 endif
 ifdef WITH_SSH2
   # INCLUDES += -I$(LIBSSH2_PATH)/include
@@ -375,7 +375,7 @@ $(OBJDIR)/%.o: %.c
 #	@echo Compiling $<
 	$(CC) $(CFLAGS) -c $< -o $@
 
-$(OBJDIR)/version.inc: $(CURL_INC)/curl/curlver.h $(OBJDIR)
+$(OBJDIR)/version.inc: $(CURL_INC)/gnurl/curlver.h $(OBJDIR)
 	@echo Creating $@
 	@$(AWK) -f ../packages/NetWare/get_ver.awk $< > $@
 
diff --git a/src/tool_easysrc.c b/src/tool_easysrc.c
index cb30e404b..fc6600261 100644
--- a/src/tool_easysrc.c
+++ b/src/tool_easysrc.c
@@ -50,7 +50,7 @@ static const char *const srchead[]={
   " * All curl_easy_setopt() options are documented at:",
   " * https://curl.haxx.se/libcurl/c/curl_easy_setopt.html",
   " ************************************************************************/",
-  "#include <curl/curl.h>",
+  "#include <gnurl/curl.h>",
   "",
   "int main(int argc, char *argv[])",
   "{",
diff --git a/src/tool_setup.h b/src/tool_setup.h
index 854973e41..d3abd5611 100644
--- a/src/tool_setup.h
+++ b/src/tool_setup.h
@@ -39,7 +39,7 @@
  * curl tool certainly uses libcurl's external interface.
  */
 
-#include <curl/curl.h> /* external interface */
+#include <gnurl/curl.h> /* external interface */
 
 /*
  * Platform specific stuff.
diff --git a/src/tool_version.h b/src/tool_version.h
index 04f45671e..b18a852ea 100644
--- a/src/tool_version.h
+++ b/src/tool_version.h
@@ -21,7 +21,7 @@
  * KIND, either express or implied.
  *
  ***************************************************************************/
-#include <curl/curlver.h>
+#include <gnurl/curlver.h>
 
 #define CURL_NAME "curl"
 #define CURL_COPYRIGHT LIBCURL_COPYRIGHT
diff --git a/tests/certs/scripts/genroot.sh b/tests/certs/scripts/genroot.sh
index f66fc6554..40fbd365a 100755
--- a/tests/certs/scripts/genroot.sh
+++ b/tests/certs/scripts/genroot.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 # (c) CopyRight EdelWeb for EdelKey and OpenEvidence, 2000-2004, 2009
 # Author: Peter Sylvester
diff --git a/tests/certs/scripts/genserv.sh b/tests/certs/scripts/genserv.sh
index f0f440320..d09ab0559 100755
--- a/tests/certs/scripts/genserv.sh
+++ b/tests/certs/scripts/genserv.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 # (c) CopyRight EdelWeb for EdelKey and OpenEvidence, 2000-2004, 2009
 # Author: Peter Sylvester
diff --git a/tests/data/Makefile.inc b/tests/data/Makefile.inc
index 2eca9c670..77a8171df 100644
--- a/tests/data/Makefile.inc
+++ b/tests/data/Makefile.inc
@@ -125,7 +125,7 @@ test1104 test1105 test1106 test1107 test1108 test1109 test1110 test1111 \
 test1112 test1113 test1114 test1115 test1116 test1117 test1118 test1119 \
 test1120 test1121 test1122 test1123 test1124 test1125 test1126 test1127 \
 test1128 test1129 test1130 test1131 test1132 test1133 test1134 test1135 \
-test1136 test1137 test1138 test1139 test1140 test1141 test1142 test1143 \
+test1136 test1137 test1138                   test1141 test1142 test1143 \
 test1144 test1145 test1146 test1147 test1148 test1149 test1150 test1151 \
 test1152 test1153 test1154 test1155 test1156 test1157 test1158 test1159 \
 \
diff --git a/tests/data/test1013 b/tests/data/test1013
index 9a1e6d4e3..244dcf599 100644
--- a/tests/data/test1013
+++ b/tests/data/test1013
@@ -23,7 +23,7 @@ Compare curl --version with curl-config --protocols
 --version
 </command>
 <postcheck>
-%SRCDIR/libtest/test1013.pl ../curl-config log/stdout1013 protocols
+%SRCDIR/libtest/test1013.pl ../gnurl-config log/stdout1013 protocols
 </postcheck>
 </client>
 
diff --git a/tests/data/test1014 b/tests/data/test1014
index 5116aad7c..e00defa81 100644
--- a/tests/data/test1014
+++ b/tests/data/test1014
@@ -23,7 +23,7 @@ Compare curl --version with curl-config --features
 --version
 </command>
 <postcheck>
-%SRCDIR/libtest/test1013.pl ../curl-config log/stdout1014 features
+%SRCDIR/libtest/test1013.pl ../gnurl-config log/stdout1014 features
 </postcheck>
 </client>
 
diff --git a/tests/data/test1022 b/tests/data/test1022
index 6a8b01258..ecd83a332 100644
--- a/tests/data/test1022
+++ b/tests/data/test1022
@@ -23,7 +23,7 @@ Compare curl --version with curl-config --version
 --version
 </command>
 <postcheck>
-%SRCDIR/libtest/test1022.pl ../curl-config log/stdout1022 version
+%SRCDIR/libtest/test1022.pl ../gnurl-config log/stdout1022 version
 </postcheck>
 </client>
 
diff --git a/tests/data/test1023 b/tests/data/test1023
index 9c916a085..5f4d756ae 100644
--- a/tests/data/test1023
+++ b/tests/data/test1023
@@ -23,7 +23,7 @@ Compare curl --version with curl-config --vernum
 --version
 </command>
 <postcheck>
-%SRCDIR/libtest/test1022.pl ../curl-config log/stdout1023 vernum
+%SRCDIR/libtest/test1022.pl ../gnurl-config log/stdout1023 vernum
 </postcheck>
 </client>
 
diff --git a/tests/data/test1119 b/tests/data/test1119
index 017f598f3..7406521c4 100644
--- a/tests/data/test1119
+++ b/tests/data/test1119
@@ -18,7 +18,7 @@ Verify that symbols-in-versions and headers are in sync
  </name>
 
 <command type="perl">
-%SRCDIR/symbol-scan.pl %SRCDIR/.. ../include/curl
+%SRCDIR/symbol-scan.pl %SRCDIR/.. ../include/gnurl
 </command>
 </client>
 
diff --git a/tests/data/test1139 b/tests/data/test1139.skip
index 72761c670..470682e11 100644
--- a/tests/data/test1139
+++ b/tests/data/test1139.skip
@@ -16,7 +16,7 @@ none
 </server>
 
  <name>
-Verify that all libcurl options have man pages
+Verify that all libgnurl options have man pages
  </name>
 
 <command type="perl">
diff --git a/tests/data/test1140 b/tests/data/test1140.skip
index b9458be9f..b9458be9f 100644
--- a/tests/data/test1140
+++ b/tests/data/test1140.skip
diff --git a/tests/data/test1400 b/tests/data/test1400
index 36ddd0e91..1cf6c20b1 100644
--- a/tests/data/test1400
+++ b/tests/data/test1400
@@ -61,7 +61,7 @@ $_ = '' if /CURLOPT_HTTP09_ALLOWED/
  * All curl_easy_setopt() options are documented at:
  * https://curl.haxx.se/libcurl/c/curl_easy_setopt.html
  ************************************************************************/
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 int main(int argc, char *argv[])
 {
diff --git a/tests/data/test1401 b/tests/data/test1401
index d7033e0b5..68a76f310 100644
--- a/tests/data/test1401
+++ b/tests/data/test1401
@@ -67,7 +67,7 @@ $_ = '' if /CURLOPT_HTTP_VERSION/
  * All curl_easy_setopt() options are documented at:
  * https://curl.haxx.se/libcurl/c/curl_easy_setopt.html
  ************************************************************************/
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 int main(int argc, char *argv[])
 {
diff --git a/tests/data/test1402 b/tests/data/test1402
index 978b26162..8735f46d3 100644
--- a/tests/data/test1402
+++ b/tests/data/test1402
@@ -65,7 +65,7 @@ $_ = '' if /CURLOPT_HTTP_VERSION/
  * All curl_easy_setopt() options are documented at:
  * https://curl.haxx.se/libcurl/c/curl_easy_setopt.html
  ************************************************************************/
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 int main(int argc, char *argv[])
 {
diff --git a/tests/data/test1403 b/tests/data/test1403
index 9c838d0ed..832b8bc77 100644
--- a/tests/data/test1403
+++ b/tests/data/test1403
@@ -62,7 +62,7 @@ $_ = '' if /CURLOPT_HTTP_VERSION/
  * All curl_easy_setopt() options are documented at:
  * https://curl.haxx.se/libcurl/c/curl_easy_setopt.html
  ************************************************************************/
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 int main(int argc, char *argv[])
 {
diff --git a/tests/data/test1404 b/tests/data/test1404
index a7b8cc823..e98087a24 100644
--- a/tests/data/test1404
+++ b/tests/data/test1404
@@ -102,7 +102,7 @@ $_ = '' if /\/\* "value" \*\//
  * All curl_easy_setopt() options are documented at:
  * https://curl.haxx.se/libcurl/c/curl_easy_setopt.html
  ************************************************************************/
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 int main(int argc, char *argv[])
 {
diff --git a/tests/data/test1405 b/tests/data/test1405
index 4f477c7d9..14176b9b4 100644
--- a/tests/data/test1405
+++ b/tests/data/test1405
@@ -63,7 +63,7 @@ QUIT
  * All curl_easy_setopt() options are documented at:
  * https://curl.haxx.se/libcurl/c/curl_easy_setopt.html
  ************************************************************************/
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 int main(int argc, char *argv[])
 {
diff --git a/tests/data/test1406 b/tests/data/test1406
index 7d973e7ef..0c2e8602f 100644
--- a/tests/data/test1406
+++ b/tests/data/test1406
@@ -62,7 +62,7 @@ body
  * All curl_easy_setopt() options are documented at:
  * https://curl.haxx.se/libcurl/c/curl_easy_setopt.html
  ************************************************************************/
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 int main(int argc, char *argv[])
 {
diff --git a/tests/data/test1407 b/tests/data/test1407
index 883cf4064..33bdcd1f7 100644
--- a/tests/data/test1407
+++ b/tests/data/test1407
@@ -49,7 +49,7 @@ QUIT
  * All curl_easy_setopt() options are documented at:
  * https://curl.haxx.se/libcurl/c/curl_easy_setopt.html
  ************************************************************************/
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 int main(int argc, char *argv[])
 {
diff --git a/tests/data/test1420 b/tests/data/test1420
index c3d31f349..a1153a788 100644
--- a/tests/data/test1420
+++ b/tests/data/test1420
@@ -55,7 +55,7 @@ A005 LOGOUT
  * All curl_easy_setopt() options are documented at:
  * https://curl.haxx.se/libcurl/c/curl_easy_setopt.html
  ************************************************************************/
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 int main(int argc, char *argv[])
 {
diff --git a/tests/extern-scan.pl b/tests/extern-scan.pl
index 88594ed69..1b22410f5 100755
--- a/tests/extern-scan.pl
+++ b/tests/extern-scan.pl
@@ -30,10 +30,10 @@ use warnings;
 my $root=$ARGV[0] || ".";
 
 my @incs = (
-    "$root/include/curl/curl.h",
-    "$root/include/curl/easy.h",
-    "$root/include/curl/mprintf.h",
-    "$root/include/curl/multi.h",
+    "$root/include/gnurl/curl.h",
+    "$root/include/gnurl/easy.h",
+    "$root/include/gnurl/mprintf.h",
+    "$root/include/gnurl/multi.h",
     );
 
 my $verbose=0;
diff --git a/tests/fuzz/download_fuzzer.sh b/tests/fuzz/download_fuzzer.sh
index 0a841780e..b19fbb7ba 100755
--- a/tests/fuzz/download_fuzzer.sh
+++ b/tests/fuzz/download_fuzzer.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 # If any commands fail, fail the script immediately.
 set -ex
diff --git a/tests/libtest/CMakeLists.txt b/tests/libtest/CMakeLists.txt
index aa70d053d..d74081f70 100644
--- a/tests/libtest/CMakeLists.txt
+++ b/tests/libtest/CMakeLists.txt
@@ -11,7 +11,7 @@ function(setup_test TEST_NAME)          # ARGN are the files in the test
   include_directories(
     ${CURL_SOURCE_DIR}/lib          # To be able to reach "curl_setup_once.h"
     ${CURL_BINARY_DIR}/lib          # To be able to reach "curl_config.h"
-    ${CURL_BINARY_DIR}/include      # To be able to reach "curl/curl.h"
+    ${CURL_BINARY_DIR}/include      # To be able to reach "gnurl/curl.h"
     ${CURL_SOURCE_DIR}/tests/libtest # To be able to build generated tests
     )
   if(USE_ARES)
@@ -54,10 +54,10 @@ endif()
 
 add_custom_command(
   OUTPUT lib1521.c
-  COMMAND ${PERL_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/mk-lib1521.pl < ${CURL_SOURCE_DIR}/include/curl/curl.h > lib1521.c
+  COMMAND ${PERL_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/mk-lib1521.pl < ${CURL_SOURCE_DIR}/include/gnurl/curl.h > lib1521.c
   DEPENDS
     "${CMAKE_CURRENT_SOURCE_DIR}/mk-lib1521.pl"
-    "${CURL_SOURCE_DIR}/include/curl/curl.h"
+    "${CURL_SOURCE_DIR}/include/gnurl/curl.h"
   VERBATIM)
 
 set_property(TARGET chkdecimalpoint
diff --git a/tests/libtest/Makefile.am b/tests/libtest/Makefile.am
index 29ab0a9c4..a2281c456 100644
--- a/tests/libtest/Makefile.am
+++ b/tests/libtest/Makefile.am
@@ -57,11 +57,11 @@ CLEANFILES = lib1521.c
 LIBS = $(BLANK_AT_MAKETIME)
 
 if USE_EXPLICIT_LIB_DEPS
-SUPPORTFILES_LIBS = $(top_builddir)/lib/libcurl.la @LIBCURL_LIBS@
-TESTUTIL_LIBS = $(top_builddir)/lib/libcurl.la @LIBCURL_LIBS@
+SUPPORTFILES_LIBS = $(top_builddir)/lib/libgnurl.la @LIBCURL_LIBS@
+TESTUTIL_LIBS = $(top_builddir)/lib/libgnurl.la @LIBCURL_LIBS@
 else
-SUPPORTFILES_LIBS = $(top_builddir)/lib/libcurl.la @CURL_NETWORK_LIBS@ @NSS_LIBS@
-TESTUTIL_LIBS = $(top_builddir)/lib/libcurl.la @CURL_NETWORK_AND_TIME_LIBS@ @NSS_LIBS@
+SUPPORTFILES_LIBS = $(top_builddir)/lib/libgnurl.la @CURL_NETWORK_LIBS@
+TESTUTIL_LIBS = $(top_builddir)/lib/libgnurl.la @CURL_NETWORK_AND_TIME_LIBS@
 endif
 
 # Dependencies (may need to be overridden)
@@ -128,8 +128,8 @@ libstubgss_la_DEPENDENCIES =
 endif
 
 
-lib1521.c: $(top_srcdir)/tests/libtest/mk-lib1521.pl $(top_srcdir)/include/curl/curl.h
-	@PERL@ $(top_srcdir)/tests/libtest/mk-lib1521.pl < $(top_srcdir)/include/curl/curl.h > lib1521.c
+lib1521.c: $(top_srcdir)/tests/libtest/mk-lib1521.pl $(top_srcdir)/include/gnurl/curl.h
+	@PERL@ $(top_srcdir)/tests/libtest/mk-lib1521.pl < $(top_srcdir)/include/gnurl/curl.h > lib1521.c
 
 CHECKSRC = $(CS_$(V))
 CS_0 = @echo "  RUN     " $@;
diff --git a/tests/libtest/lib1550.c b/tests/libtest/lib1550.c
index d3e17e4fe..1df5503fd 100644
--- a/tests/libtest/lib1550.c
+++ b/tests/libtest/lib1550.c
@@ -23,7 +23,7 @@
 
 #include "memdebug.h"
 
-#include <curl/multi.h>
+#include <gnurl/multi.h>
 
 int test(char *URL)
 {
diff --git a/tests/libtest/lib1551.c b/tests/libtest/lib1551.c
index 36ba75715..edd6e9c8f 100644
--- a/tests/libtest/lib1551.c
+++ b/tests/libtest/lib1551.c
@@ -23,7 +23,7 @@
 
 #include "memdebug.h"
 
-#include <curl/multi.h>
+#include <gnurl/multi.h>
 
 int test(char *URL)
 {
diff --git a/tests/libtest/mk-lib1521.pl b/tests/libtest/mk-lib1521.pl
index fb1401a53..d2ebd66a9 100755
--- a/tests/libtest/mk-lib1521.pl
+++ b/tests/libtest/mk-lib1521.pl
@@ -22,7 +22,7 @@
 ###########################################################################
 
 # Usage:
-#   perl mk-lib1521.pl < ../../include/curl/curl.h > lib1521.c
+#   perl mk-lib1521.pl < ../../include/gnurl/curl.h > lib1521.c
 
 # minimum and maximum long signed values
 my $minlong = "LONG_MIN";
diff --git a/tests/libtest/test.h b/tests/libtest/test.h
index bb1acca0e..90735d272 100644
--- a/tests/libtest/test.h
+++ b/tests/libtest/test.h
@@ -31,7 +31,7 @@
 
 #include "curl_setup.h"
 
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 #ifdef HAVE_SYS_SELECT_H
 /* since so many tests use select(), we can just as well include it here */
diff --git a/tests/libtest/test1022.pl b/tests/libtest/test1022.pl
index 377808c73..76a11cfe7 100755
--- a/tests/libtest/test1022.pl
+++ b/tests/libtest/test1022.pl
@@ -24,7 +24,7 @@ $_ = <CURLCONFIG>;
 chomp;
 my $filever=$_;
 if ( $what eq "version" ) {
-    if($filever =~ /^libcurl ([\.\d]+((-DEV)|(-\d+))?)$/) {
+    if($filever =~ /^libgnurl ([\.\d]+((-DEV)|(-\d+))?)$/) {
         $curlconfigversion = $1;
     }
     else {
diff --git a/tests/libtest/testutil.c b/tests/libtest/testutil.c
index f3ad0ce58..78b1a2b65 100644
--- a/tests/libtest/testutil.c
+++ b/tests/libtest/testutil.c
@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 #include "curl_setup.h"
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 #include "testutil.h"
 #include "memdebug.h"
 
diff --git a/tests/manpage-scan.pl b/tests/manpage-scan.pl
index b6864c857..62eaebea1 100755
--- a/tests/manpage-scan.pl
+++ b/tests/manpage-scan.pl
@@ -43,7 +43,7 @@ use warnings;
 my $root=$ARGV[0] || ".";
 my $buildroot=$ARGV[1] || ".";
 my $syms = "$root/docs/libcurl/symbols-in-versions";
-my $curlh = "$root/include/curl/curl.h";
+my $curlh = "$root/include/gnurl/curl.h";
 my $errors=0;
 
 # the prepopulated alias list is the CURLINFO_* defines that are used for the
@@ -126,9 +126,9 @@ while(<R>) {
 }
 close(R);
 
-scanmanpage("$root/docs/libcurl/curl_easy_setopt.3", @curlopt);
-scanmanpage("$root/docs/libcurl/curl_easy_getinfo.3", @curlinfo);
-scanmanpage("$root/docs/libcurl/curl_multi_setopt.3", @curlmopt);
+scanmanpage("$root/docs/libcurl/gnurl_easy_setopt.3", @curlopt);
+scanmanpage("$root/docs/libcurl/gnurl_easy_getinfo.3", @curlinfo);
+scanmanpage("$root/docs/libcurl/gnurl_multi_setopt.3", @curlmopt);
 
 # using this hash array, we can whitelist specific options
 my %opts = (
@@ -198,7 +198,7 @@ close(R);
 #########################################################################
 # parse the curl.1 man page, extract all documented command line options
 # The man page may or may not be rebuilt, so check both possible locations
-open(R, "<$buildroot/docs/curl.1") || open(R, "<$root/docs/curl.1") ||
+open(R, "<$buildroot/docs/gnurl.1") || open(R, "<$root/docs/gnurl.1") ||
     die "no input file";
 my @manpage; # store all parsed parameters
 while(<R>) {
@@ -270,10 +270,10 @@ foreach my $o (keys %opts) {
             $missing=" tool_getparam.c";
         }
         if($where & 2) {
-            $exists.= " curl.1";
+            $exists.= " gnurl.1";
         }
         else {
-            $missing.= " curl.1";
+            $missing.= " gnurl.1";
         }
         if($where & 4) {
             $exists .= " tool_help.c";
diff --git a/tests/nroff-scan.pl b/tests/nroff-scan.pl
index 6121d4c8e..c868dd622 100755
--- a/tests/nroff-scan.pl
+++ b/tests/nroff-scan.pl
@@ -66,7 +66,7 @@ sub file {
                 print STDERR "error: $f:$line: missing \\fP after $str\n";
                 $errors++;
             }
-            if($str =~ /((libcurl|curl)([^ ]*))\(3\)/i) {
+            if($str =~ /((libcurl|gnurl)([^ ]*))\(3\)/i) {
                 my $man = "$1.3";
                 if(!manpresent($man)) {
                     print STDERR "error: $f:$line: referring to non-existing man page $man\n";
@@ -78,13 +78,13 @@ sub file {
                 }
             }
         }
-        if($l =~ /(curl([^ ]*)\(3\))/i) {
+        if($l =~ /(gnurl([^ ]*)\(3\))/i) {
             print STDERR "error: $f:$line: non-referencing $1\n";
             $errors++;
         }
         if($l =~ /^\.BR (.*)/) {
             my $i= $1;
-            while($i =~ s/((lib|)curl([^ ]*)) *\"\(3\)(,|) *\" *//i ) {
+            while($i =~ s/((lib|)gnurl([^ ]*)) *\"\(3\)(,|) *\" *//i ) {
                 my $man = "$1.3";
                 if(!manpresent($man)) {
                     print STDERR "error: $f:$line: referring to non-existing man page $man\n";
diff --git a/tests/runtests.pl b/tests/runtests.pl
index 1fb7354ec..82e83e15b 100755
--- a/tests/runtests.pl
+++ b/tests/runtests.pl
@@ -150,7 +150,7 @@ my $SMBSPORT;            # SMBS server port
 my $NEGTELNETPORT;       # TELNET server port with negotiation
 
 my $srcdir = $ENV{'srcdir'} || '.';
-my $CURL="../src/curl".exe_ext(); # what curl executable to run on the tests
+my $CURL="../src/gnurl".exe_ext(); # what curl executable to run on the tests
 my $VCURL=$CURL;   # what curl binary to use to verify the servers with
                    # VCURL is handy to set to the system one when the one you
                    # just built hangs or crashes and thus prevent verification
@@ -166,7 +166,7 @@ my $PROXYIN="$LOGDIR/proxy.input"; # what curl sent the proxy
 my $CURLLOG="$LOGDIR/curl.log"; # all command lines run
 my $FTPDCMD="$LOGDIR/ftpserver.cmd"; # copy ftp server instructions here
 my $SERVERLOGS_LOCK="$LOGDIR/serverlogs.lock"; # server logs advisor read lock
-my $CURLCONFIG="../curl-config"; # curl-config from current build
+my $CURLCONFIG="../gnurl-config"; # curl-config from current build
 
 # Normally, all test cases should be run, but at times it is handy to
 # simply run a particular one:
diff --git a/tests/server/CMakeLists.txt b/tests/server/CMakeLists.txt
index 78b9b7029..2fd861019 100644
--- a/tests/server/CMakeLists.txt
+++ b/tests/server/CMakeLists.txt
@@ -11,7 +11,7 @@ function(SETUP_EXECUTABLE TEST_NAME)    # ARGN are the files in the test
   include_directories(
     ${CURL_SOURCE_DIR}/lib      # To be able to reach "curl_setup_once.h"
     ${CURL_BINARY_DIR}/lib      # To be able to reach "curl_config.h"
-    ${CURL_BINARY_DIR}/include  # To be able to reach "curl/curl.h"
+    ${CURL_BINARY_DIR}/include  # To be able to reach "gnurl/curl.h"
     )
   if(USE_ARES)
     include_directories(${CARES_INCLUDE_DIR})
diff --git a/tests/symbol-scan.pl b/tests/symbol-scan.pl
index 6706aa707..cfaffa792 100755
--- a/tests/symbol-scan.pl
+++ b/tests/symbol-scan.pl
@@ -51,9 +51,9 @@ my $root=$ARGV[0] || ".";
 # need an include directory when building out-of-tree
 my $i = ($ARGV[1]) ? "-I$ARGV[1] " : '';
 
-my $h = "$root/include/curl/curl.h";
-my $mh = "$root/include/curl/multi.h";
-my $ua = "$root/include/curl/urlapi.h";
+my $h = "$root/include/gnurl/curl.h";
+my $mh = "$root/include/gnurl/multi.h";
+my $ua = "$root/include/gnurl/urlapi.h";
 
 my $verbose=0;
 my $summary=0;
diff --git a/tests/testcurl.pl b/tests/testcurl.pl
index 69722fb36..5000253c3 100755
--- a/tests/testcurl.pl
+++ b/tests/testcurl.pl
@@ -503,8 +503,8 @@ if ($git) {
 }
 
 # Set timestamp to the one in curlver.h if this isn't a git test build.
-if ((-f "include/curl/curlver.h") &&
-    (open(F, "<include/curl/curlver.h"))) {
+if ((-f "include/gnurl/curlver.h") &&
+    (open(F, "<include/gnurl/curlver.h"))) {
   while (<F>) {
     chomp;
     if ($_ =~ /^\#define\s+LIBCURL_TIMESTAMP\s+\"(.+)\".*$/) {
diff --git a/tests/unit/CMakeLists.txt b/tests/unit/CMakeLists.txt
index 4b0cec4a8..134462733 100644
--- a/tests/unit/CMakeLists.txt
+++ b/tests/unit/CMakeLists.txt
@@ -30,7 +30,7 @@ include_directories(
   ${CURL_SOURCE_DIR}/tests/libtest
   ${CURL_SOURCE_DIR}/src
   ${CURL_BINARY_DIR}/lib          # To be able to reach "curl_config.h"
-  ${CURL_BINARY_DIR}/include      # To be able to reach "curl/curl.h"
+  ${CURL_BINARY_DIR}/include      # To be able to reach "gnurl/curl.h"
 )
 
 foreach(_testfile ${UT_SRC})
diff --git a/tests/unit/Makefile.inc b/tests/unit/Makefile.inc
index f3cba1c2a..67de815c0 100644
--- a/tests/unit/Makefile.inc
+++ b/tests/unit/Makefile.inc
@@ -48,7 +48,7 @@ unit1330_CPPFLAGS = $(AM_CPPFLAGS)
 
 unit1394_SOURCES = unit1394.c $(UNITFILES)
 unit1394_CPPFLAGS = $(AM_CPPFLAGS) $(LIBMETALINK_CPPFLAGS)
-unit1394_LDADD = @LIBMETALINK_LIBS@ $(top_builddir)/lib/libcurl.la @LIBCURL_LIBS@
+unit1394_LDADD = @LIBMETALINK_LIBS@ $(top_builddir)/lib/libgnurl.la @LIBCURL_LIBS@
 unit1394_LDFLAGS = @LIBMETALINK_LDFLAGS@ $(top_builddir)/src/libcurltool.la
 unit1394_LIBS =
 
@@ -102,7 +102,7 @@ unit1620_CPPFLAGS = $(AM_CPPFLAGS)
 
 unit1621_SOURCES = unit1621.c $(UNITFILES)
 unit1621_CPPFLAGS = $(AM_CPPFLAGS)
-unit1621_LDADD = $(top_builddir)/src/libcurltool.la $(top_builddir)/lib/libcurl.la
+unit1621_LDADD = $(top_builddir)/src/libcurltool.la $(top_builddir)/lib/libgnurl.la
 
 unit1650_SOURCES = unit1650.c $(UNITFILES)
 unit1650_CPPFLAGS = $(AM_CPPFLAGS)
diff --git a/tests/unit/unit1308.c b/tests/unit/unit1308.c
index ac41c9d4a..27624a648 100644
--- a/tests/unit/unit1308.c
+++ b/tests/unit/unit1308.c
@@ -21,7 +21,7 @@
  ***************************************************************************/
 #include "curlcheck.h"
 
-#include <curl/curl.h>
+#include <gnurl/curl.h>
 
 static CURLcode unit_setup(void)
 {
diff --git a/tests/unit/unit1398.c b/tests/unit/unit1398.c
index 22cc837e2..94e8677b7 100644
--- a/tests/unit/unit1398.c
+++ b/tests/unit/unit1398.c
@@ -21,7 +21,7 @@
  ***************************************************************************/
 #include "curlcheck.h"
 
-#include "curl/mprintf.h"
+#include "gnurl/mprintf.h"
 
 static CURLcode unit_setup(void) {return CURLE_OK;}
 static void unit_stop(void) {}