diff --git a/configure.ac b/configure.ac
index 11b84fa9..5fecef81 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 AC_PREREQ(2.57)
 AC_INIT([libmicrohttpd], [0.3.1],[libmicrohttpd@gnunet.org])
 AM_INIT_AUTOMAKE([libmicrohttpd], [0.3.1])
-AM_CONFIG_HEADER([config.h])
+AM_CONFIG_HEADER([MHD_config.h])
 
 AH_TOP([#define _GNU_SOURCE  1])
 
diff --git a/src/daemon/daemon.c b/src/daemon/daemon.c
index 473bef3a..6f8f6b17 100644
--- a/src/daemon/daemon.c
+++ b/src/daemon/daemon.c
@@ -24,6 +24,7 @@
  * @author Daniel Pittman
  * @author Christian Grothoff
  */
+#include "platform.h"
 #include "internal.h"
 #include "response.h"
 #include "connection.h"
@@ -411,8 +412,10 @@ MHD_accept_connection (struct MHD_Daemon *daemon)
         }
       return MHD_NO;
     }
+#if HAVE_MESSAGES
 #if DEBUG_CONNECT
   MHD_DLOG (daemon, "Accepted connection on socket %d\n", s);
+#endif
 #endif
   have = 0;
   if ((daemon->per_ip_connection_limit != 0) && (daemon->max_connections > 0))
diff --git a/src/daemon/https/lgl/asnprintf.c b/src/daemon/https/lgl/asnprintf.c
index a9114977..c9dbc04e 100644
--- a/src/daemon/https/lgl/asnprintf.c
+++ b/src/daemon/https/lgl/asnprintf.c
@@ -15,7 +15,7 @@
    with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#include <config.h>
+#include "MHD_config.h"
 
 /* Specification.  */
 #include "vasnprintf.h"
diff --git a/src/daemon/https/lgl/asprintf.c b/src/daemon/https/lgl/asprintf.c
index 2df1d4b0..04e3c58c 100644
--- a/src/daemon/https/lgl/asprintf.c
+++ b/src/daemon/https/lgl/asprintf.c
@@ -15,7 +15,7 @@
    with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#include <config.h>
+#include "MHD_config.h"
 
 /* Specification.  */
 #ifdef IN_LIBASPRINTF
diff --git a/src/daemon/https/lgl/des.c b/src/daemon/https/lgl/des.c
index fd70bc7e..4f6c5be0 100644
--- a/src/daemon/https/lgl/des.c
+++ b/src/daemon/https/lgl/des.c
@@ -94,7 +94,7 @@
  */
 
 
-#include <config.h>
+#include "MHD_config.h"
 
 #include "des.h"
 
diff --git a/src/daemon/https/lgl/gc-gnulib.c b/src/daemon/https/lgl/gc-gnulib.c
index d1db6d8a..237eb45c 100644
--- a/src/daemon/https/lgl/gc-gnulib.c
+++ b/src/daemon/https/lgl/gc-gnulib.c
@@ -20,7 +20,7 @@
 
 /* Note: This file is only built if GC uses internal functions. */
 
-#include <config.h>
+#include "MHD_config.h"
 
 /* Get prototype. */
 #include "gc.h"
diff --git a/src/daemon/https/lgl/gc-libgcrypt.c b/src/daemon/https/lgl/gc-libgcrypt.c
index d65bb27c..884bf31a 100644
--- a/src/daemon/https/lgl/gc-libgcrypt.c
+++ b/src/daemon/https/lgl/gc-libgcrypt.c
@@ -20,7 +20,7 @@
 
 /* Note: This file is only built if GC uses Libgcrypt. */
 
-#include "config.h"
+#include "MHD_config.h"
 
 /* Get prototype. */
 #include "gc.h"
diff --git a/src/daemon/https/lgl/gc-pbkdf2-sha1.c b/src/daemon/https/lgl/gc-pbkdf2-sha1.c
index f5daf7b7..b29b42fd 100644
--- a/src/daemon/https/lgl/gc-pbkdf2-sha1.c
+++ b/src/daemon/https/lgl/gc-pbkdf2-sha1.c
@@ -18,7 +18,7 @@
 /* Written by Simon Josefsson.  The comments in this file are taken
    from RFC 2898.  */
 
