diff --git a/ares/CHANGES b/ares/CHANGES
index 198beb8d9fad8118b7c6d2de679265a24407f263..798787421971d110eb0bea553e91334c5b4b64fc 100644
--- a/ares/CHANGES
+++ b/ares/CHANGES
@@ -1,5 +1,8 @@
   Changelog for the c-ares project
 
+* November 2, 2009 (Yang Tse)
+- Renamed c-ares setup.h to ares_setup.h
+
 * October 31, 2009 (Yang Tse)
 - Symbol hiding configure options are named now --enable-symbol-hiding
   and --disable-symbol-hiding in an attempt to make them less ambiguous.
diff --git a/ares/Makefile.am b/ares/Makefile.am
index 9a49258451f5eb8fe7f922a142a553f8fce33ee7..e8b702045130ef940370206861833552cafd8d77 100644
--- a/ares/Makefile.am
+++ b/ares/Makefile.am
@@ -18,7 +18,7 @@ ACLOCAL_AMFLAGS = -I m4
 # $(top_builddir)/../lib is for libcurl's generated lib/curl_config.h file
 # $(top_srcdir)/../lib is for libcurl's lib/setup.h and other "private" files
 # $(top_builddir) is for c-ares's generated ares_config.h file
-# $(top_srcdir) is for c-ares's lib/setup.h and other "c-ares-private" files
+# $(top_srcdir) is for c-ares's ares_setup.h and other "c-ares-private" files
 
 if CURLDEBUG
 INCLUDES = -I$(top_builddir)/../include \
diff --git a/ares/Makefile.inc b/ares/Makefile.inc
index e383ebb825e1db30d21f427bb652763d3da13a51..04ab7a12ecaac68d55956fc21e79802ba982fb90 100644
--- a/ares/Makefile.inc
+++ b/ares/Makefile.inc
@@ -55,7 +55,7 @@ HHEADERS = ares.h			\
   inet_net_pton.h			\
   inet_ntop.h				\
   nameser.h				\
-  setup.h				\
+  ares_setup.h				\
   setup_once.h
 
 MANPAGES = ares_cancel.3		\
diff --git a/ares/Makefile.vc6 b/ares/Makefile.vc6
index b0af61310df1e733070e977da59963ecbe6062e4..4d68f3718f6165248c9aceebade965e2e4bdc37e 100644
--- a/ares/Makefile.vc6
+++ b/ares/Makefile.vc6
@@ -159,117 +159,117 @@ vclean realclean: clean
 #
 # Copyright "gcc -MM .."
 #
-$(OBJ_DIR)\ares_fds.obj: ares_fds.c setup.h setup_once.h ares.h ares_private.h \
+$(OBJ_DIR)\ares_fds.obj: ares_fds.c ares_setup.h setup_once.h ares.h ares_private.h \
   ares_ipv6.h ares_build.h ares_rules.h
 
-$(OBJ_DIR)\ares_process.obj: ares_process.c setup.h setup_once.h nameser.h     \
+$(OBJ_DIR)\ares_process.obj: ares_process.c ares_setup.h setup_once.h nameser.h     \
   ares.h ares_dns.h ares_private.h ares_ipv6.h ares_build.h ares_rules.h
 
-$(OBJ_DIR)\ares_free_hostent.obj: ares_free_hostent.c setup.h setup_once.h     \
+$(OBJ_DIR)\ares_free_hostent.obj: ares_free_hostent.c ares_setup.h setup_once.h     \
   ares.h ares_private.h ares_ipv6.h ares_build.h ares_rules.h
 
-$(OBJ_DIR)\ares_query.obj: ares_query.c setup.h setup_once.h nameser.h         \
+$(OBJ_DIR)\ares_query.obj: ares_query.c ares_setup.h setup_once.h nameser.h         \
   ares.h ares_dns.h ares_private.h ares_ipv6.h ares_build.h ares_rules.h
 
-$(OBJ_DIR)\ares__close_sockets.obj: ares__close_sockets.c setup.h setup_once.h \
+$(OBJ_DIR)\ares__close_sockets.obj: ares__close_sockets.c ares_setup.h setup_once.h \
   ares.h ares_private.h ares_ipv6.h ares_build.h ares_rules.h
 
-$(OBJ_DIR)\ares_free_string.obj: ares_free_string.c setup.h setup_once.h       \
+$(OBJ_DIR)\ares_free_string.obj: ares_free_string.c ares_setup.h setup_once.h       \
   ares.h ares_build.h ares_rules.h
 
-$(OBJ_DIR)\ares_search.obj: ares_search.c setup.h setup_once.h nameser.h       \
+$(OBJ_DIR)\ares_search.obj: ares_search.c ares_setup.h setup_once.h nameser.h       \
   ares.h ares_private.h ares_ipv6.h ares_build.h ares_rules.h
 
