diff --git a/buildconf b/buildconf
index f86048d42eb87187580ae298a63fe58dc513b01c..a4889065e36657a26f1c6d1fbe3a3f060b28b63a 100755
--- a/buildconf
+++ b/buildconf
@@ -270,8 +270,8 @@ for fname in .deps \
     autom4te.cache \
     compile \
     config.guess \
-    config.h \
-    config.h.in \
+    curl_config.h \
+    curl_config.h.in \
     config.log \
     config.lt \
     config.status \
@@ -321,8 +321,8 @@ fi
 echo "buildconf: running autoheader"
 ${AUTOHEADER:-autoheader} || die "The autoheader command failed"
 
-echo "buildconf: cp lib/config.h.in src/config.h.in"
-cp lib/config.h.in src/config.h.in
+echo "buildconf: cp lib/curl_config.h.in src/curl_config.h.in"
+cp lib/curl_config.h.in src/curl_config.h.in
 
 echo "buildconf: running autoconf"
 ${AUTOCONF:-autoconf}     || die "The autoconf command failed"
diff --git a/configure.ac b/configure.ac
index a7e446446d84569216134c5e19a10a5504d61b1e..2c9f1d8e018795bac9f9e2cac04f2ec35eee8838 100644
--- a/configure.ac
+++ b/configure.ac
@@ -35,7 +35,7 @@ This configure script may be copied, distributed and modified under the
 terms of the curl license; see COPYING for more details])
 
 AC_CONFIG_SRCDIR([lib/urldata.h])
-AM_CONFIG_HEADER(lib/config.h src/config.h include/curl/curlbuild.h)
+AM_CONFIG_HEADER(lib/curl_config.h src/curl_config.h include/curl/curlbuild.h)
 AM_MAINTAINER_MODE
 
 CURL_CHECK_OPTION_DEBUG
diff --git a/diff-exclude b/diff-exclude
index 5ac59c998ba47df31e609ed16ea74ac9c83ed116..0681dbebaa3f6132f28ffe396f46a664fc668649 100644
--- a/diff-exclude
+++ b/diff-exclude
@@ -18,7 +18,7 @@ autom4te.cache
 *.patch
 CVS
 *.asc
-config.h
+curl_config.h
 *.la
 *.lai
 libtool
diff --git a/docs/INTERNALS b/docs/INTERNALS
index 5021c82e0ef9bc2b05187367e7e569c4bcba1876..e1b5da5fba79cb3331042620196f3cddfc52b5cc 100644
--- a/docs/INTERNALS
+++ b/docs/INTERNALS
@@ -103,9 +103,9 @@ Windows vs Unix
  Inside the source code, We make an effort to avoid '#ifdef [Your OS]'. All
  conditionals that deal with features *should* instead be in the format
  '#ifdef HAVE_THAT_WEIRD_FUNCTION'. Since Windows can't run configure scripts,
- we maintain two config-win32.h files (one in lib/ and one in src/) that are
- supposed to look exactly as a config.h file would have looked like on a
- Windows machine!
+ we maintain two curl_config-win32.h files (one in lib/ and one in src/) that
+ are supposed to look exactly as a curl_config.h file would have looked like on
+ a Windows machine!
 
  Generally speaking: always remember that this will be compiled on dozens of
  operating systems. Don't walk on the edge.
diff --git a/lib/.cvsignore b/lib/.cvsignore
index 03863387e08b320d30e30ea58434a4d06eb2cfbe..ed20ab8fc13c5fc361bb2a42cfb2ad23ef6b1731 100644
--- a/lib/.cvsignore
+++ b/lib/.cvsignore
@@ -9,7 +9,7 @@ DLL-Release
 LIB-Debug
 LIB-Release
 Makefile
-config.h
+curl_config.h
 getdate.c
 libcurl.dsp
 libcurl.vcproj
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 699b4f1c1efc8dc8ef85fe26c9f8cf76cf9b1f11..b2ee0ab0a2f27ff4852df658d2c8e1d6ec32940e 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -2,15 +2,15 @@ set(LIB_NAME libcurl)
 
 configure_file(${CURL_SOURCE_DIR}/include/curl/curlbuild.h.cmake
   ${CURL_BINARY_DIR}/include/curl/curlbuild.h)