-#include <config.h>
+#include "MHD_config.h"
 
 #include "gc.h"
 
diff --git a/src/daemon/https/lgl/hmac-md5.c b/src/daemon/https/lgl/hmac-md5.c
index 53cf2b10..1bd56103 100644
--- a/src/daemon/https/lgl/hmac-md5.c
+++ b/src/daemon/https/lgl/hmac-md5.c
@@ -17,7 +17,7 @@
 
 /* Written by Simon Josefsson.  */
 
-#include <config.h>
+#include "MHD_config.h"
 
 #include "hmac.h"
 
diff --git a/src/daemon/https/lgl/hmac-sha1.c b/src/daemon/https/lgl/hmac-sha1.c
index a9cf18cd..e634ad9c 100644
--- a/src/daemon/https/lgl/hmac-sha1.c
+++ b/src/daemon/https/lgl/hmac-sha1.c
@@ -17,7 +17,7 @@
 
 /* Written by Simon Josefsson.  */
 
-#include <config.h>
+#include "MHD_config.h"
 
 #include "hmac.h"
 
diff --git a/src/daemon/https/lgl/md5.c b/src/daemon/https/lgl/md5.c
index 9b3bfbe8..51502d6e 100644
--- a/src/daemon/https/lgl/md5.c
+++ b/src/daemon/https/lgl/md5.c
@@ -20,7 +20,7 @@
 
 /* Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.  */
 
-#include <config.h>
+#include "MHD_config.h"
 
 #include "md5.h"
 
diff --git a/src/daemon/https/lgl/memmem.c b/src/daemon/https/lgl/memmem.c
index 1b66ed56..9a0e67d2 100644
--- a/src/daemon/https/lgl/memmem.c
+++ b/src/daemon/https/lgl/memmem.c
@@ -16,7 +16,7 @@
  Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifndef _LIBC
-# include <config.h>
+#include "MHD_config.h"
 #endif
 
 #include <stddef.h>
diff --git a/src/daemon/https/lgl/memmove.c b/src/daemon/https/lgl/memmove.c
index 0f040540..c37d6923 100644
--- a/src/daemon/https/lgl/memmove.c
+++ b/src/daemon/https/lgl/memmove.c
@@ -3,7 +3,7 @@
    In the public domain.
    By David MacKenzie <djm@gnu.ai.mit.edu>.  */
 
-#include <config.h>
+#include "MHD_config.h"
 
 #include <stddef.h>
 
diff --git a/src/daemon/https/lgl/memxor.c b/src/daemon/https/lgl/memxor.c
index 7b0b6ae9..dabada9f 100644
--- a/src/daemon/https/lgl/memxor.c
+++ b/src/daemon/https/lgl/memxor.c
@@ -18,7 +18,7 @@
 /* Written by Simon Josefsson.  The interface was inspired by memxor
    in Niels Möller's Nettle. */
 
-#include <config.h>
+#include "MHD_config.h"
 
 #include "memxor.h"
 
diff --git a/src/daemon/https/lgl/printf-args.c b/src/daemon/https/lgl/printf-args.c
index 55a5c439..a3f84740 100644
--- a/src/daemon/https/lgl/printf-args.c
+++ b/src/daemon/https/lgl/printf-args.c
@@ -21,7 +21,7 @@
      STATIC             Set to 'static' to declare the function static.  */
 
 #ifndef PRINTF_FETCHARGS
-# include <config.h>
+#include "MHD_config.h"
 #endif
 
 /* Specification.  */
diff --git a/src/daemon/https/lgl/printf-parse.c b/src/daemon/https/lgl/printf-parse.c
index e0b83a39..7eadfbd6 100644
--- a/src/daemon/https/lgl/printf-parse.c
+++ b/src/daemon/https/lgl/printf-parse.c
@@ -29,7 +29,7 @@
      ENABLE_UNISTDIO    Set to 1 to enable the unistdio extensions.  */
 
 #ifndef PRINTF_PARSE