-$(OBJ_DIR)\ares__get_hostent.obj: ares__get_hostent.c setup.h setup_once.h     \
+$(OBJ_DIR)\ares__get_hostent.obj: ares__get_hostent.c ares_setup.h setup_once.h     \
   ares.h ares_private.h ares_ipv6.h inet_net_pton.h ares_build.h ares_rules.h
 
-$(OBJ_DIR)\ares_gethostbyaddr.obj: ares_gethostbyaddr.c setup.h setup_once.h   \
+$(OBJ_DIR)\ares_gethostbyaddr.obj: ares_gethostbyaddr.c ares_setup.h setup_once.h   \
   nameser.h ares.h ares_private.h ares_ipv6.h inet_net_pton.h ares_build.h     \
   ares_rules.h
 
-$(OBJ_DIR)\ares_send.obj: ares_send.c setup.h setup_once.h nameser.h ares.h    \
+$(OBJ_DIR)\ares_send.obj: ares_send.c ares_setup.h setup_once.h nameser.h ares.h    \
   ares_dns.h ares_private.h ares_ipv6.h ares_build.h ares_rules.h
 
-$(OBJ_DIR)\ares__read_line.obj: ares__read_line.c setup.h setup_once.h ares.h  \
+$(OBJ_DIR)\ares__read_line.obj: ares__read_line.c ares_setup.h setup_once.h ares.h  \
   ares_private.h ares_ipv6.h ares_build.h ares_rules.h
 
-$(OBJ_DIR)\ares_gethostbyname.obj: ares_gethostbyname.c setup.h setup_once.h   \
+$(OBJ_DIR)\ares_gethostbyname.obj: ares_gethostbyname.c ares_setup.h setup_once.h   \
   nameser.h ares.h ares_private.h ares_ipv6.h inet_net_pton.h bitncmp.h        \
   ares_build.h ares_rules.h
 
-$(OBJ_DIR)\ares_strcasecmp.obj: ares_strcasecmp.c setup.h setup_once.h ares.h  \
+$(OBJ_DIR)\ares_strcasecmp.obj: ares_strcasecmp.c ares_setup.h setup_once.h ares.h  \
   ares_build.h ares_rules.h
 
-$(OBJ_DIR)\ares_strerror.obj: ares_strerror.c setup.h setup_once.h ares.h      \
+$(OBJ_DIR)\ares_strerror.obj: ares_strerror.c ares_setup.h setup_once.h ares.h      \
   ares_build.h ares_rules.h
 
-$(OBJ_DIR)\ares_cancel.obj: ares_cancel.c setup.h setup_once.h ares.h          \
+$(OBJ_DIR)\ares_cancel.obj: ares_cancel.c ares_setup.h setup_once.h ares.h          \
   ares_private.h ares_ipv6.h ares_build.h ares_rules.h
 
-$(OBJ_DIR)\ares_init.obj: ares_init.c setup.h setup_once.h nameser.h ares.h    \
+$(OBJ_DIR)\ares_init.obj: ares_init.c ares_setup.h setup_once.h nameser.h ares.h    \
   ares_private.h ares_ipv6.h inet_net_pton.h ares_build.h ares_rules.h         \
   ares_library_init.h
 
-$(OBJ_DIR)\ares_timeout.obj: ares_timeout.c setup.h setup_once.h ares.h        \
+$(OBJ_DIR)\ares_timeout.obj: ares_timeout.c ares_setup.h setup_once.h ares.h        \
   ares_private.h ares_ipv6.h ares_build.h ares_rules.h
 
-$(OBJ_DIR)\ares__timeval.obj: ares__timeval.c setup.h setup_once.h ares.h      \
+$(OBJ_DIR)\ares__timeval.obj: ares__timeval.c ares_setup.h setup_once.h ares.h      \
   ares_private.h ares_ipv6.h ares_build.h ares_rules.h
 
-$(OBJ_DIR)\ares_destroy.obj: ares_destroy.c setup.h setup_once.h ares.h        \
+$(OBJ_DIR)\ares_destroy.obj: ares_destroy.c ares_setup.h setup_once.h ares.h        \
   ares_private.h ares_ipv6.h ares_build.h ares_rules.h
 
-$(OBJ_DIR)\ares_mkquery.obj: ares_mkquery.c setup.h setup_once.h nameser.h     \
+$(OBJ_DIR)\ares_mkquery.obj: ares_mkquery.c ares_setup.h setup_once.h nameser.h     \
   ares.h ares_dns.h ares_build.h ares_rules.h
 
-$(OBJ_DIR)\ares_version.obj: ares_version.c setup.h setup_once.h ares.h        \
+$(OBJ_DIR)\ares_version.obj: ares_version.c ares_setup.h setup_once.h ares.h        \
   ares_version.h ares_build.h ares_rules.h
 
-$(OBJ_DIR)\ares_expand_name.obj: ares_expand_name.c setup.h setup_once.h       \
+$(OBJ_DIR)\ares_expand_name.obj: ares_expand_name.c ares_setup.h setup_once.h       \
   nameser.h ares.h ares_private.h ares_ipv6.h ares_build.h ares_rules.h
 