-configure_file(config.h.cmake
-  ${CMAKE_CURRENT_BINARY_DIR}/config.h)
+configure_file(curl_config.h.cmake
+  ${CMAKE_CURRENT_BINARY_DIR}/curl_config.h)
 
 
 transform_makefile_inc("Makefile.inc" "${CMAKE_CURRENT_BINARY_DIR}/Makefile.inc.cmake")
 include(${CMAKE_CURRENT_BINARY_DIR}/Makefile.inc.cmake)
 
 list(APPEND HHEADERS
-  ${CMAKE_CURRENT_BINARY_DIR}/config.h
+  ${CMAKE_CURRENT_BINARY_DIR}/curl_config.h
   ${CURL_BINARY_DIR}/include/curl/curlbuild.h
   )
 
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 34c2b72c363a009f0335d20072456e2d9cc44387..8d30d4c53c2f7509625824ce412889064fc3ef90 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -29,11 +29,11 @@ DOCS = README.encoding README.memoryleak README.ares README.curlx	\
  README.hostip README.multi_socket README.httpauth README.pipelining    \
  README.NSS README.curl_off_t
 
-CMAKE_DIST = CMakeLists.txt config.h.cmake
+CMAKE_DIST = CMakeLists.txt curl_config.h.cmake
 
 EXTRA_DIST = Makefile.b32 Makefile.m32 Makefile.vc6 Makefile.riscos $(DSP) \
  vc6libcurl.dsw config-win32.h config-win32ce.h config-riscos.h            \
- config-mac.h config.h.in makefile.dj config.dos libcurl.plist             \
+ config-mac.h curl_config.h.in makefile.dj config.dos libcurl.plist        \
  libcurl.rc config-amigaos.h amigaos.c amigaos.h makefile.amiga		   \
  Makefile.netware nwlib.c nwos.c libcurl.imp msvcproj.head msvcproj.foot   \
  config-win32ce.h config-os400.h setup-os400.h config-symbian.h		   \
@@ -52,7 +52,7 @@ LIBCURL_LIBS = @LIBCURL_LIBS@
 #
 # $(top_builddir)/include is for libcurl's generated curl/curlbuild.h file
 # $(top_srcdir)/include is for libcurl's external include files
-# $(top_builddir)/lib is for libcurl's generated lib/config.h file
+# $(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)/ares is for in-tree c-ares's generated ares_build.h file
 # $(top_srcdir)/ares is for in-tree c-ares's external include files
diff --git a/lib/Makefile.netware b/lib/Makefile.netware
index 6ab10bae6cbea20bde00a2bc8ac93f57953f0e01..34368c1c18e7c876c90100f2a4ca3d3198cde8c4 100644
--- a/lib/Makefile.netware
+++ b/lib/Makefile.netware
@@ -241,7 +241,7 @@ nlm: prebuild $(TARGET).nlm
 
 lib: prebuild $(TARGET).$(LIBEXT)
 
-prebuild: $(OBJDIR) $(CURL_INC)/curl/curlbuild.h $(OBJDIR)/version.inc config.h
+prebuild: $(OBJDIR) $(CURL_INC)/curl/curlbuild.h $(OBJDIR)/version.inc curl_config.h
 
 $(OBJDIR)/%.o: %.c
 #	@echo Compiling $<
@@ -263,7 +263,7 @@ ifdef WITH_SSL
 endif
 
 clean:
-	-$(RM) config.h
+	-$(RM) curl_config.h
 	-$(RM) -r $(OBJDIR)
 
 distclean: clean
@@ -373,7 +373,7 @@ ifeq ($(findstring nlmconv,$(LD)),nlmconv)
 	@echo $(DL)output $(TARGET).nlm$(DL) >> $@
 endif
 
