diff --git a/lib/Makefile.Watcom b/lib/Makefile.Watcom
index 5088875aeafa0236587fd596d7677d147aa62a40..5158b23c37deab67e3bcdfdab1f38230eae73978 100644
--- a/lib/Makefile.Watcom
+++ b/lib/Makefile.Watcom
@@ -118,7 +118,7 @@ $(OBJ_DIR)\base64.obj: base64.c setup.h config-win32.h ..\include\curl\curlbuild
..\include\curl\curlrules.h ..\include\curl\easy.h &
..\include\curl\multi.h urldata.h cookie.h ..\include\curl\curl.h &
formdata.h timeval.h http_chunks.h hostip.h hash.h llist.h splay.h &
- easyif.h base64.h memory.h memdebug.h
+ easyif.h curl_base64.h memory.h memdebug.h
$(OBJ_DIR)\hostip.obj: hostip.c setup.h config-win32.h ..\include\curl\curlbuild.h &
..\include\curl\curlrules.h setup_once.h urldata.h cookie.h &
..\include\curl\curl.h ..\include\curl\curlver.h &
@@ -154,7 +154,7 @@ $(OBJ_DIR)\http.obj: http.c setup.h config-win32.h ..\include\curl\curlbuild.h &
..\include\curl\curlrules.h ..\include\curl\easy.h &
..\include\curl\multi.h ..\include\curl\curl.h formdata.h timeval.h &
http_chunks.h hostip.h hash.h llist.h splay.h transfer.h sendf.h &
- easyif.h progress.h base64.h strequal.h sslgen.h http_digest.h &
+ easyif.h progress.h curl_base64.h strequal.h sslgen.h http_digest.h &
http_ntlm.h http_negotiate.h url.h share.h http.h memory.h select.h &
parsedate.h strtoofft.h multiif.h ..\include\curl\mprintf.h memdebug.h
$(OBJ_DIR)\sendf.obj: sendf.c setup.h config-win32.h ..\include\curl\curlbuild.h &
@@ -206,7 +206,7 @@ $(OBJ_DIR)\ldap.obj: ldap.c setup.h config-win32.h ..\include\curl\curlbuild.h &
..\include\curl\curlrules.h ..\include\curl\easy.h &
..\include\curl\multi.h ..\include\curl\curl.h formdata.h timeval.h &
http_chunks.h hostip.h hash.h llist.h splay.h sendf.h escape.h &
- transfer.h strequal.h strtok.h curl_ldap.h memory.h base64.h &
+ transfer.h strequal.h strtok.h curl_ldap.h memory.h curl_base64.h &
..\include\curl\mprintf.h memdebug.h
$(OBJ_DIR)\ssluse.obj: ssluse.c setup.h config-win32.h ..\include\curl\curlbuild.h &
..\include\curl\curlrules.h setup_once.h urldata.h cookie.h &
@@ -343,7 +343,7 @@ $(OBJ_DIR)\http_digest.obj: http_digest.c setup.h config-win32.h &
..\include\curl\curlrules.h ..\include\curl\easy.h &
..\include\curl\multi.h ..\include\curl\curl.h formdata.h timeval.h &
http_chunks.h hostip.h hash.h llist.h splay.h sendf.h strequal.h &
- base64.h curl_md5.h http_digest.h strtok.h url.h memory.h easyif.h &
+ curl_base64.h curl_md5.h http_digest.h strtok.h url.h memory.h easyif.h &
..\include\curl\mprintf.h memdebug.h
$(OBJ_DIR)\md5.obj: md5.c setup.h config-win32.h ..\include\curl\curlbuild.h &
..\include\curl\curlrules.h setup_once.h curl_md5.h
@@ -355,7 +355,7 @@ $(OBJ_DIR)\http_ntlm.obj: http_ntlm.c setup.h config-win32.h &
..\include\curl\curlrules.h ..\include\curl\easy.h &
..\include\curl\multi.h ..\include\curl\curl.h formdata.h timeval.h &
http_chunks.h hostip.h hash.h llist.h splay.h easyif.h sendf.h &
- strequal.h base64.h http_ntlm.h url.h memory.h ssluse.h &
+ strequal.h curl_base64.h http_ntlm.h url.h memory.h ssluse.h &
..\include\curl\mprintf.h memdebug.h
$(OBJ_DIR)\inet_pton.obj: inet_pton.c setup.h config-win32.h &
..\include\curl\curlbuild.h ..\include\curl\curlrules.h setup_once.h &
diff --git a/lib/Makefile.inc b/lib/Makefile.inc
index 414e1d34232e4e88ad8c1ed029d7e7fca080de79..8cb9a7425ee329651bef8abeb6914b8f90a448d8 100644
--- a/lib/Makefile.inc
+++ b/lib/Makefile.inc
@@ -11,7 +11,7 @@ CSOURCES = file.c timeval.c base64.c hostip.c progress.c formdata.c \
inet_ntop.c parsedate.c select.c gtls.c sslgen.c tftp.c splay.c \
strdup.c socks.c ssh.c nss.c qssl.c
-HHEADERS = arpa_telnet.h netrc.h file.h timeval.h base64.h hostip.h \
+HHEADERS = arpa_telnet.h netrc.h file.h timeval.h qssl.h hostip.h \
progress.h formdata.h cookie.h http.h sendf.h ftp.h url.h dict.h \
if2ip.h speedcheck.h urldata.h curl_ldap.h ssluse.h escape.h telnet.h \
getinfo.h strequal.h krb4.h memdebug.h inet_ntoa_r.h http_chunks.h \
@@ -20,4 +20,4 @@ HHEADERS = arpa_telnet.h netrc.h file.h timeval.h base64.h hostip.h \
strtoofft.h strerror.h inet_ntop.h curlx.h memory.h setup.h \
transfer.h select.h easyif.h multiif.h parsedate.h sslgen.h gtls.h \
tftp.h sockaddr.h splay.h strdup.h setup_once.h socks.h ssh.h nssg.h \
- qssl.h
+ curl_base64.h
diff --git a/lib/base64.c b/lib/base64.c
index 9edc83212a93a27f77c8f6718903a80deca2e2e9..6b9331083f4ddfb1abe271751b8cafc66dda35a6 100644
--- a/lib/base64.c
+++ b/lib/base64.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2007, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2008, 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
@@ -42,7 +42,7 @@
#include "urldata.h" /* for the SessionHandle definition */
#include "easyif.h" /* for Curl_convert_... prototypes */
-#include "base64.h"
+#include "curl_base64.h"
#include "memory.h"
/* include memdebug.h last */
diff --git a/lib/base64.h b/lib/curl_base64.h
similarity index 91%
rename from lib/base64.h
rename to lib/curl_base64.h
index 59742bcd3a07e11337569c75e4e1c4d3a20c8fa3..c98fd196c464df2563ac8facbf675a779c6f8144 100644
--- a/lib/base64.h
+++ b/lib/curl_base64.h
@@ -1,5 +1,5 @@
-#ifndef __BASE64_H
-#define __BASE64_H
+#ifndef __CURL_BASE64_H
+#define __CURL_BASE64_H
/***************************************************************************
* _ _ ____ _
* Project ___| | | | _ \| |
@@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2007, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2008, 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
diff --git a/lib/http.c b/lib/http.c
index 42aa45718cd3bff22d6e58324a37944e5f75793e..fde46dd0e66bad6e5b58a4d82540ac9705b0d54b 100644
--- a/lib/http.c
+++ b/lib/http.c
@@ -81,7 +81,7 @@
#include "easyif.h" /* for Curl_convert_... prototypes */
#include "formdata.h"
#include "progress.h"
-#include "base64.h"
+#include "curl_base64.h"
#include "cookie.h"
#include "strequal.h"
#include "sslgen.h"
diff --git a/lib/http_digest.c b/lib/http_digest.c
index 0132a84e387cda0d380e731fa2855b9d9ad650a4..82096c3f7a7e019b692e4df9cb29ff84b809faab 100644
--- a/lib/http_digest.c
+++ b/lib/http_digest.c
@@ -33,7 +33,7 @@
#include "urldata.h"
#include "sendf.h"
#include "strequal.h"
-#include "base64.h"
+#include "curl_base64.h"
#include "curl_md5.h"
#include "http_digest.h"
#include "strtok.h"
diff --git a/lib/http_negotiate.c b/lib/http_negotiate.c
index d47c9aecd9cee78a7f0fdd85bb3974c52fe228c5..80c00a1716a08fbe0d23ee2445aed8bc4cdce020 100644
--- a/lib/http_negotiate.c
+++ b/lib/http_negotiate.c
@@ -38,7 +38,7 @@
#include "urldata.h"
#include "sendf.h"
#include "strequal.h"
-#include "base64.h"
+#include "curl_base64.h"
#include "http_negotiate.h"
#include "memory.h"
diff --git a/lib/http_ntlm.c b/lib/http_ntlm.c
index 89e5f962c8a85a8d2ea9d34d25edd0728f42457c..ebc8e73f22541923302addddb3a6174de288ea34 100644
--- a/lib/http_ntlm.c
+++ b/lib/http_ntlm.c
@@ -56,7 +56,7 @@
#include "easyif.h" /* for Curl_convert_... prototypes */
#include "sendf.h"
#include "strequal.h"
-#include "base64.h"
+#include "curl_base64.h"
#include "http_ntlm.h"
#include "url.h"
#include "memory.h"
diff --git a/lib/krb4.c b/lib/krb4.c
index 42ae753c5951999e43d5f20d0dc43c97490dacf0..84ce9e6bb870b5c5a63b3b4151a0d9e3917d948c 100644
--- a/lib/krb4.c
+++ b/lib/krb4.c
@@ -58,7 +58,7 @@
#endif
#include "urldata.h"
-#include "base64.h"
+#include "curl_base64.h"
#include "ftp.h"
#include "sendf.h"
#include "krb4.h"
diff --git a/lib/krb5.c b/lib/krb5.c
index 552ea25dc0b9aa0e1156b9cb9b67d9a891f81de8..5b921d9c033d9c2d8373d75e3c01336f7721a086 100644
--- a/lib/krb5.c
+++ b/lib/krb5.c
@@ -2,6 +2,7 @@
*
* Copyright (c) 1995, 1996, 1997, 1998, 1999 Kungliga Tekniska Högskolan
* (Royal Institute of Technology, Stockholm, Sweden).
+ * Copyright (c) 2004 - 2008 Daniel Stenberg
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -56,7 +57,7 @@
#endif
#include "urldata.h"
-#include "base64.h"
+#include "curl_base64.h"
#include "ftp.h"
#include "sendf.h"
#include "krb4.h"
diff --git a/lib/ldap.c b/lib/ldap.c
index 4f5625c404327832b0df68aa1db17c338ae2e895..816b46faf73dcba64fd9916aa283e17acf412fd1 100644
--- a/lib/ldap.c
+++ b/lib/ldap.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2007, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2008, 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
@@ -74,7 +74,7 @@
#include "strtok.h"
#include "curl_ldap.h"
#include "memory.h"
-#include "base64.h"
+#include "curl_base64.h"
#define _MPRINTF_REPLACE /* use our functions only */
#include <curl/mprintf.h>
diff --git a/lib/security.c b/lib/security.c
index da1e2fddeaa271e4041c875ed2bbc72ce882ec4e..bec751045e275ee4f5e839aff2f4406b26f8374d 100644
--- a/lib/security.c
+++ b/lib/security.c
@@ -62,7 +62,7 @@
#include "urldata.h"
#include "krb4.h"
-#include "base64.h"
+#include "curl_base64.h"
#include "sendf.h"
#include "ftp.h"
#include "memory.h"
diff --git a/tests/server/getpart.c b/tests/server/getpart.c
index 0b327030b692e1a0a78ddec387d8fd4a02a67f92..72a6d0f6da4925c0d482a78e9fe80a58bd2c6869 100644
--- a/tests/server/getpart.c
+++ b/tests/server/getpart.c
@@ -33,7 +33,7 @@ struct SessionHandle {
int fake;
};
-#include "base64.h"
+#include "curl_base64.h"
/* include memdebug.h last */
#include "memdebug.h"