-$(OBJ_DIR)\ares_parse_a_reply.obj: ares_parse_a_reply.c setup.h setup_once.h   \
+$(OBJ_DIR)\ares_parse_a_reply.obj: ares_parse_a_reply.c ares_setup.h setup_once.h   \
   nameser.h ares.h ares_dns.h ares_private.h ares_ipv6.h ares_build.h          \
   ares_rules.h
 
-$(OBJ_DIR)\windows_port.obj: windows_port.c setup.h setup_once.h nameser.h     \
+$(OBJ_DIR)\windows_port.obj: windows_port.c ares_setup.h setup_once.h nameser.h     \
   ares.h ares_private.h ares_ipv6.h ares_build.h ares_rules.h
 
-$(OBJ_DIR)\ares_expand_string.obj: ares_expand_string.c setup.h setup_once.h   \
+$(OBJ_DIR)\ares_expand_string.obj: ares_expand_string.c ares_setup.h setup_once.h   \
   nameser.h ares.h ares_private.h ares_ipv6.h ares_build.h ares_rules.h
 
-$(OBJ_DIR)\ares_parse_ptr_reply.obj: ares_parse_ptr_reply.c setup.h            \
+$(OBJ_DIR)\ares_parse_ptr_reply.obj: ares_parse_ptr_reply.c ares_setup.h            \
   setup_once.h nameser.h ares.h ares_dns.h ares_private.h ares_ipv6.h          \
   ares_build.h ares_rules.h
 
-$(OBJ_DIR)\ares_parse_aaaa_reply.obj: ares_parse_aaaa_reply.c setup.h          \
+$(OBJ_DIR)\ares_parse_aaaa_reply.obj: ares_parse_aaaa_reply.c ares_setup.h          \
   setup_once.h nameser.h ares.h ares_dns.h inet_net_pton.h ares_private.h      \
   ares_ipv6.h ares_build.h ares_rules.h
 
-$(OBJ_DIR)\ares_parse_ns_reply.obj: ares_parse_ns_reply.c setup.h              \
+$(OBJ_DIR)\ares_parse_ns_reply.obj: ares_parse_ns_reply.c ares_setup.h              \
   setup_once.h nameser.h ares.h ares_dns.h ares_private.h ares_ipv6.h          \
   ares_build.h ares_rules.h
 
-$(OBJ_DIR)\ares_getnameinfo.obj: ares_getnameinfo.c setup.h setup_once.h       \
+$(OBJ_DIR)\ares_getnameinfo.obj: ares_getnameinfo.c ares_setup.h setup_once.h       \
   nameser.h ares.h ares_private.h ares_ipv6.h inet_ntop.h ares_build.h         \
   ares_rules.h
 
-$(OBJ_DIR)\inet_net_pton.obj: inet_net_pton.c setup.h setup_once.h nameser.h   \
+$(OBJ_DIR)\inet_net_pton.obj: inet_net_pton.c ares_setup.h setup_once.h nameser.h   \
   ares_ipv6.h inet_net_pton.h ares_build.h ares_rules.h
 
 $(OBJ_DIR)\bitncmp.obj: bitncmp.c bitncmp.h ares_build.h ares_rules.h
 
-$(OBJ_DIR)\inet_ntop.obj: inet_ntop.c setup.h setup_once.h nameser.h           \
+$(OBJ_DIR)\inet_ntop.obj: inet_ntop.c ares_setup.h setup_once.h nameser.h           \
   ares_ipv6.h inet_ntop.h ares_build.h ares_rules.h
 
 $(OBJ_DIR)\ares_getopt.obj: ares_getopt.c ares_getopt.h ares_build.h           \
   ares_rules.h
 
-$(OBJ_DIR)\ares_library_init.obj: ares_library_init.c setup.h setup_once.h     \
+$(OBJ_DIR)\ares_library_init.obj: ares_library_init.c ares_setup.h setup_once.h     \
   ares.h ares_private.h ares_library_init.h ares_build.h ares_rules.h
 
-$(OBJ_DIR)\ares_llist.obj: ares_llist.c setup.h setup_once.h ares.h            \
+$(OBJ_DIR)\ares_llist.obj: ares_llist.c ares_setup.h setup_once.h ares.h            \
   ares_private.h ares_llist.h ares_build.h ares_rules.h
 
-$(OBJ_DIR)\ares_writev.obj: ares_writev.c setup.h setup_once.h ares.h          \
+$(OBJ_DIR)\ares_writev.obj: ares_writev.c ares_setup.h setup_once.h ares.h          \
   ares_writev.h ares_build.h ares_rules.h
diff --git a/ares/acountry.c b/ares/acountry.c
index 92707f3a9d96c076822385c6a9233668772dc415..e61613c506154962bc50224109f4ae22a52b4340 100644
--- a/ares/acountry.c
+++ b/ares/acountry.c
@@ -33,7 +33,7 @@
  * without express or implied warranty.
  */
 