-config.h: Makefile.netware
+curl_config.h: Makefile.netware
 	@echo Creating $@
 	@echo $(DL)/* $@ for NetWare target.$(DL) > $@
 	@echo $(DL)** Do not edit this file - it is created by make!$(DL) >> $@
diff --git a/lib/config-mac.h b/lib/config-mac.h
index 0547aeaa804bda6f28d00f63ae9cb2dbfb5cc78a..fb2f99df303b93a54db96b144b043dca5a8faa06 100644
--- a/lib/config-mac.h
+++ b/lib/config-mac.h
@@ -1,11 +1,11 @@
 #ifndef __LIB_CONFIG_MAC_H
 #define __LIB_CONFIG_MAC_H
 
-/* ================================================================ */
-/*    lib/config-mac.h - Hand crafted config file for Mac OS 9      */
-/* ================================================================ */
-/*   On Mac OS X you must run configure to generate config.h file   */
-/* ================================================================ */
+/* =================================================================== */
+/*   lib/config-mac.h - Hand crafted config file for Mac OS 9          */
+/* =================================================================== */
+/*  On Mac OS X you must run configure to generate curl_config.h file  */
+/* =================================================================== */
 
 #define OS "mac"
 
diff --git a/lib/config-riscos.h b/lib/config-riscos.h
index 95e45d6fd7e6fa7027465e49848d8c95cacdf64c..912bb8aa765b860680ca41fc94178364f33e82dd 100644
--- a/lib/config-riscos.h
+++ b/lib/config-riscos.h
@@ -1,4 +1,4 @@
-/* config.h.in.  Generated automatically from configure.in by autoheader.  */
+/* curl_config.h.in.  Generated automatically from configure.in by autoheader.  */
 /* Name of this package! */
 #undef PACKAGE
 
diff --git a/lib/config.h.cmake b/lib/config.h.cmake
index d7f00de1c44b3048a9572627f7c0737574809fa2..09f435c35a35094a0f8ee80d336c0ad6aea87c7f 100644
--- a/lib/config.h.cmake
+++ b/lib/config.h.cmake
@@ -1,4 +1,4 @@
-/* lib/config.h.in.  Generated from configure.ac by autoheader.  */
+/* lib/curl_config.h.in.  Generated from configure.ac by autoheader.  */
 
 /* Define to 1 if you have the $func function. */
 #cmakedefine AS_TR_CPP ${AS_TR_CPP}
diff --git a/lib/makefile.dj b/lib/makefile.dj
index b8d324923b956f010f69303de50c7cbf4e7372b6..594fff0fb1b99bb8573a3e744660e7c3447c2e59 100644
--- a/lib/makefile.dj
+++ b/lib/makefile.dj
@@ -4,7 +4,7 @@
 #
 # $Id$
 
-DEPEND_PREREQ = config.h
+DEPEND_PREREQ = curl_config.h
 TOPDIR = ..
 
 include ../packages/DOS/common.dj
@@ -17,18 +17,18 @@ CURL_LIB = libcurl.a
 # NOTE: if ../include/curl/curlbuild.h is missing, you're probably building
 # this from a CVS checkout and then you need to run buildconf.bat first.
 
-all: $(OBJ_DIR) config.h $(CURL_LIB)
+all: $(OBJ_DIR) curl_config.h $(CURL_LIB)
 
 $(CURL_LIB): $(OBJECTS)
 	ar rs $@ $?
 
-config.h: config.dos
+curl_config.h: config.dos
 	$(COPY) $^ $@
 
 # clean generated files
 #
 genclean:
-	- $(DELETE) config.h
+	- $(DELETE) curl_config.h
 
 # clean object files and subdir
 #
diff --git a/lib/setup.h b/lib/setup.h
index 25ca451f3613c44bf18382638ddc05dbb66c6061..43a322af5b1aa158278c4dcd1b09645f4dbac68c 100644
--- a/lib/setup.h
+++ b/lib/setup.h
@@ -38,7 +38,7 @@
 
 #ifdef HAVE_CONFIG_H
 
-#include "config.h"
+#include "curl_config.h"
 
 #else /* HAVE_CONFIG_H */
 
diff --git a/m4/curl-functions.m4 b/m4/curl-functions.m4
index b078d8fecb4763023294c5bec2420ddafdd7ed25..20887b68f302edd248d8b8a5d9062ccb4600817f 100644
--- a/m4/curl-functions.m4
+++ b/m4/curl-functions.m4
@@ -4830,7 +4830,7 @@ AC_DEFUN([CURL_CHECK_FUNC_STRERROR_R], [
   #
   if test "$tst_compi_strerror_r" = "yes" &&
      test "$tst_allow_strerror_r" = "unknown"; then
-    AC_MSG_WARN([cannot determine strerror_r() style: edit lib/config.h manually.])
+    AC_MSG_WARN([cannot determine strerror_r() style: edit lib/curl_config.h manually.])
   fi
   #
 ])