-# include <config.h>
+#include "MHD_config.h"
 #endif
 
 /* Specification.  */
diff --git a/src/daemon/https/lgl/read-file.c b/src/daemon/https/lgl/read-file.c
index 9172a6ef..a57bedf5 100644
--- a/src/daemon/https/lgl/read-file.c
+++ b/src/daemon/https/lgl/read-file.c
@@ -16,7 +16,7 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#include <config.h>
+#include "MHD_config.h"
 
 #include "read-file.h"
 
diff --git a/src/daemon/https/lgl/realloc.c b/src/daemon/https/lgl/realloc.c
index 4661f913..c4103a8d 100644
--- a/src/daemon/https/lgl/realloc.c
+++ b/src/daemon/https/lgl/realloc.c
@@ -17,7 +17,7 @@
 
 /* written by Jim Meyering and Bruno Haible */
 
-#include <config.h>
+#include "MHD_config.h"
 
 /* Only the AC_FUNC_REALLOC macro defines 'realloc' already in config.h.  */
 #ifdef realloc
diff --git a/src/daemon/https/lgl/rijndael-alg-fst.c b/src/daemon/https/lgl/rijndael-alg-fst.c
index a39ec382..d14aad65 100644
--- a/src/daemon/https/lgl/rijndael-alg-fst.c
+++ b/src/daemon/https/lgl/rijndael-alg-fst.c
@@ -25,7 +25,7 @@
  * http://www.iaik.tu-graz.ac.at/research/krypto/AES/old/~rijmen/rijndael/rijndael-fst-3.0.zip
  */
 
-#include <config.h>
+#include "MHD_config.h"
 
 /**
  * rijndael-alg-fst.c
diff --git a/src/daemon/https/lgl/rijndael-api-fst.c b/src/daemon/https/lgl/rijndael-api-fst.c
index 35d920a9..327abdc8 100644
--- a/src/daemon/https/lgl/rijndael-api-fst.c
+++ b/src/daemon/https/lgl/rijndael-api-fst.c
@@ -25,7 +25,7 @@
  * http://www.iaik.tu-graz.ac.at/research/krypto/AES/old/~rijmen/rijndael/rijndael-fst-3.0.zip
  */
 
-#include <config.h>
+#include "MHD_config.h"
 
 /**
  * rijndael-api-fst.c
diff --git a/src/daemon/https/lgl/sha1.c b/src/daemon/https/lgl/sha1.c
index f5573da5..501abba1 100644
--- a/src/daemon/https/lgl/sha1.c
+++ b/src/daemon/https/lgl/sha1.c
@@ -23,7 +23,7 @@
       Robert Klep <robert@ilse.nl>  -- Expansion function fix
 */
 
-#include <config.h>
+#include "MHD_config.h"
 
 #include "sha1.h"
 
diff --git a/src/daemon/https/lgl/snprintf.c b/src/daemon/https/lgl/snprintf.c
index 538ee08e..0798b2dc 100644
--- a/src/daemon/https/lgl/snprintf.c
+++ b/src/daemon/https/lgl/snprintf.c
@@ -16,7 +16,7 @@
    with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#include <config.h>
+#include "MHD_config.h"
 
 /* Specification.  */
 #include <stdio.h>
diff --git a/src/daemon/https/lgl/strverscmp.c b/src/daemon/https/lgl/strverscmp.c
index 3b6bd20e..1b45810f 100644
--- a/src/daemon/https/lgl/strverscmp.c
+++ b/src/daemon/https/lgl/strverscmp.c
@@ -18,7 +18,7 @@
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #if !_LIBC
-# include <config.h>
+#include "MHD_config.h"
 #endif
 
 #include <string.h>
diff --git a/src/daemon/https/lgl/time_r.c b/src/daemon/https/lgl/time_r.c
index 691525df..025cadca 100644
--- a/src/daemon/https/lgl/time_r.c
+++ b/src/daemon/https/lgl/time_r.c
@@ -18,7 +18,7 @@
 
 /* Written by Paul Eggert.  */
 