-#include "setup.h"
+#include "ares_setup.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/ares/adig.c b/ares/adig.c
index 3a5c3da9e5a78f7420cd3ccb4ba35bb18c3a6f2f..8488d97e91092893ed18168aa6b19c6d7bd97520 100644
--- a/ares/adig.c
+++ b/ares/adig.c
@@ -15,7 +15,7 @@
  * without express or implied warranty.
  */
 
-#include "setup.h"
+#include "ares_setup.h"
 
 #ifdef HAVE_SYS_SOCKET_H
 #  include <sys/socket.h>
diff --git a/ares/ahost.c b/ares/ahost.c
index 0e6797e11fded442da97fa19f5fc0cb2ca6c7e1a..4e29340578f40502de1563999bee311c59cdd806 100644
--- a/ares/ahost.c
+++ b/ares/ahost.c
@@ -15,7 +15,7 @@
  * without express or implied warranty.
  */
 
-#include "setup.h"
+#include "ares_setup.h"
 
 #if !defined(WIN32) || defined(WATT32)
 #ifdef HAVE_SYS_TIME_H
diff --git a/ares/ares__close_sockets.c b/ares/ares__close_sockets.c
index 1becf9ab33458be66776a055f10c9a0ff1dfb520..d2476fdbb956300a130b43720d8ada26b793eb5e 100644
--- a/ares/ares__close_sockets.c
+++ b/ares/ares__close_sockets.c
@@ -15,7 +15,7 @@
  * without express or implied warranty.
  */
 
-#include "setup.h"
+#include "ares_setup.h"
 
 #include <stdlib.h>
 #ifdef HAVE_UNISTD_H
diff --git a/ares/ares__get_hostent.c b/ares/ares__get_hostent.c
index 9b1d4245f2a04cda6aac9fc47bbcf4c4112a21bf..18d300987f7acc93a4a22695e3349a95f45d119b 100644
--- a/ares/ares__get_hostent.c
+++ b/ares/ares__get_hostent.c
@@ -15,7 +15,7 @@
  * without express or implied warranty.
  */
 
-#include "setup.h"
+#include "ares_setup.h"
 
 #ifdef HAVE_SYS_SOCKET_H
 #  include <sys/socket.h>
diff --git a/ares/ares__read_line.c b/ares/ares__read_line.c
index d198b12a1d76f89f0d84c26f6bc2ecbf66c771fd..561b12e775390a7852a7156e52b1fa30076b351f 100644
--- a/ares/ares__read_line.c
+++ b/ares/ares__read_line.c
@@ -15,7 +15,7 @@
  * without express or implied warranty.
  */
 
-#include "setup.h"
+#include "ares_setup.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/ares/ares__timeval.c b/ares/ares__timeval.c
index 7437b5a18e8bb57a548e9b831a3b1ba20da6493b..8cf37e91c09a85d0bb6cc3cbd46d37aafecf0361 100644
--- a/ares/ares__timeval.c
+++ b/ares/ares__timeval.c
@@ -13,7 +13,7 @@
  * without express or implied warranty.
  */
 
-#include "setup.h"
+#include "ares_setup.h"
 #include "ares.h"
 #include "ares_private.h"
 
diff --git a/ares/ares_cancel.c b/ares/ares_cancel.c
index 63b1514e71a9f5ed8e82f09a106440e594a473af..a730a651ee3b28372df472e37e1b7699727951b3 100644
--- a/ares/ares_cancel.c
+++ b/ares/ares_cancel.c
@@ -13,7 +13,7 @@
  * without express or implied warranty.
  */
 
-#include "setup.h"
+#include "ares_setup.h"
 #include <assert.h>
 #include <stdlib.h>
 #include "ares.h"
diff --git a/ares/ares_destroy.c b/ares/ares_destroy.c
index ef5cdb8bc4325a011d4b0411c51419d8bd5e787a..2dfb694459243ffb227ff041e285ba64ff0c5e63 100644
--- a/ares/ares_destroy.c
+++ b/ares/ares_destroy.c
@@ -15,7 +15,7 @@
  * without express or implied warranty.
  */
 
-#include "setup.h"
+#include "ares_setup.h"
 #include <assert.h>
 #include <stdlib.h>
 #include "ares.h"
diff --git a/ares/ares_expand_name.c b/ares/ares_expand_name.c
index a1556e937e97720fd0b04494cf61b4aae784c2af..5a48b4d593a346db508b754b1f9e054ae9b40a07 100644
--- a/ares/ares_expand_name.c
+++ b/ares/ares_expand_name.c
@@ -15,7 +15,7 @@
  * without express or implied warranty.
  */
 
-#include "setup.h"
+#include "ares_setup.h"
 
 #ifdef HAVE_SYS_SOCKET_H
 #  include <sys/socket.h>
diff --git a/ares/ares_expand_string.c b/ares/ares_expand_string.c
index f2d4f748a5a8c50c3032973032c94b8b67bd231e..6ab8a775252991e98d5ccfbd4895a210d56d4312 100644
--- a/ares/ares_expand_string.c
+++ b/ares/ares_expand_string.c
@@ -15,7 +15,7 @@
  * without express or implied warranty.
  */
 