diff --git a/maketgz b/maketgz
index 9e3e37350ad74f950345d2c6fb174eb5d1e8964e..7480bb1fee21e20dd086a81e515a3c1b48faeb11 100755
--- a/maketgz
+++ b/maketgz
@@ -92,8 +92,8 @@ findprog()
   return 0
 }
 
-echo "maketgz: cp lib/config.h.in src/config.h.in"
-cp lib/config.h.in src/config.h.in
+echo "maketgz: cp lib/curl_config.h.in src/curl_config.h.in"
+cp lib/curl_config.h.in src/curl_config.h.in
 
 ############################################################################
 #
diff --git a/missing b/missing
index 0a7fb5a2acec32d1ef949e5e7e7fb11460c5e021..a9f9d941e91bab8301684262fdc42385dd818230 100755
--- a/missing
+++ b/missing
@@ -66,7 +66,7 @@ Options:
 Supported PROGRAM values:
   aclocal      touch file \`aclocal.m4'
   autoconf     touch file \`configure'
-  autoheader   touch file \`config.h.in'
+  autoheader   touch file \`curl_config.h.in'
   automake     touch all \`Makefile.in' files
   bison        create \`y.tab.[ch]', if possible, from existing .[ch]
   flex         create \`lex.yy.c', if possible, from existing .c
@@ -112,7 +112,7 @@ WARNING: \`$1' is missing on your system.  You should only need it if
          to install the \`Autoconf' and \`GNU m4' packages.  Grab them
          from any GNU archive site."
     files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
-    test -z "$files" && files="config.h"
+    test -z "$files" && files="curl_config.h"
     touch_files=
     for f in $files; do
       case "$f" in
diff --git a/packages/vms/build_vms.com b/packages/vms/build_vms.com
index 0c2cd0a7fdb782a3739251ff03a82b48cdc498fa..d6de0c2fc7e362ba5eabbe69664fea1f6ba193d1 100755
--- a/packages/vms/build_vms.com
+++ b/packages/vms/build_vms.com
@@ -34,7 +34,7 @@ $!                   and updated it to do hardware dependant builds.
 $! 29-JAN-2004, MSK, moved logical defines into defines.com
 $!  6-FEB-2004, MSK, put in various SSL support bits
 $!  9-MAR-2004, MSK, the config-vms.h* files are now copied to the lib and
-$!                   src directories as config.h.
+$!                   src directories as curl_config.h.
 $! 15-MAR-2004, MSK, All of the curlmsg*.* files have also been moved to 
 $!                   this build directory.  They will be copied to the src 
 $!                   directory before build.  The .msg file will be compiled 
diff --git a/src/.cvsignore b/src/.cvsignore
index 36e93771993cc2fea34e2ba7b729194a8019808e..c4504626cc0f9dd06bd949eff11ad618f9cb192c 100644
--- a/src/.cvsignore
+++ b/src/.cvsignore
@@ -7,8 +7,8 @@ LIB-Debug
 LIB-Release
 Makefile
 Makefile.in
-config.h
-config.h.in
+curl_config.h
+curl_config.h.in
 curl
 hugehelp.c
 stamp-h*
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c6871787cc976a861a7886c52a78be3259faf208..9db5fd79a2699bb28cb9c83c2a0e6d5b0d82e562 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -26,7 +26,7 @@ source_group("cURL header files" FILES ${CURL_HFILES})
 
 include_directories(
   ${CURL_SOURCE_DIR}/lib                # To be able to reach "setup_once.h"
-  ${CURL_BINARY_DIR}/lib                # To be able to reach "config.h"
+  ${CURL_BINARY_DIR}/lib                # To be able to reach "curl_config.h"
   ${CURL_BINARY_DIR}/include    # To be able to reach "curl/curlbuild.h"
   )
 
diff --git a/src/Makefile.am b/src/Makefile.am
index ea648a00152a41e58272850c10b49ca17a64e26b..9d89131fb8d50d09662d80e2b53e15f1f8860c1e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -29,8 +29,8 @@ AUTOMAKE_OPTIONS = foreign nostdinc
 #
 # $(top_builddir)/include is for libcurl's generated curl/curlbuild.h file
 # $(top_srcdir)/include is for libcurl's external include files
-# $(top_builddir)/lib is for libcurl's generated lib/config.h file
-# $(top_builddir)/src is for curl's generated src/config.h file
+# $(top_builddir)/lib is for libcurl's generated lib/curl_config.h file
+# $(top_builddir)/src is for curl's generated src/curl_config.h file
 # $(top_srcdir)/lib is for libcurl's lib/setup.h and other "borrowed" files
 # $(top_srcdir)/src is for curl's src/setup.h and "curl-private" files
 
@@ -54,7 +54,7 @@ CLEANFILES = hugehelp.c
 NROFF=env LC_ALL=C @NROFF@ @MANOPT@ # figured out by the configure script
 
 EXTRA_DIST = mkhelp.pl makefile.dj Makefile.vc6 Makefile.b32 Makefile.m32 \
-	Makefile.riscos config.h.in macos/curl.mcp.xml.sit.hqx		  \
+	Makefile.riscos curl_config.h.in macos/curl.mcp.xml.sit.hqx	  \
 	macos/MACINSTALL.TXT macos/src/curl_GUSIConfig.cpp vc6curlsrc.dsp \
 	macos/src/macos_main.cpp config-amigaos.h makefile.amiga curl.rc  \
 	Makefile.netware Makefile.inc Makefile.Watcom vc6curlsrc.dsw      \
diff --git a/src/Makefile.netware b/src/Makefile.netware
index b044105f8be687e6e50c418e8170ad160950fc66..56a35852aa7e758e32a5ffb4773dc1cd3712936d 100644
--- a/src/Makefile.netware
+++ b/src/Makefile.netware
@@ -235,7 +235,7 @@ vpath %.c $(CURL_LIB)
 
 all: prebuild $(TARGET).nlm
 
-prebuild: $(OBJDIR) $(OBJDIR)/version.inc config.h
+prebuild: $(OBJDIR) $(OBJDIR)/version.inc curl_config.h
 
 $(OBJDIR)/%.o: %.c
 #	@echo Compiling $<
@@ -254,7 +254,7 @@ clean:
 ifeq "$(wildcard hugehelp.c.cvs)" "hugehelp.c.cvs"
 	-$(RM) hugehelp.c
 endif
-	-$(RM) config.h
+	-$(RM) curl_config.h
 	-$(RM) -r $(OBJDIR)
 
 distclean: clean
@@ -361,7 +361,7 @@ endif
 	@echo $(DL)output $(TARGET).nlm$(DL) >> $@
 endif
 
-config.h: Makefile.netware
+curl_config.h: Makefile.netware
 	@echo Creating $@
 	@echo $(DL)/* $@ for NetWare target.$(DL) > $@
 	@echo $(DL)** Do not edit this file - it is created by make!$(DL) >> $@
diff --git a/src/config-mac.h b/src/config-mac.h
index a3a57c2623cd81eda229eab605a668204f741f76..8f54512f21e7c01fdbd7cfd0572d9b68bff9af65 100644
--- a/src/config-mac.h
+++ b/src/config-mac.h
@@ -1,11 +1,11 @@
 #ifndef __SRC_CONFIG_MAC_H
 #define __SRC_CONFIG_MAC_H
 
-/* ================================================================ */
-/*    src/config-mac.h - Hand crafted config file for Mac OS 9      */
-/* ================================================================ */
-/*   On Mac OS X you must run configure to generate config.h file   */
-/* ================================================================ */
+/* =================================================================== */
+/*   src/config-mac.h - Hand crafted config file for Mac OS 9          */
+/* =================================================================== */
+/*  On Mac OS X you must run configure to generate curl_config.h file  */
+/* =================================================================== */
 
 /* Define to 1 if you want the built-in manual */
 #define USE_MANUAL 1
diff --git a/src/config-riscos.h b/src/config-riscos.h
index ab898230b647c8d49317d68350e8d5efae3773f7..b397e0dd818432a2c3f130a5c36da474ba3d2e39 100644
--- a/src/config-riscos.h
+++ b/src/config-riscos.h
@@ -1,4 +1,4 @@
-/* config.h.in.  Generated automatically from configure.in by autoheader.  */
+/* curl_config.h.in.  Generated automatically from configure.in by autoheader.  */
 /* Name of this package! */
 #undef PACKAGE
 
diff --git a/src/makefile.dj b/src/makefile.dj
index 4a460bad97921d00e10d1c9a882c6cb237cac82f..6534dd11fa671f0f8aa325b33e267472a148187b 100644
--- a/src/makefile.dj
+++ b/src/makefile.dj
@@ -5,7 +5,7 @@
 #  Gisle Vanem <giva@bgnett.no>
 #
 
-DEPEND_PREREQ = config.h hugehelp.c
+DEPEND_PREREQ = curl_config.h hugehelp.c
 
 top_srcdir = ..
 TOPDIR = ..
@@ -39,13 +39,13 @@ CFLAGS += -DUSE_ENVIRONMENT
 PROGRAM  = curl.exe
 OBJECTS += $(addprefix $(OBJ_DIR)/, $(CSOURCES:.c=.o))
 
-all: $(OBJ_DIR) config.h $(PROGRAM)
+all: $(OBJ_DIR) curl_config.h $(PROGRAM)
 	@echo Welcome to cURL
 
 $(PROGRAM): $(OBJECTS) ../lib/libcurl.a
 	$(CC) -o $@ $^ $(LDFLAGS) $(EX_LIBS)
 
-config.h:
+curl_config.h:
 ifeq ($(IS_UNIX_SHELL),1)
 	@echo '#include "../lib/config.dos"' > $@
 else
@@ -62,7 +62,7 @@ hugehelp.c: ../docs/MANUAL ../docs/curl.1 mkhelp.pl
 # clean generated files
 #
 genclean:
-	- $(DELETE) config.h
+	- $(DELETE) curl_config.h
 	- $(DELETE) hugehelp.c
 
 # clean object files and subdir
diff --git a/src/setup.h b/src/setup.h
index 75c771ecd3707e733a02f2f060fbf4e4f800deb0..30ebebd3bf5a7629273f46362625fe13dee7636e 100644
--- a/src/setup.h
+++ b/src/setup.h
@@ -39,7 +39,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "curl_config.h"
 #else
 
 #ifdef WIN32
diff --git a/tests/libtest/CMakeLists.txt b/tests/libtest/CMakeLists.txt
index 08edbd0c9aa032b40849e0db4f3d6c03c0517ac8..74d841e01de3feaa1136c1e4892eb059103ffa22 100644
--- a/tests/libtest/CMakeLists.txt
+++ b/tests/libtest/CMakeLists.txt
@@ -6,7 +6,7 @@ function(SETUP_TEST TEST_NAME)          # ARGN are the files in the test
 
   include_directories(
     ${CURL_SOURCE_DIR}/lib          # To be able to reach "setup_once.h"
-    ${CURL_BINARY_DIR}/lib          # To be able to reach "config.h"
+    ${CURL_BINARY_DIR}/lib          # To be able to reach "curl_config.h"
     ${CURL_BINARY_DIR}/include      # To be able to reach "curl/curlbuild.h"
     )
 
diff --git a/tests/libtest/Makefile.am b/tests/libtest/Makefile.am
index c5b8762cf5f989792a2e72dbc3a6da5af9844200..68b446c129a66f8771561bfa7588cd33868762ed 100644
--- a/tests/libtest/Makefile.am
+++ b/tests/libtest/Makefile.am
@@ -29,7 +29,7 @@ AUTOMAKE_OPTIONS = foreign nostdinc
 #
 # $(top_builddir)/include is for libcurl's generated curl/curlbuild.h file
 # $(top_srcdir)/include is for libcurl's external include files
-# $(top_builddir)/lib is for libcurl's generated lib/config.h file
+# $(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 "borrowed" files
 # $(top_builddir)/ares is for in-tree c-ares's generated ares_build.h file
 # $(top_srcdir)/ares is for in-tree c-ares's external include files
diff --git a/tests/libtest/test.h b/tests/libtest/test.h
index c66fd61d75861b12b4ccee6838a551d91652be5e..66416b42a6e3a3a830c0f826d11a442bf1d8c2d7 100644
--- a/tests/libtest/test.h
+++ b/tests/libtest/test.h
@@ -9,9 +9,9 @@
  */
 
 /* Now include the setup.h file from libcurl's private libdir (the source
-   version, but that might include "config.h" from the build dir so we need
-   both of them in the include path), so that we get good in-depth knowledge
-   about the system we're building this on */
+   version, but that might include "curl_config.h" from the build dir so we
+   need both of them in the include path), so that we get good in-depth
+   knowledge about the system we're building this on */
 
 #include "setup.h"
 
diff --git a/tests/runtests.pl b/tests/runtests.pl
index b65bcebcd378611d9b9859866e90bdd3f18ef4f1..2b6dda8fab8ebdf166015c5675b078dac28ad2d5 100755
--- a/tests/runtests.pl
+++ b/tests/runtests.pl
@@ -1614,8 +1614,8 @@ sub checksystem {
         die "couldn't get curl's version";
     }
 
-    if(-r "../lib/config.h") {
-        open(CONF, "<../lib/config.h");
+    if(-r "../lib/curl_config.h") {
+        open(CONF, "<../lib/curl_config.h");
         while(<CONF>) {
             if($_ =~ /^\#define HAVE_GETRLIMIT/) {
                 $has_getrlimit = 1;
diff --git a/tests/server/.cvsignore b/tests/server/.cvsignore
index 56a4e719e429ad1102a1521e8d72eb777e5bcc68..c843da76302b1784637e9e11298199e8e10723f5 100644
--- a/tests/server/.cvsignore
+++ b/tests/server/.cvsignore
@@ -3,7 +3,7 @@ Makefile.in
 sws
 .deps
 stamp-h*
-config.h
+curl_config.h
 Makefile
 getpart
 sockfilt
diff --git a/tests/server/CMakeLists.txt b/tests/server/CMakeLists.txt
index c9b32e16fdf2ecf439390cc8a8094c865bfb686b..01db82401691234d6b160d805bbbb0caf22e0538 100644
--- a/tests/server/CMakeLists.txt
+++ b/tests/server/CMakeLists.txt
@@ -6,7 +6,7 @@ function(SETUP_EXECUTABLE TEST_NAME)    # ARGN are the files in the test
 
   include_directories(
     ${CURL_SOURCE_DIR}/lib              # To be able to reach "setup_once.h"
-    ${CURL_BINARY_DIR}/lib              # To be able to reach "config.h"
+    ${CURL_BINARY_DIR}/lib              # To be able to reach "curl_config.h"
     ${CURL_BINARY_DIR}/include  # To be able to reach "curl/curlbuild.h"
     )
 
diff --git a/tests/server/Makefile.am b/tests/server/Makefile.am
index c8863c265a29c338095bb308cdb54de955c0128c..63481a2205efbb10a228b35582cf8a2b9a8667ba 100644
--- a/tests/server/Makefile.am
+++ b/tests/server/Makefile.am
@@ -29,7 +29,7 @@ AUTOMAKE_OPTIONS = foreign nostdinc
 #
 # $(top_builddir)/include is for libcurl's generated curl/curlbuild.h file
 # $(top_srcdir)/include is for libcurl's external include files
-# $(top_builddir)/lib is for libcurl's generated lib/config.h file
+# $(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 "borrowed" files
 # $(top_builddir)/ares is for in-tree c-ares's generated ares_build.h file
 # $(top_srcdir)/ares is for in-tree c-ares's external include files
diff --git a/tests/testcurl.pl b/tests/testcurl.pl
index 2e57460dabe72db44fd69b51bb6c59f2e26a5587..ddf03040990782fbec3d5a491e234a28dc223d05 100755
--- a/tests/testcurl.pl
+++ b/tests/testcurl.pl
@@ -230,7 +230,7 @@ sub mydie($){
 
 sub get_host_triplet {
   my $triplet;
-  my $configfile = "$pwd/$build/lib/config.h";
+  my $configfile = "$pwd/$build/lib/curl_config.h";
 
   if(-f $configfile && -s $configfile && open(LIBCONFIGH, "<$configfile")) {
     while(<LIBCONFIGH>) {