-#include <config.h>
+#include "MHD_config.h"
 
 #include <time.h>
 
diff --git a/src/daemon/https/lgl/vasnprintf.c b/src/daemon/https/lgl/vasnprintf.c
index d247b592..8c848e95 100644
--- a/src/daemon/https/lgl/vasnprintf.c
+++ b/src/daemon/https/lgl/vasnprintf.c
@@ -52,7 +52,7 @@
 #endif
 
 #ifndef VASNPRINTF
-# include <config.h>
+#include "MHD_config.h"
 #endif
 #ifndef IN_LIBINTL
 # include <alloca.h>
diff --git a/src/daemon/https/lgl/vasprintf.c b/src/daemon/https/lgl/vasprintf.c
index 7b645460..9348b5bd 100644
--- a/src/daemon/https/lgl/vasprintf.c
+++ b/src/daemon/https/lgl/vasprintf.c
@@ -15,7 +15,7 @@
    with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#include <config.h>
+#include "MHD_config.h"
 
 /* Specification.  */
 #ifdef IN_LIBASPRINTF
diff --git a/src/daemon/https/tls/defines.h b/src/daemon/https/tls/defines.h
index 43e96766..712a3d0b 100644
--- a/src/daemon/https/tls/defines.h
+++ b/src/daemon/https/tls/defines.h
@@ -26,7 +26,7 @@
 # define DEFINES_H
 
 #if HAVE_CONFIG_H
-# include <config.h>
+# include "MHD_config.h"
 #endif
 
 #include <stddef.h>
diff --git a/src/daemon/https/tls/gnutls_asn1_tab.c b/src/daemon/https/tls/gnutls_asn1_tab.c
index 4a7dc1d4..b2139578 100644
--- a/src/daemon/https/tls/gnutls_asn1_tab.c
+++ b/src/daemon/https/tls/gnutls_asn1_tab.c
@@ -1,5 +1,5 @@
 #if HAVE_CONFIG_H
-# include "config.h"
+#include "MHD_config.h"
 #endif
 
 #include <libtasn1.h>
diff --git a/src/daemon/https/tls/pkix_asn1_tab.c b/src/daemon/https/tls/pkix_asn1_tab.c
index eec32f9b..e8471bfd 100644
--- a/src/daemon/https/tls/pkix_asn1_tab.c
+++ b/src/daemon/https/tls/pkix_asn1_tab.c
@@ -1,5 +1,5 @@
 #if HAVE_CONFIG_H
-# include "config.h"
+#include "MHD_config.h"
 #endif
 
 #include <libtasn1.h>
diff --git a/src/include/platform.h b/src/include/platform.h
index a4a16f21..eba8b614 100644
--- a/src/include/platform.h
+++ b/src/include/platform.h
@@ -34,7 +34,7 @@
 #ifndef PLATFORM_H
 #define PLATFORM_H
 
-#include "config.h"
+#include "MHD_config.h"
 
 #define _XOPEN_SOURCE_EXTENDED  1
 #define _OPEN_THREADS
diff --git a/src/testcurl/curl_version_check.c b/src/testcurl/curl_version_check.c
index 56f5f1ad..b9b9bc08 100644
--- a/src/testcurl/curl_version_check.c
+++ b/src/testcurl/curl_version_check.c
@@ -24,7 +24,7 @@
  * @author Sagie Amir
  */
 
-#include "config.h"
+#include "MHD_config.h"
 #include "platform.h"
 #include <curl/curl.h>
 #include <microhttpd.h>
diff --git a/src/testcurl/daemontest_get.c b/src/testcurl/daemontest_get.c
index 2d5729c1..1e1ee946 100644
--- a/src/testcurl/daemontest_get.c
+++ b/src/testcurl/daemontest_get.c
@@ -25,7 +25,7 @@
  * @author Christian Grothoff
  */
 
-#include "config.h"
+#include "MHD_config.h"
 #include <curl/curl.h>
 #include <microhttpd.h>
 #include <stdlib.h>