-#include "setup.h"
+#include "ares_setup.h"
 
 #ifdef HAVE_SYS_SOCKET_H
 #  include <sys/socket.h>
diff --git a/ares/ares_fds.c b/ares/ares_fds.c
index 4c6299a48a0f46dd5a92dc4b49df6f0a78c016f5..bbf5c454ab5be2355c2eed24ae5cead9b0a93e70 100644
--- a/ares/ares_fds.c
+++ b/ares/ares_fds.c
@@ -15,7 +15,7 @@
  * without express or implied warranty.
  */
 
-#include "setup.h"
+#include "ares_setup.h"
 
 #ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
diff --git a/ares/ares_free_hostent.c b/ares/ares_free_hostent.c
index d76679565a5bdf3c2fe210da1c7a53a9396891ec..623e1e247a939ce45fb7a256b8530e26b658da56 100644
--- a/ares/ares_free_hostent.c
+++ b/ares/ares_free_hostent.c
@@ -15,7 +15,7 @@
  * without express or implied warranty.
  */
 
-#include "setup.h"
+#include "ares_setup.h"
 #include <stdlib.h>
 
 #if !defined(WIN32) || defined(WATT32)
diff --git a/ares/ares_free_string.c b/ares/ares_free_string.c
index c5810b23a8360cd94f6809e41d4e2ffeff51fca7..dc27f5b340d6ec2e7e26e38b7b0c60a1f221c0b4 100644
--- a/ares/ares_free_string.c
+++ b/ares/ares_free_string.c
@@ -15,7 +15,7 @@
  * without express or implied warranty.
  */
 
-#include "setup.h"
+#include "ares_setup.h"
 #include <stdlib.h>
 #include "ares.h"
 #include "ares_private.h"
diff --git a/ares/ares_gethostbyaddr.c b/ares/ares_gethostbyaddr.c
index 63abc85e4b12e73fe23cade93950a71f1cdd1a0d..cafb15e1d58758d603d49cf8d9d4c6e0bab681f7 100644
--- a/ares/ares_gethostbyaddr.c
+++ b/ares/ares_gethostbyaddr.c
@@ -14,7 +14,7 @@
  * this software for any purpose.  It is provided "as is"
  * without express or implied warranty.
  */
-#include "setup.h"
+#include "ares_setup.h"
 
 #ifdef HAVE_SYS_SOCKET_H
 #  include <sys/socket.h>
diff --git a/ares/ares_gethostbyname.c b/ares/ares_gethostbyname.c
index d708dfb1410d0a42a146ce6c4e7feb8cb947a8fa..acf1a44d92f060ab6c79c11b21abc57799b42d04 100644
--- a/ares/ares_gethostbyname.c
+++ b/ares/ares_gethostbyname.c
@@ -15,7 +15,7 @@
  * without express or implied warranty.
  */
 
-#include "setup.h"
+#include "ares_setup.h"
 
 #ifdef HAVE_SYS_SOCKET_H
 #  include <sys/socket.h>
diff --git a/ares/ares_getnameinfo.c b/ares/ares_getnameinfo.c
index 2c5cf0e08bfeb5b7ae3d71e998b1b8dfeed123cf..ec0fac05d983d4a189f9f56db01fd6e6fe4e5d7e 100644
--- a/ares/ares_getnameinfo.c
+++ b/ares/ares_getnameinfo.c
@@ -14,7 +14,7 @@
  * this software for any purpose.  It is provided "as is"
  * without express or implied warranty.
  */
-#include "setup.h"
+#include "ares_setup.h"
 
 #ifdef HAVE_GETSERVBYPORT_R
 #  if !defined(GETSERVBYPORT_R_ARGS) || \
diff --git a/ares/ares_getsock.c b/ares/ares_getsock.c
index 38b8fefac8e07d66fcfdfdfd42db70b7169a614d..1c5e9ff2647ca6bff52dfc9b8102bbd4cde339b1 100644
--- a/ares/ares_getsock.c
+++ b/ares/ares_getsock.c
@@ -13,7 +13,7 @@
  * without express or implied warranty.
  */
 
-#include "setup.h"
+#include "ares_setup.h"
 
 #ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
diff --git a/ares/ares_init.c b/ares/ares_init.c
index 9f90f9e20b4cf3626fb058865156d9df61714d6d..f7973f14e31c22006ab5b5b30b40b328420d7fa8 100644
--- a/ares/ares_init.c
+++ b/ares/ares_init.c
@@ -16,7 +16,7 @@
  * without express or implied warranty.
  */
 
-#include "setup.h"
+#include "ares_setup.h"
 
 #if defined(WIN32) && !defined(WATT32)
 #include <iphlpapi.h>
diff --git a/ares/ares_library_init.c b/ares/ares_library_init.c
index f7286ad17dcddf71298318412ee07ac51bc58285..a2486ac7050933833620e726f9eb7dfcc06460b1 100644
--- a/ares/ares_library_init.c
+++ b/ares/ares_library_init.c
@@ -16,7 +16,7 @@
  * without express or implied warranty.
  */
 
