diff --git a/lib/amigaos.h b/lib/curl_amigaos.h
similarity index 100%
rename from lib/amigaos.h
rename to lib/curl_amigaos.h
diff --git a/lib/arpa_telnet.h b/lib/curl_arpa_telnet.h
similarity index 100%
rename from lib/arpa_telnet.h
rename to lib/curl_arpa_telnet.h
diff --git a/lib/asyn.h b/lib/curl_asyn.h
similarity index 100%
rename from lib/asyn.h
rename to lib/curl_asyn.h
diff --git a/lib/axtls.h b/lib/curl_axtls.h
similarity index 100%
rename from lib/axtls.h
rename to lib/curl_axtls.h
diff --git a/lib/bundles.h b/lib/curl_bundles.h
similarity index 100%
rename from lib/bundles.h
rename to lib/curl_bundles.h
diff --git a/lib/conncache.h b/lib/curl_conncache.h
similarity index 100%
rename from lib/conncache.h
rename to lib/curl_conncache.h
diff --git a/lib/connect.h b/lib/curl_connect.h
similarity index 100%
rename from lib/connect.h
rename to lib/curl_connect.h
diff --git a/lib/content_encoding.h b/lib/curl_content_encoding.h
similarity index 100%
rename from lib/content_encoding.h
rename to lib/curl_content_encoding.h
diff --git a/lib/cookie.h b/lib/curl_cookie.h
similarity index 100%
rename from lib/cookie.h
rename to lib/curl_cookie.h
diff --git a/lib/cyassl.h b/lib/curl_cyassl.h
similarity index 100%
rename from lib/cyassl.h
rename to lib/curl_cyassl.h
diff --git a/lib/dict.h b/lib/curl_dict.h
similarity index 100%
rename from lib/dict.h
rename to lib/curl_dict.h
diff --git a/lib/easyif.h b/lib/curl_easyif.h
similarity index 100%
rename from lib/easyif.h
rename to lib/curl_easyif.h
diff --git a/lib/escape.h b/lib/curl_escape.h
similarity index 100%
rename from lib/escape.h
rename to lib/curl_escape.h
diff --git a/lib/file.h b/lib/curl_file.h
similarity index 100%
rename from lib/file.h
rename to lib/curl_file.h
diff --git a/lib/fileinfo.h b/lib/curl_fileinfo.h
similarity index 100%
rename from lib/fileinfo.h
rename to lib/curl_fileinfo.h
diff --git a/lib/formdata.h b/lib/curl_formdata.h
similarity index 100%
rename from lib/formdata.h
rename to lib/curl_formdata.h
diff --git a/lib/ftp.h b/lib/curl_ftp.h
similarity index 100%
rename from lib/ftp.h
rename to lib/curl_ftp.h
diff --git a/lib/ftplistparser.h b/lib/curl_ftplistparser.h
similarity index 100%
rename from lib/ftplistparser.h
rename to lib/curl_ftplistparser.h
diff --git a/lib/getinfo.h b/lib/curl_getinfo.h
similarity index 100%
rename from lib/getinfo.h
rename to lib/curl_getinfo.h
diff --git a/lib/gopher.h b/lib/curl_gopher.h
similarity index 100%
rename from lib/gopher.h
rename to lib/curl_gopher.h
diff --git a/lib/gtls.h b/lib/curl_gtls.h
similarity index 100%
rename from lib/gtls.h
rename to lib/curl_gtls.h
diff --git a/lib/hash.h b/lib/curl_hash.h
similarity index 100%
rename from lib/hash.h
rename to lib/curl_hash.h
diff --git a/lib/hostcheck.h b/lib/curl_hostcheck.h
similarity index 100%
rename from lib/hostcheck.h
rename to lib/curl_hostcheck.h
diff --git a/lib/hostip.h b/lib/curl_hostip.h
similarity index 100%
rename from lib/hostip.h
rename to lib/curl_hostip.h
diff --git a/lib/http.h b/lib/curl_http.h
similarity index 100%
rename from lib/http.h
rename to lib/curl_http.h
diff --git a/lib/http_chunks.h b/lib/curl_http_chunks.h
similarity index 100%
rename from lib/http_chunks.h
rename to lib/curl_http_chunks.h
diff --git a/lib/http_digest.h b/lib/curl_http_digest.h
similarity index 100%
rename from lib/http_digest.h
rename to lib/curl_http_digest.h
diff --git a/lib/http_negotiate.h b/lib/curl_http_negotiate.h
similarity index 100%
rename from lib/http_negotiate.h
rename to lib/curl_http_negotiate.h
diff --git a/lib/http_proxy.h b/lib/curl_http_proxy.h
similarity index 100%
rename from lib/http_proxy.h
rename to lib/curl_http_proxy.h
diff --git a/lib/if2ip.h b/lib/curl_if2ip.h
similarity index 100%
rename from lib/if2ip.h
rename to lib/curl_if2ip.h
diff --git a/lib/imap.h b/lib/curl_imap.h
similarity index 100%
rename from lib/imap.h
rename to lib/curl_imap.h
diff --git a/lib/inet_ntop.h b/lib/curl_inet_ntop.h
similarity index 100%
rename from lib/inet_ntop.h
rename to lib/curl_inet_ntop.h
diff --git a/lib/inet_pton.h b/lib/curl_inet_pton.h
similarity index 100%
rename from lib/inet_pton.h
rename to lib/curl_inet_pton.h
diff --git a/lib/krb4.h b/lib/curl_krb4.h
similarity index 100%
rename from lib/krb4.h
rename to lib/curl_krb4.h
diff --git a/lib/llist.h b/lib/curl_llist.h
similarity index 100%
rename from lib/llist.h
rename to lib/curl_llist.h
diff --git a/lib/memdebug.h b/lib/curl_memdebug.h
similarity index 100%
rename from lib/memdebug.h
rename to lib/curl_memdebug.h
diff --git a/lib/multiif.h b/lib/curl_multiif.h
similarity index 100%
rename from lib/multiif.h
rename to lib/curl_multiif.h
diff --git a/lib/netrc.h b/lib/curl_netrc.h
similarity index 100%
rename from lib/netrc.h
rename to lib/curl_netrc.h
diff --git a/lib/non-ascii.h b/lib/curl_non-ascii.h
similarity index 100%
rename from lib/non-ascii.h
rename to lib/curl_non-ascii.h
diff --git a/lib/nonblock.h b/lib/curl_nonblock.h
similarity index 100%
rename from lib/nonblock.h
rename to lib/curl_nonblock.h
diff --git a/lib/nssg.h b/lib/curl_nssg.h
similarity index 100%
rename from lib/nssg.h
rename to lib/curl_nssg.h
diff --git a/lib/parsedate.h b/lib/curl_parsedate.h
similarity index 100%
rename from lib/parsedate.h
rename to lib/curl_parsedate.h
diff --git a/lib/pingpong.h b/lib/curl_pingpong.h
similarity index 100%
rename from lib/pingpong.h
rename to lib/curl_pingpong.h
diff --git a/lib/polarssl.h b/lib/curl_polarssl.h
similarity index 100%
rename from lib/polarssl.h
rename to lib/curl_polarssl.h
diff --git a/lib/pop3.h b/lib/curl_pop3.h
similarity index 100%
rename from lib/pop3.h
rename to lib/curl_pop3.h
diff --git a/lib/progress.h b/lib/curl_progress.h
similarity index 100%
rename from lib/progress.h
rename to lib/curl_progress.h
diff --git a/lib/qssl.h b/lib/curl_qssl.h
similarity index 100%
rename from lib/qssl.h
rename to lib/curl_qssl.h
diff --git a/lib/rawstr.h b/lib/curl_rawstr.h
similarity index 100%
rename from lib/rawstr.h
rename to lib/curl_rawstr.h
diff --git a/lib/rtsp.h b/lib/curl_rtsp.h
similarity index 100%
rename from lib/rtsp.h
rename to lib/curl_rtsp.h
diff --git a/lib/select.h b/lib/curl_select.h
similarity index 100%
rename from lib/select.h
rename to lib/curl_select.h
diff --git a/lib/sendf.h b/lib/curl_sendf.h
similarity index 100%
rename from lib/sendf.h
rename to lib/curl_sendf.h
diff --git a/lib/setup.h b/lib/curl_setup.h
similarity index 100%
rename from lib/setup.h
rename to lib/curl_setup.h
diff --git a/lib/setup_once.h b/lib/curl_setup_once.h
similarity index 100%
rename from lib/setup_once.h
rename to lib/curl_setup_once.h
diff --git a/lib/share.h b/lib/curl_share.h
similarity index 100%
rename from lib/share.h
rename to lib/curl_share.h
diff --git a/lib/slist.h b/lib/curl_slist.h
similarity index 100%
rename from lib/slist.h
rename to lib/curl_slist.h
diff --git a/lib/smtp.h b/lib/curl_smtp.h
similarity index 100%
rename from lib/smtp.h
rename to lib/curl_smtp.h
diff --git a/lib/sockaddr.h b/lib/curl_sockaddr.h
similarity index 100%
rename from lib/sockaddr.h
rename to lib/curl_sockaddr.h
diff --git a/lib/socks.h b/lib/curl_socks.h
similarity index 100%
rename from lib/socks.h
rename to lib/curl_socks.h
diff --git a/lib/speedcheck.h b/lib/curl_speedcheck.h
similarity index 100%
rename from lib/speedcheck.h
rename to lib/curl_speedcheck.h
diff --git a/lib/splay.h b/lib/curl_splay.h
similarity index 100%
rename from lib/splay.h
rename to lib/curl_splay.h
diff --git a/lib/ssh.h b/lib/curl_ssh.h
similarity index 100%
rename from lib/ssh.h
rename to lib/curl_ssh.h
diff --git a/lib/sslgen.h b/lib/curl_sslgen.h
similarity index 100%
rename from lib/sslgen.h
rename to lib/curl_sslgen.h
diff --git a/lib/ssluse.h b/lib/curl_ssluse.h
similarity index 100%
rename from lib/ssluse.h
rename to lib/curl_ssluse.h
diff --git a/lib/strdup.h b/lib/curl_strdup.h
similarity index 100%
rename from lib/strdup.h
rename to lib/curl_strdup.h
diff --git a/lib/strequal.h b/lib/curl_strequal.h
similarity index 100%
rename from lib/strequal.h
rename to lib/curl_strequal.h
diff --git a/lib/strerror.h b/lib/curl_strerror.h
similarity index 100%
rename from lib/strerror.h
rename to lib/curl_strerror.h
diff --git a/lib/strtok.h b/lib/curl_strtok.h
similarity index 100%
rename from lib/strtok.h
rename to lib/curl_strtok.h
diff --git a/lib/strtoofft.h b/lib/curl_strtoofft.h
similarity index 100%
rename from lib/strtoofft.h
rename to lib/curl_strtoofft.h
diff --git a/lib/telnet.h b/lib/curl_telnet.h
similarity index 100%
rename from lib/telnet.h
rename to lib/curl_telnet.h
diff --git a/lib/tftp.h b/lib/curl_tftp.h
similarity index 100%
rename from lib/tftp.h
rename to lib/curl_tftp.h
diff --git a/lib/timeval.h b/lib/curl_timeval.h
similarity index 100%
rename from lib/timeval.h
rename to lib/curl_timeval.h
diff --git a/lib/transfer.h b/lib/curl_transfer.h
similarity index 100%
rename from lib/transfer.h
rename to lib/curl_transfer.h
diff --git a/lib/url.h b/lib/curl_url.h
similarity index 100%
rename from lib/url.h
rename to lib/curl_url.h
diff --git a/lib/urldata.h b/lib/curl_urldata.h
similarity index 100%
rename from lib/urldata.h
rename to lib/curl_urldata.h
diff --git a/lib/warnless.h b/lib/curl_warnless.h
similarity index 100%
rename from lib/warnless.h
rename to lib/curl_warnless.h
diff --git a/lib/wildcard.h b/lib/curl_wildcard.h
similarity index 100%
rename from lib/wildcard.h
rename to lib/curl_wildcard.h