diff --git a/src/testcurl/daemontest_get_chunked.c b/src/testcurl/daemontest_get_chunked.c
index e88c86ad..ab53545c 100644
--- a/src/testcurl/daemontest_get_chunked.c
+++ b/src/testcurl/daemontest_get_chunked.c
@@ -28,7 +28,7 @@
  * @author Christian Grothoff
  */
 
-#include "config.h"
+#include "MHD_config.h"
 #include <curl/curl.h>
 #include <microhttpd.h>
 #include <stdlib.h>
diff --git a/src/testcurl/daemontest_large_put.c b/src/testcurl/daemontest_large_put.c
index d0e865a7..d6fb4bcc 100644
--- a/src/testcurl/daemontest_large_put.c
+++ b/src/testcurl/daemontest_large_put.c
@@ -24,7 +24,7 @@
  * @author Christian Grothoff
  */
 
-#include "config.h"
+#include "MHD_config.h"
 #include <curl/curl.h>
 #include <microhttpd.h>
 #include <stdlib.h>
diff --git a/src/testcurl/daemontest_long_header.c b/src/testcurl/daemontest_long_header.c
index c3c628be..9ae261c9 100644
--- a/src/testcurl/daemontest_long_header.c
+++ b/src/testcurl/daemontest_long_header.c
@@ -24,7 +24,7 @@
  * @author Christian Grothoff
  */
 
-#include "config.h"
+#include "MHD_config.h"
 #include <curl/curl.h>
 #include <microhttpd.h>
 #include <stdlib.h>
diff --git a/src/testcurl/daemontest_post.c b/src/testcurl/daemontest_post.c
index 335377e6..7016334f 100644
--- a/src/testcurl/daemontest_post.c
+++ b/src/testcurl/daemontest_post.c
@@ -24,7 +24,7 @@
  * @author Christian Grothoff
  */
 
-#include "config.h"
+#include "MHD_config.h"
 #include <curl/curl.h>
 #include <microhttpd.h>
 #include <stdlib.h>