-#include "setup.h"
+#include "ares_setup.h"
 
 #include "ares.h"
 #include "ares_library_init.h"
diff --git a/ares/ares_library_init.h b/ares/ares_library_init.h
index 6c596ba03993ac8d40333ac4c27f290507fcd239..d99a0bae17b1e112b5878ae2693719054c9444f1 100644
--- a/ares/ares_library_init.h
+++ b/ares/ares_library_init.h
@@ -19,7 +19,7 @@
  * without express or implied warranty.
  */
 
-#include "setup.h"
+#include "ares_setup.h"
 
 #ifdef WIN32
 
diff --git a/ares/ares_llist.c b/ares/ares_llist.c
index 77cbd4d079c22d8c69f30e7c9d08142d5a243de5..f261dc73b3dd686bf2fadc3a13e62bd3918169d4 100644
--- a/ares/ares_llist.c
+++ b/ares/ares_llist.c
@@ -15,7 +15,7 @@
  * without express or implied warranty.
  */
 
-#include "setup.h"
+#include "ares_setup.h"
 
 #include "ares.h"
 #include "ares_private.h"
diff --git a/ares/ares_mkquery.c b/ares/ares_mkquery.c
index 27ec1ee1b072865e10da806907e6494860b5c94a..56571885cb6f0fbd3654b91574f3ad2af8b65c27 100644
--- a/ares/ares_mkquery.c
+++ b/ares/ares_mkquery.c
@@ -15,7 +15,7 @@
  * without express or implied warranty.
  */
 
-#include "setup.h"
+#include "ares_setup.h"
 
 #ifdef HAVE_SYS_SOCKET_H
 #  include <sys/socket.h>
diff --git a/ares/ares_parse_a_reply.c b/ares/ares_parse_a_reply.c
index c2d809f2c66dc5d572142734ec2d3edcec78ee2a..3d59c8aa4c0815dc180ffda35dc5637e2b766163 100644
--- a/ares/ares_parse_a_reply.c
+++ b/ares/ares_parse_a_reply.c
@@ -15,7 +15,7 @@
  * without express or implied warranty.
  */
 
-#include "setup.h"
+#include "ares_setup.h"
 
 #ifdef HAVE_SYS_SOCKET_H
 #  include <sys/socket.h>
diff --git a/ares/ares_parse_aaaa_reply.c b/ares/ares_parse_aaaa_reply.c
index dd1d33b3033f0e46313d07e8c540047a4fca1eec..58c6b8ab84ec130964d84459abfbfd8f3a3aeaa6 100644
--- a/ares/ares_parse_aaaa_reply.c
+++ b/ares/ares_parse_aaaa_reply.c
@@ -16,7 +16,7 @@
  * without express or implied warranty.
  */
 
-#include "setup.h"
+#include "ares_setup.h"
 
 #ifdef HAVE_SYS_SOCKET_H
 #  include <sys/socket.h>
diff --git a/ares/ares_parse_ns_reply.c b/ares/ares_parse_ns_reply.c
index a7f4543c4347073e8c4e40d91d885eeca32b0573..25c632994a5233c74e1ca94c2e2b617065d0fd72 100644
--- a/ares/ares_parse_ns_reply.c
+++ b/ares/ares_parse_ns_reply.c
@@ -20,7 +20,7 @@
  *      on behalf of AVIRA Gmbh - http://www.avira.com
  */
 
-#include "setup.h"
+#include "ares_setup.h"
 
 #ifdef HAVE_SYS_SOCKET_H
 #  include <sys/socket.h>
diff --git a/ares/ares_parse_ptr_reply.c b/ares/ares_parse_ptr_reply.c
index b72f99521354a0146ec97f05d1bf1564c72489e3..9923a9da0e4bd639dc80aff4f4908b9a080ec137 100644
--- a/ares/ares_parse_ptr_reply.c
+++ b/ares/ares_parse_ptr_reply.c
@@ -15,7 +15,7 @@
  * without express or implied warranty.
  */
 
-#include "setup.h"
+#include "ares_setup.h"
 
 #ifdef HAVE_SYS_SOCKET_H
 #  include <sys/socket.h>
diff --git a/ares/ares_parse_srv_reply.c b/ares/ares_parse_srv_reply.c
index 9179d4d02ee8adeddc1b48a5d269b4176f96e33f..883331052e99cab167935fc7915da767d498f2b8 100644
--- a/ares/ares_parse_srv_reply.c
+++ b/ares/ares_parse_srv_reply.c
@@ -20,7 +20,7 @@
  *      on behalf of Red Hat - http://www.redhat.com
  */
 
-#include "setup.h"
+#include "ares_setup.h"
 
 #ifdef HAVE_SYS_SOCKET_H
 #  include <sys/socket.h>
diff --git a/ares/ares_parse_txt_reply.c b/ares/ares_parse_txt_reply.c
index 6a83b07094f15a32d01c25edf689bbf52156012c..583b64f1c3d163f237e9b3a1b4bf49e8ceb4e5ba 100644
--- a/ares/ares_parse_txt_reply.c
+++ b/ares/ares_parse_txt_reply.c
@@ -17,7 +17,7 @@
  * without express or implied warranty.
  */
 
-#include "setup.h"
+#include "ares_setup.h"
 
 #ifdef HAVE_SYS_SOCKET_H
 #  include <sys/socket.h>
diff --git a/ares/ares_process.c b/ares/ares_process.c
index 41d181132820fd061492e3d6148e2048492356f5..0bc3985d8d2607a6e6615dde1a8494b530e93da1 100644
--- a/ares/ares_process.c
+++ b/ares/ares_process.c
@@ -16,7 +16,7 @@
  * without express or implied warranty.
  */
 
-#include "setup.h"
+#include "ares_setup.h"
 
 #ifdef HAVE_SYS_SOCKET_H
 #  include <sys/socket.h>
diff --git a/ares/ares_query.c b/ares/ares_query.c
index 0d1f0368107b8d8b119491281cad08518aea776b..2a717fb3c6099f2bab4243ef4a783166c7e1eabf 100644
--- a/ares/ares_query.c
+++ b/ares/ares_query.c
@@ -15,7 +15,7 @@
  * without express or implied warranty.
  */
 
-#include "setup.h"
+#include "ares_setup.h"
 
 #ifdef HAVE_SYS_SOCKET_H
 #  include <sys/socket.h>
diff --git a/ares/ares_search.c b/ares/ares_search.c
index 9ab48e0e180569dc829e25de380540ed3065f2ef..8673c289f96a79ecfb24bf7da451e4207aeec2b9 100644
--- a/ares/ares_search.c
+++ b/ares/ares_search.c
@@ -15,7 +15,7 @@
  * without express or implied warranty.
  */
 
-#include "setup.h"
+#include "ares_setup.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/ares/ares_send.c b/ares/ares_send.c
index 54e4861852c36c23e7f7f15d1778fa52a1959c52..c2b006537fd0b21d311403b7ca25f768c6b253f3 100644
--- a/ares/ares_send.c
+++ b/ares/ares_send.c
@@ -15,7 +15,7 @@
  * without express or implied warranty.
  */
 
-#include "setup.h"
+#include "ares_setup.h"
 
 #ifdef HAVE_SYS_SOCKET_H
 #  include <sys/socket.h>
diff --git a/ares/setup.h b/ares/ares_setup.h
similarity index 98%
rename from ares/setup.h
rename to ares/ares_setup.h
index 6959fe7df4786d4cd23087cd7309052a3fd7d965..589643716def0c1375529ff02f2df358635eba4a 100644
--- a/ares/setup.h
+++ b/ares/ares_setup.h
@@ -1,5 +1,5 @@
-#ifndef __ARES_SETUP_H
-#define __ARES_SETUP_H
+#ifndef HEADER_CARES_SETUP_H
+#define HEADER_CARES_SETUP_H
 
 /* $Id$ */
 
@@ -184,4 +184,4 @@
 #include "setup_once.h"
 #endif
 
-#endif /* __ARES_SETUP_H */
+#endif /* HEADER_CARES_SETUP_H */
diff --git a/ares/ares_strcasecmp.c b/ares/ares_strcasecmp.c
index c3d1df9fce74b119ebe919efbd686722cd2a0251..30d64b9116266ad2d39a770e5856dd0be86d4dee 100644
--- a/ares/ares_strcasecmp.c
+++ b/ares/ares_strcasecmp.c
@@ -16,7 +16,7 @@
  * without express or implied warranty.
  */
 
-#include "setup.h"
+#include "ares_setup.h"
 #include "ares_strcasecmp.h"
 
 #ifndef HAVE_STRCASECMP
diff --git a/ares/ares_strcasecmp.h b/ares/ares_strcasecmp.h
index 85b053a9bb0a357d956382513d084a2d23d2b5d5..28164d74b8c253d41781d0c0c47dd8b4621d9241 100644
--- a/ares/ares_strcasecmp.h
+++ b/ares/ares_strcasecmp.h
@@ -18,7 +18,7 @@
  * without express or implied warranty.
  */
 
-#include "setup.h"
+#include "ares_setup.h"
 
 #ifndef HAVE_STRCASECMP
 extern int ares_strcasecmp(const char *a, const char *b);
diff --git a/ares/ares_strdup.c b/ares/ares_strdup.c
index 31137a3430327a440ffc0575c805fcc23534494f..6742c6f6b5f03f1abc4fce71cb482dd17cb190bc 100644
--- a/ares/ares_strdup.c
+++ b/ares/ares_strdup.c
@@ -16,7 +16,7 @@
  * without express or implied warranty.
  */
 
-#include "setup.h"
+#include "ares_setup.h"
 #include "ares_strdup.h"
 
 #ifndef HAVE_STRDUP