diff --git a/src/testcurl/daemontest_post_loop.c b/src/testcurl/daemontest_post_loop.c
index 8630304e..15ec9815 100644
--- a/src/testcurl/daemontest_post_loop.c
+++ b/src/testcurl/daemontest_post_loop.c
@@ -24,7 +24,7 @@
  * @author Christian Grothoff (inspired by bug report #1296)
  */
 
-#include "config.h"
+#include "MHD_config.h"
 #include <curl/curl.h>
 #include <microhttpd.h>
 #include <stdlib.h>
diff --git a/src/testcurl/daemontest_postform.c b/src/testcurl/daemontest_postform.c
index 0940e0ac..fac4b254 100644
--- a/src/testcurl/daemontest_postform.c
+++ b/src/testcurl/daemontest_postform.c
@@ -24,7 +24,7 @@
  * @author Christian Grothoff
  */
 
-#include "config.h"
+#include "MHD_config.h"
 #include <curl/curl.h>
 #include <microhttpd.h>
 #include <stdlib.h>
diff --git a/src/testcurl/daemontest_put.c b/src/testcurl/daemontest_put.c
index 3ce7d371..2f582e3b 100644
--- a/src/testcurl/daemontest_put.c
+++ b/src/testcurl/daemontest_put.c
@@ -24,7 +24,7 @@
  * @author Christian Grothoff
  */
 
-#include "config.h"
+#include "MHD_config.h"
 #include <curl/curl.h>
 #include <microhttpd.h>
 #include <stdlib.h>
diff --git a/src/testcurl/daemontest_put_chunked.c b/src/testcurl/daemontest_put_chunked.c
index f613882b..bbf614fc 100644
--- a/src/testcurl/daemontest_put_chunked.c
+++ b/src/testcurl/daemontest_put_chunked.c
@@ -25,7 +25,7 @@
  * @author Christian Grothoff
  */
 
-#include "config.h"
+#include "MHD_config.h"
 #include <curl/curl.h>
 #include <microhttpd.h>
 #include <stdlib.h>
diff --git a/src/testzzuf/daemontest_get.c b/src/testzzuf/daemontest_get.c
index eb766991..c5bb028c 100644
--- a/src/testzzuf/daemontest_get.c
+++ b/src/testzzuf/daemontest_get.c
@@ -24,7 +24,7 @@
  * @author Christian Grothoff
  */
 
-#include "config.h"
+#include "MHD_config.h"
 #include <curl/curl.h>
 #include <microhttpd.h>
 #include <stdlib.h>
diff --git a/src/testzzuf/daemontest_get_chunked.c b/src/testzzuf/daemontest_get_chunked.c
index 7b7ac5a0..3f6034a6 100644
--- a/src/testzzuf/daemontest_get_chunked.c
+++ b/src/testzzuf/daemontest_get_chunked.c
@@ -24,7 +24,7 @@
  * @author Christian Grothoff
  */
 
-#include "config.h"
+#include "MHD_config.h"
 #include <curl/curl.h>
 #include <microhttpd.h>
 #include <stdlib.h>
diff --git a/src/testzzuf/daemontest_large_put.c b/src/testzzuf/daemontest_large_put.c
index b39ff737..eb8b44a0 100644
--- a/src/testzzuf/daemontest_large_put.c
+++ b/src/testzzuf/daemontest_large_put.c
@@ -24,7 +24,7 @@
  * @author Christian Grothoff
  */
 
-#include "config.h"
+#include "MHD_config.h"
 #include <curl/curl.h>
 #include <microhttpd.h>
 #include <stdlib.h>
diff --git a/src/testzzuf/daemontest_long_header.c b/src/testzzuf/daemontest_long_header.c
index d8aaa963..ef73b1e7 100644
--- a/src/testzzuf/daemontest_long_header.c
+++ b/src/testzzuf/daemontest_long_header.c
@@ -24,7 +24,7 @@
  * @author Christian Grothoff
  */
 
-#include "config.h"
+#include "MHD_config.h"
 #include <curl/curl.h>
 #include <microhttpd.h>
 #include <stdlib.h>
diff --git a/src/testzzuf/daemontest_post.c b/src/testzzuf/daemontest_post.c
index 7823d1ed..1d6d9bc0 100644
--- a/src/testzzuf/daemontest_post.c
+++ b/src/testzzuf/daemontest_post.c
@@ -24,7 +24,7 @@
  * @author Christian Grothoff
  */
 
-#include "config.h"
+#include "MHD_config.h"
 #include <curl/curl.h>
 #include <microhttpd.h>
 #include <stdlib.h>
diff --git a/src/testzzuf/daemontest_postform.c b/src/testzzuf/daemontest_postform.c
index 767be56e..48ddcc70 100644
--- a/src/testzzuf/daemontest_postform.c
+++ b/src/testzzuf/daemontest_postform.c
@@ -24,7 +24,7 @@
  * @author Christian Grothoff
  */
 
-#include "config.h"
+#include "MHD_config.h"
 #include <curl/curl.h>
 #include <microhttpd.h>
 #include <stdlib.h>
diff --git a/src/testzzuf/daemontest_put.c b/src/testzzuf/daemontest_put.c
index 8cd367c9..ddbcd5b4 100644
--- a/src/testzzuf/daemontest_put.c
+++ b/src/testzzuf/daemontest_put.c
@@ -24,7 +24,7 @@
  * @author Christian Grothoff
  */
 
-#include "config.h"
+#include "MHD_config.h"
 #include <curl/curl.h>
 #include <microhttpd.h>
 #include <stdlib.h>
diff --git a/src/testzzuf/daemontest_put_chunked.c b/src/testzzuf/daemontest_put_chunked.c
index 61caa2e6..84c8541c 100644
--- a/src/testzzuf/daemontest_put_chunked.c
+++ b/src/testzzuf/daemontest_put_chunked.c
@@ -25,7 +25,7 @@
  * @author Christian Grothoff
  */
 
-#include "config.h"
+#include "MHD_config.h"
 #include <curl/curl.h>
 #include <microhttpd.h>
 #include <stdlib.h>