diff --git a/ares/ares_strdup.h b/ares/ares_strdup.h
index 33df619bc38bd782efbd15343de301e161180a2f..980da526397be4deaf2699f8ef7d82bda59bc45b 100644
--- a/ares/ares_strdup.h
+++ b/ares/ares_strdup.h
@@ -18,7 +18,7 @@
  * without express or implied warranty.
  */
 
-#include "setup.h"
+#include "ares_setup.h"
 
 #ifndef HAVE_STRDUP
 extern char *ares_strdup(const char *s1);
diff --git a/ares/ares_strerror.c b/ares/ares_strerror.c
index 1265cee09c461785b7d956322692b72ecd9d804b..70af5b68daa2fbac678d56d6098fbebb2194a23f 100644
--- a/ares/ares_strerror.c
+++ b/ares/ares_strerror.c
@@ -15,7 +15,7 @@
  * without express or implied warranty.
  */
 
-#include "setup.h"
+#include "ares_setup.h"
 #include <assert.h>
 #include "ares.h"
 
diff --git a/ares/ares_timeout.c b/ares/ares_timeout.c
index 18ef6e8cad7a42c480fcea4e6ede99e3497fe2c9..72ea0dc3fc337e1134b0ec4c575a292d3935c3c8 100644
--- a/ares/ares_timeout.c
+++ b/ares/ares_timeout.c
@@ -15,7 +15,7 @@
  * without express or implied warranty.
  */
 
-#include "setup.h"
+#include "ares_setup.h"
 
 #ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
diff --git a/ares/ares_version.c b/ares/ares_version.c
index 25f8e77cbc52ec5b9a97fc97ae276ec7098daa7c..0f7d03710558e8aded0bb287634db2a7c115d49b 100644
--- a/ares/ares_version.c
+++ b/ares/ares_version.c
@@ -1,6 +1,6 @@
 /* $Id$ */
 
-#include "setup.h"
+#include "ares_setup.h"
 #include "ares.h"
 
 const char *ares_version(int *version)
diff --git a/ares/ares_writev.c b/ares/ares_writev.c
index 96cf543dc21507b6f5f3c82aa23893f768aa6899..4c12942d791777dc9716a334d137948bdccfd467 100644
--- a/ares/ares_writev.c
+++ b/ares/ares_writev.c
@@ -16,7 +16,7 @@
  * without express or implied warranty.
  */
 
-#include "setup.h"
+#include "ares_setup.h"
 
 #ifdef HAVE_LIMITS_H
 #  include <limits.h>
diff --git a/ares/ares_writev.h b/ares/ares_writev.h
index f5850ef5a124ed8d269f7a2eda6d9c0e372a4c60..860b2943ff2a30213604a7dec0b5df0dd2603bc1 100644
--- a/ares/ares_writev.h
+++ b/ares/ares_writev.h
@@ -18,7 +18,7 @@
  * without express or implied warranty.
  */
 
-#include "setup.h"
+#include "ares_setup.h"
 #include "ares.h"
 
 #ifndef HAVE_WRITEV
diff --git a/ares/bitncmp.c b/ares/bitncmp.c
index 30891861f54390b63a9b504b2d83d724827b2bbb..2ec8dc58bbe8f2d60111f7cd2568983f0854a443 100644
--- a/ares/bitncmp.c
+++ b/ares/bitncmp.c
@@ -19,7 +19,7 @@
 
 #ifndef HAVE_BITNCMP
 
-#include "setup.h"
+#include "ares_setup.h"
 #include "bitncmp.h"
 
 /*
diff --git a/ares/inet_net_pton.c b/ares/inet_net_pton.c
index 84a1dc58f8dc73bc37be62bfdf5a9893b6b57644..1e278a7930cabbb2d1742ad62e4b05b163e99787 100644
--- a/ares/inet_net_pton.c
+++ b/ares/inet_net_pton.c
@@ -17,7 +17,7 @@
  * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include "setup.h"
+#include "ares_setup.h"
 
 #ifdef HAVE_SYS_SOCKET_H
 #  include <sys/socket.h>
diff --git a/ares/inet_ntop.c b/ares/inet_ntop.c
index 7f43b5c03b13bb96de3eeec861ed58b6fa2a475d..b3061774eb00128651e4fc25efa6e07d5357d7e1 100644
--- a/ares/inet_ntop.c
+++ b/ares/inet_ntop.c
@@ -16,7 +16,7 @@
  * SOFTWARE.
  */
 
-#include "setup.h"
+#include "ares_setup.h"
 
 #ifdef HAVE_SYS_SOCKET_H
 #  include <sys/socket.h>
diff --git a/ares/windows_port.c b/ares/windows_port.c
index fd13b1485d0008ec9958b5b84542cd7ed787c4a3..64096a5be029b2203e2297697ab9d2d194d26b5b 100644
--- a/ares/windows_port.c
+++ b/ares/windows_port.c
@@ -1,4 +1,4 @@
-#include "setup.h"
+#include "ares_setup.h"
 
 /* $Id$ */