From 295c311d5256dbae3dc19121c8820410e96ba7af Mon Sep 17 00:00:00 2001
From: des <des@d4fa192b-c00b-0410-8231-f00ffab90ce4>
Date: Wed, 13 Feb 2008 13:55:39 +0000
Subject: [PATCH] Use #include "config.h" instead of -include config.h

git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@2455 d4fa192b-c00b-0410-8231-f00ffab90ce4
---
 varnish-cache/bin/varnishadm/Makefile.am           | 2 --
 varnish-cache/bin/varnishadm/varnishadm.c          | 2 ++
 varnish-cache/bin/varnishd/Makefile.am             | 2 +-
 varnish-cache/bin/varnishd/cache_acceptor.c        | 2 ++
 varnish-cache/bin/varnishd/cache_acceptor_epoll.c  | 2 ++
 varnish-cache/bin/varnishd/cache_acceptor_kqueue.c | 2 ++
 varnish-cache/bin/varnishd/cache_acceptor_poll.c   | 2 ++
 varnish-cache/bin/varnishd/cache_backend.c         | 2 ++
 varnish-cache/bin/varnishd/cache_ban.c             | 2 ++
 varnish-cache/bin/varnishd/cache_center.c          | 2 ++
 varnish-cache/bin/varnishd/cache_cli.c             | 2 ++
 varnish-cache/bin/varnishd/cache_dir_random.c      | 2 ++
 varnish-cache/bin/varnishd/cache_dir_simple.c      | 2 ++
 varnish-cache/bin/varnishd/cache_expire.c          | 2 ++
 varnish-cache/bin/varnishd/cache_fetch.c           | 2 ++
 varnish-cache/bin/varnishd/cache_hash.c            | 2 ++
 varnish-cache/bin/varnishd/cache_http.c            | 2 ++
 varnish-cache/bin/varnishd/cache_httpconn.c        | 2 ++
 varnish-cache/bin/varnishd/cache_main.c            | 2 ++
 varnish-cache/bin/varnishd/cache_panic.c           | 2 ++
 varnish-cache/bin/varnishd/cache_pipe.c            | 2 ++
 varnish-cache/bin/varnishd/cache_pool.c            | 2 ++
 varnish-cache/bin/varnishd/cache_response.c        | 2 ++
 varnish-cache/bin/varnishd/cache_session.c         | 2 ++
 varnish-cache/bin/varnishd/cache_synthetic.c       | 2 ++
 varnish-cache/bin/varnishd/cache_vary.c            | 2 ++
 varnish-cache/bin/varnishd/cache_vcl.c             | 2 ++
 varnish-cache/bin/varnishd/cache_vrt.c             | 2 ++
 varnish-cache/bin/varnishd/cache_vrt_acl.c         | 2 ++
 varnish-cache/bin/varnishd/cache_vrt_esi.c         | 2 ++
 varnish-cache/bin/varnishd/cache_vrt_re.c          | 2 ++
 varnish-cache/bin/varnishd/cache_ws.c              | 2 ++
 varnish-cache/bin/varnishd/hash_classic.c          | 2 ++
 varnish-cache/bin/varnishd/hash_simple_list.c      | 2 ++
 varnish-cache/bin/varnishd/mgt_child.c             | 2 ++
 varnish-cache/bin/varnishd/mgt_cli.c               | 2 ++
 varnish-cache/bin/varnishd/mgt_event.c             | 2 ++
 varnish-cache/bin/varnishd/mgt_param.c             | 2 ++
 varnish-cache/bin/varnishd/mgt_vcc.c               | 2 ++
 varnish-cache/bin/varnishd/rfc2616.c               | 2 ++
 varnish-cache/bin/varnishd/shmlog.c                | 2 ++
 varnish-cache/bin/varnishd/stevedore.c             | 2 ++
 varnish-cache/bin/varnishd/storage_file.c          | 2 ++
 varnish-cache/bin/varnishd/storage_malloc.c        | 2 ++
 varnish-cache/bin/varnishd/tcp.c                   | 2 ++
 varnish-cache/bin/varnishd/varnishd.c              | 2 ++
 varnish-cache/bin/varnishhist/Makefile.am          | 2 --
 varnish-cache/bin/varnishhist/varnishhist.c        | 2 ++
 varnish-cache/bin/varnishlog/Makefile.am           | 2 --
 varnish-cache/bin/varnishlog/varnishlog.c          | 2 ++
 varnish-cache/bin/varnishncsa/Makefile.am          | 2 --
 varnish-cache/bin/varnishncsa/varnishncsa.c        | 2 ++
 varnish-cache/bin/varnishreplay/Makefile.am        | 2 --
 varnish-cache/bin/varnishreplay/varnishreplay.c    | 2 ++
 varnish-cache/bin/varnishstat/Makefile.am          | 2 --
 varnish-cache/bin/varnishstat/varnishstat.c        | 2 ++
 varnish-cache/bin/varnishtop/Makefile.am           | 2 --
 varnish-cache/bin/varnishtop/varnishtop.c          | 2 ++
 varnish-cache/lib/libvarnish/Makefile.am           | 2 --
 varnish-cache/lib/libvarnish/argv.c                | 2 ++
 varnish-cache/lib/libvarnish/assert.c              | 2 ++
 varnish-cache/lib/libvarnish/binary_heap.c         | 2 ++
 varnish-cache/lib/libvarnish/cli.c                 | 2 ++
 varnish-cache/lib/libvarnish/cli_common.c          | 2 ++
 varnish-cache/lib/libvarnish/crc32.c               | 2 ++
 varnish-cache/lib/libvarnish/flopen.c              | 2 ++
 varnish-cache/lib/libvarnish/num.c                 | 2 ++
 varnish-cache/lib/libvarnish/time.c                | 2 ++
 varnish-cache/lib/libvarnish/version.c             | 2 ++
 varnish-cache/lib/libvarnish/vpf.c                 | 2 ++
 varnish-cache/lib/libvarnish/vsb.c                 | 2 ++
 varnish-cache/lib/libvarnish/vss.c                 | 2 ++
 varnish-cache/lib/libvarnish/vtmpfile.c            | 2 ++
 varnish-cache/lib/libvarnishapi/Makefile.am        | 2 +-
 varnish-cache/lib/libvarnishapi/base64.c           | 2 ++
 varnish-cache/lib/libvarnishapi/instance.c         | 2 ++
 varnish-cache/lib/libvarnishapi/shmlog.c           | 2 ++
 varnish-cache/lib/libvarnishcompat/Makefile.am     | 2 --
 varnish-cache/lib/libvarnishcompat/asprintf.c      | 2 ++
 varnish-cache/lib/libvarnishcompat/daemon.c        | 2 ++
 varnish-cache/lib/libvarnishcompat/setproctitle.c  | 2 ++
 varnish-cache/lib/libvarnishcompat/srandomdev.c    | 2 ++
 varnish-cache/lib/libvarnishcompat/strlcat.c       | 2 ++
 varnish-cache/lib/libvarnishcompat/strlcpy.c       | 2 ++
 varnish-cache/lib/libvarnishcompat/strndup.c       | 2 ++
 varnish-cache/lib/libvarnishcompat/vasprintf.c     | 2 ++
 varnish-cache/lib/libvarnishcompat/vis.c           | 2 ++
 varnish-cache/lib/libvcl/Makefile.am               | 2 --
 varnish-cache/lib/libvcl/vcc_acl.c                 | 2 ++
 varnish-cache/lib/libvcl/vcc_action.c              | 2 ++
 varnish-cache/lib/libvcl/vcc_backend.c             | 2 ++
 varnish-cache/lib/libvcl/vcc_compile.c             | 2 ++
 varnish-cache/lib/libvcl/vcc_fixed_token.c         | 2 ++
 varnish-cache/lib/libvcl/vcc_gen_obj.tcl           | 1 +
 varnish-cache/lib/libvcl/vcc_parse.c               | 2 ++
 varnish-cache/lib/libvcl/vcc_string.c              | 2 ++
 varnish-cache/lib/libvcl/vcc_token.c               | 2 ++
 varnish-cache/lib/libvcl/vcc_var.c                 | 2 ++
 varnish-cache/lib/libvcl/vcc_xref.c                | 2 ++
 99 files changed, 175 insertions(+), 22 deletions(-)

diff --git a/varnish-cache/bin/varnishadm/Makefile.am b/varnish-cache/bin/varnishadm/Makefile.am
index 0efdd23c..f410a079 100644
--- a/varnish-cache/bin/varnishadm/Makefile.am
+++ b/varnish-cache/bin/varnishadm/Makefile.am
@@ -8,8 +8,6 @@ dist_man_MANS = varnishadm.1
 
 varnishadm_SOURCES = \
 	varnishadm.c
-	
-varnishadm_CFLAGS = -include config.h
 
 varnishadm_LDADD = \
 	$(top_builddir)/lib/libvarnish/libvarnish.la \
diff --git a/varnish-cache/bin/varnishadm/varnishadm.c b/varnish-cache/bin/varnishadm/varnishadm.c
index 000564e5..1031170b 100644
--- a/varnish-cache/bin/varnishadm/varnishadm.c
+++ b/varnish-cache/bin/varnishadm/varnishadm.c
@@ -29,6 +29,8 @@
  * $Id$
  */
 
+#include "config.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
diff --git a/varnish-cache/bin/varnishd/Makefile.am b/varnish-cache/bin/varnishd/Makefile.am
index 4e4bbede..fae571db 100644
--- a/varnish-cache/bin/varnishd/Makefile.am
+++ b/varnish-cache/bin/varnishd/Makefile.am
@@ -64,7 +64,7 @@ noinst_HEADERS = \
 	steps.h \
 	stevedore.h
 
-varnishd_CFLAGS = -include config.h \
+varnishd_CFLAGS = \
         -DVARNISH_STATE_DIR='"${VARNISH_STATE_DIR}"'
 
 varnishd_LDFLAGS = -export-dynamic
diff --git a/varnish-cache/bin/varnishd/cache_acceptor.c b/varnish-cache/bin/varnishd/cache_acceptor.c
index 71bb015e..a6b778f4 100644
--- a/varnish-cache/bin/varnishd/cache_acceptor.c
+++ b/varnish-cache/bin/varnishd/cache_acceptor.c
@@ -33,6 +33,8 @@
  * write the session pointer to a pipe which the event engine monitors.
  */
 
+#include "config.h"
+
 #include <stdio.h>
 #include <errno.h>
 #include <poll.h>
diff --git a/varnish-cache/bin/varnishd/cache_acceptor_epoll.c b/varnish-cache/bin/varnishd/cache_acceptor_epoll.c
index b09200d0..395a4474 100644
--- a/varnish-cache/bin/varnishd/cache_acceptor_epoll.c
+++ b/varnish-cache/bin/varnishd/cache_acceptor_epoll.c
@@ -31,6 +31,8 @@
  * write the session pointer to a pipe which the event engine monitors.
  */
 
+#include "config.h"
+
 #if defined(HAVE_EPOLL_CTL)
 
 #include <stdio.h>
diff --git a/varnish-cache/bin/varnishd/cache_acceptor_kqueue.c b/varnish-cache/bin/varnishd/cache_acceptor_kqueue.c
index ea5808d0..41933a20 100644
--- a/varnish-cache/bin/varnishd/cache_acceptor_kqueue.c
+++ b/varnish-cache/bin/varnishd/cache_acceptor_kqueue.c
@@ -33,6 +33,8 @@
  * write the session pointer to a pipe which the event engine monitors.
  */
 
+#include "config.h"
+
 #if defined(HAVE_KQUEUE)
 
 #include <stdio.h>
diff --git a/varnish-cache/bin/varnishd/cache_acceptor_poll.c b/varnish-cache/bin/varnishd/cache_acceptor_poll.c
index de2fd511..2fdf2a97 100644
--- a/varnish-cache/bin/varnishd/cache_acceptor_poll.c
+++ b/varnish-cache/bin/varnishd/cache_acceptor_poll.c
@@ -30,6 +30,8 @@
  *
  */
 
+#include "config.h"
+
 #if defined(HAVE_POLL)
 
 #include <stdio.h>
diff --git a/varnish-cache/bin/varnishd/cache_backend.c b/varnish-cache/bin/varnishd/cache_backend.c
index a8493170..81820e58 100644
--- a/varnish-cache/bin/varnishd/cache_backend.c
+++ b/varnish-cache/bin/varnishd/cache_backend.c
@@ -66,6 +66,8 @@
  *
  */
 
+#include "config.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/varnish-cache/bin/varnishd/cache_ban.c b/varnish-cache/bin/varnishd/cache_ban.c
index 5cf25474..f88075e9 100644
--- a/varnish-cache/bin/varnishd/cache_ban.c
+++ b/varnish-cache/bin/varnishd/cache_ban.c
@@ -31,6 +31,8 @@
  * Ban processing
  */
 
+#include "config.h"
+
 #include <sys/types.h>
 
 #include <stdlib.h>
diff --git a/varnish-cache/bin/varnishd/cache_center.c b/varnish-cache/bin/varnishd/cache_center.c
index 8a1929a1..a30d2dea 100644
--- a/varnish-cache/bin/varnishd/cache_center.c
+++ b/varnish-cache/bin/varnishd/cache_center.c
@@ -56,6 +56,8 @@ DOT ERROR [shape=plaintext]
 DOT acceptor -> start [style=bold,color=green,weight=4]
  */
 
+#include "config.h"
+
 #include <stdio.h>
 #include <errno.h>
 #include <math.h>
diff --git a/varnish-cache/bin/varnishd/cache_cli.c b/varnish-cache/bin/varnishd/cache_cli.c
index 0da5737b..12762920 100644
--- a/varnish-cache/bin/varnishd/cache_cli.c
+++ b/varnish-cache/bin/varnishd/cache_cli.c
@@ -29,6 +29,8 @@
  * $Id$
  */
 
+#include "config.h"
+
 #include <stdio.h>
 #include <errno.h>
 #include <stdlib.h>
diff --git a/varnish-cache/bin/varnishd/cache_dir_random.c b/varnish-cache/bin/varnishd/cache_dir_random.c
index 99042319..25abe586 100644
--- a/varnish-cache/bin/varnishd/cache_dir_random.c
+++ b/varnish-cache/bin/varnishd/cache_dir_random.c
@@ -30,6 +30,8 @@
  *
  */
 
+#include "config.h"
+
 #include <sys/types.h>
 #include <sys/socket.h>
 
diff --git a/varnish-cache/bin/varnishd/cache_dir_simple.c b/varnish-cache/bin/varnishd/cache_dir_simple.c
index 227f7cdc..5cc51313 100644
--- a/varnish-cache/bin/varnishd/cache_dir_simple.c
+++ b/varnish-cache/bin/varnishd/cache_dir_simple.c
@@ -30,6 +30,8 @@
  *
  */
 
+#include "config.h"
+
 #include <sys/types.h>
 #include <sys/socket.h>
 
diff --git a/varnish-cache/bin/varnishd/cache_expire.c b/varnish-cache/bin/varnishd/cache_expire.c
index 5bb3aa8e..186188e2 100644
--- a/varnish-cache/bin/varnishd/cache_expire.c
+++ b/varnish-cache/bin/varnishd/cache_expire.c
@@ -38,6 +38,8 @@
  * XXX: are ready.
  */
 
+#include "config.h"
+
 #include <unistd.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/varnish-cache/bin/varnishd/cache_fetch.c b/varnish-cache/bin/varnishd/cache_fetch.c
index 929fe773..0928ef94 100644
--- a/varnish-cache/bin/varnishd/cache_fetch.c
+++ b/varnish-cache/bin/varnishd/cache_fetch.c
@@ -29,6 +29,8 @@
  * $Id$
  */
 
+#include "config.h"
+
 #include <stdio.h>
 #include <inttypes.h>
 #include <string.h>
diff --git a/varnish-cache/bin/varnishd/cache_hash.c b/varnish-cache/bin/varnishd/cache_hash.c
index 85a9da14..a1ff391b 100644
--- a/varnish-cache/bin/varnishd/cache_hash.c
+++ b/varnish-cache/bin/varnishd/cache_hash.c
@@ -52,6 +52,8 @@
  * not busy only once.
  */
 
+#include "config.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/varnish-cache/bin/varnishd/cache_http.c b/varnish-cache/bin/varnishd/cache_http.c
index 78c26085..ea7e4db7 100644
--- a/varnish-cache/bin/varnishd/cache_http.c
+++ b/varnish-cache/bin/varnishd/cache_http.c
@@ -31,6 +31,8 @@
  * HTTP request storage and manipulation
  */
 
+#include "config.h"
+
 #include <ctype.h>
 #include <errno.h>
 #include <unistd.h>
diff --git a/varnish-cache/bin/varnishd/cache_httpconn.c b/varnish-cache/bin/varnishd/cache_httpconn.c
index 7b410c60..dae3f495 100644
--- a/varnish-cache/bin/varnishd/cache_httpconn.c
+++ b/varnish-cache/bin/varnishd/cache_httpconn.c
@@ -31,6 +31,8 @@
  * HTTP protocol requests
  */
 
+#include "config.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>
diff --git a/varnish-cache/bin/varnishd/cache_main.c b/varnish-cache/bin/varnishd/cache_main.c
index b3cb1694..d7c86289 100644
--- a/varnish-cache/bin/varnishd/cache_main.c
+++ b/varnish-cache/bin/varnishd/cache_main.c
@@ -29,6 +29,8 @@
  * $Id$
  */
 
+#include "config.h"
+
 #include <stdio.h>
 #include <unistd.h>
 #include <stdlib.h>
diff --git a/varnish-cache/bin/varnishd/cache_panic.c b/varnish-cache/bin/varnishd/cache_panic.c
index 83d10bb5..f2c6d97c 100644
--- a/varnish-cache/bin/varnishd/cache_panic.c
+++ b/varnish-cache/bin/varnishd/cache_panic.c
@@ -29,6 +29,8 @@
  * $Id$
  */
 
+#include "config.h"
+
 #include <signal.h>
 #include <stdarg.h>
 #include <stdio.h>
diff --git a/varnish-cache/bin/varnishd/cache_pipe.c b/varnish-cache/bin/varnishd/cache_pipe.c
index ea95123b..c5d02033 100644
--- a/varnish-cache/bin/varnishd/cache_pipe.c
+++ b/varnish-cache/bin/varnishd/cache_pipe.c
@@ -31,6 +31,8 @@
  * XXX: charge bytes to srcaddr
  */
 
+#include "config.h"
+
 #include <stdio.h>
 #include <unistd.h>
 #include <string.h>
diff --git a/varnish-cache/bin/varnishd/cache_pool.c b/varnish-cache/bin/varnishd/cache_pool.c
index 90edfe2e..2e569c57 100644
--- a/varnish-cache/bin/varnishd/cache_pool.c
+++ b/varnish-cache/bin/varnishd/cache_pool.c
@@ -31,6 +31,8 @@
  * XXX: automatic thread-pool size adaptation.
  */
 
+#include "config.h"
+
 #include <sys/types.h>
 #include <sys/uio.h>
 
diff --git a/varnish-cache/bin/varnishd/cache_response.c b/varnish-cache/bin/varnishd/cache_response.c
index aa4021f8..b341ef16 100644
--- a/varnish-cache/bin/varnishd/cache_response.c
+++ b/varnish-cache/bin/varnishd/cache_response.c
@@ -29,6 +29,8 @@
  * $Id$
  */
 
+#include "config.h"
+
 #include <sys/types.h>
 #include <sys/time.h>
 
diff --git a/varnish-cache/bin/varnishd/cache_session.c b/varnish-cache/bin/varnishd/cache_session.c
index 42dd94bb..2a085f3a 100644
--- a/varnish-cache/bin/varnishd/cache_session.c
+++ b/varnish-cache/bin/varnishd/cache_session.c
@@ -48,6 +48,8 @@
  * XXX: we still have to do the source-addr lookup.
  */
 
+#include "config.h"
+
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
diff --git a/varnish-cache/bin/varnishd/cache_synthetic.c b/varnish-cache/bin/varnishd/cache_synthetic.c
index 0585de56..0b177a12 100644
--- a/varnish-cache/bin/varnishd/cache_synthetic.c
+++ b/varnish-cache/bin/varnishd/cache_synthetic.c
@@ -28,6 +28,8 @@
  * $Id$
  */
 
+#include "config.h"
+
 #include <sys/types.h>
 #include <sys/time.h>
 
diff --git a/varnish-cache/bin/varnishd/cache_vary.c b/varnish-cache/bin/varnishd/cache_vary.c
index 398a2911..94eea721 100644
--- a/varnish-cache/bin/varnishd/cache_vary.c
+++ b/varnish-cache/bin/varnishd/cache_vary.c
@@ -54,6 +54,8 @@
  *      '\0'
  */
 
+#include "config.h"
+
 #include <ctype.h>
 #include <string.h>
 #include <stdlib.h>
diff --git a/varnish-cache/bin/varnishd/cache_vcl.c b/varnish-cache/bin/varnishd/cache_vcl.c
index a2ae4b9d..b0cf289f 100644
--- a/varnish-cache/bin/varnishd/cache_vcl.c
+++ b/varnish-cache/bin/varnishd/cache_vcl.c
@@ -33,6 +33,8 @@
  * The interface *from* the compiled VCL code is in cache_vrt.c.
  */
 
+#include "config.h"
+
 #include <stdio.h>
 #include <unistd.h>
 #include <string.h>
diff --git a/varnish-cache/bin/varnishd/cache_vrt.c b/varnish-cache/bin/varnishd/cache_vrt.c
index 503b7a78..1a40b34d 100644
--- a/varnish-cache/bin/varnishd/cache_vrt.c
+++ b/varnish-cache/bin/varnishd/cache_vrt.c
@@ -31,6 +31,8 @@
  * Runtime support for compiled VCL programs
  */
 
+#include "config.h"
+
 #include <sys/types.h>
 #include <sys/socket.h>
 
diff --git a/varnish-cache/bin/varnishd/cache_vrt_acl.c b/varnish-cache/bin/varnishd/cache_vrt_acl.c
index a5db45d3..55dab36a 100644
--- a/varnish-cache/bin/varnishd/cache_vrt_acl.c
+++ b/varnish-cache/bin/varnishd/cache_vrt_acl.c
@@ -34,6 +34,8 @@
  * XXX: a refresh facility.
  */
 
+#include "config.h"
+
 #include <sys/types.h>
 
 #include <stdio.h>
diff --git a/varnish-cache/bin/varnishd/cache_vrt_esi.c b/varnish-cache/bin/varnishd/cache_vrt_esi.c
index 5e26a6d1..6c4234cd 100644
--- a/varnish-cache/bin/varnishd/cache_vrt_esi.c
+++ b/varnish-cache/bin/varnishd/cache_vrt_esi.c
@@ -40,6 +40,8 @@
  * hanging, esi:include
  */
 
+#include "config.h"
+
 #include <stdio.h>
 #include <unistd.h>
 #include <ctype.h>
diff --git a/varnish-cache/bin/varnishd/cache_vrt_re.c b/varnish-cache/bin/varnishd/cache_vrt_re.c
index 37a3a193..c3c84d46 100644
--- a/varnish-cache/bin/varnishd/cache_vrt_re.c
+++ b/varnish-cache/bin/varnishd/cache_vrt_re.c
@@ -31,6 +31,8 @@
  * Runtime support for compiled VCL programs, regexps
  */
 
+#include "config.h"
+
 #include <sys/types.h>
 
 #include <stdio.h>
diff --git a/varnish-cache/bin/varnishd/cache_ws.c b/varnish-cache/bin/varnishd/cache_ws.c
index 46a0d0c9..728b5e75 100644
--- a/varnish-cache/bin/varnishd/cache_ws.c
+++ b/varnish-cache/bin/varnishd/cache_ws.c
@@ -30,6 +30,8 @@
  *
  */
 
+#include "config.h"
+
 #include <sys/types.h>
 #include <sys/uio.h>
 
diff --git a/varnish-cache/bin/varnishd/hash_classic.c b/varnish-cache/bin/varnishd/hash_classic.c
index 25ee408a..fac93f8c 100644
--- a/varnish-cache/bin/varnishd/hash_classic.c
+++ b/varnish-cache/bin/varnishd/hash_classic.c
@@ -31,6 +31,8 @@
  * A classic bucketed hash
  */
 
+#include "config.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/varnish-cache/bin/varnishd/hash_simple_list.c b/varnish-cache/bin/varnishd/hash_simple_list.c
index 8faf2127..7d13cb27 100644
--- a/varnish-cache/bin/varnishd/hash_simple_list.c
+++ b/varnish-cache/bin/varnishd/hash_simple_list.c
@@ -31,6 +31,8 @@
  * This is the reference hash(/lookup) implementation
  */
 
+#include "config.h"
+
 #include <sys/types.h>
 
 #include <stdio.h>
diff --git a/varnish-cache/bin/varnishd/mgt_child.c b/varnish-cache/bin/varnishd/mgt_child.c
index 335df6d8..1c2f4375 100644
--- a/varnish-cache/bin/varnishd/mgt_child.c
+++ b/varnish-cache/bin/varnishd/mgt_child.c
@@ -31,6 +31,8 @@
  * The mechanics of handling the child process
  */
 
+#include "config.h"
+
 #include <unistd.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/varnish-cache/bin/varnishd/mgt_cli.c b/varnish-cache/bin/varnishd/mgt_cli.c
index c607f40e..a68e7b9c 100644
--- a/varnish-cache/bin/varnishd/mgt_cli.c
+++ b/varnish-cache/bin/varnishd/mgt_cli.c
@@ -31,6 +31,8 @@
  * The management process' CLI handling
  */
 
+#include "config.h"
+
 #include <sys/types.h>
 
 #include <stdarg.h>
diff --git a/varnish-cache/bin/varnishd/mgt_event.c b/varnish-cache/bin/varnishd/mgt_event.c
index aee8b571..f1264fa8 100644
--- a/varnish-cache/bin/varnishd/mgt_event.c
+++ b/varnish-cache/bin/varnishd/mgt_event.c
@@ -29,6 +29,8 @@
  * $Id$
  */
 
+#include "config.h"
+
 #include <stdio.h>
 #include <errno.h>
 #include <poll.h>
diff --git a/varnish-cache/bin/varnishd/mgt_param.c b/varnish-cache/bin/varnishd/mgt_param.c
index b4873886..5d99c1cf 100644
--- a/varnish-cache/bin/varnishd/mgt_param.c
+++ b/varnish-cache/bin/varnishd/mgt_param.c
@@ -29,6 +29,8 @@
  * $Id$
  */
 
+#include "config.h"
+
 #include <sys/types.h>
 #include <sys/stat.h>
 
diff --git a/varnish-cache/bin/varnishd/mgt_vcc.c b/varnish-cache/bin/varnishd/mgt_vcc.c
index 321715b7..199edc8c 100644
--- a/varnish-cache/bin/varnishd/mgt_vcc.c
+++ b/varnish-cache/bin/varnishd/mgt_vcc.c
@@ -31,6 +31,8 @@
  * VCL compiler stuff
  */
 
+#include "config.h"
+
 #include <sys/types.h>
 #include <sys/wait.h>
 
diff --git a/varnish-cache/bin/varnishd/rfc2616.c b/varnish-cache/bin/varnishd/rfc2616.c
index 31ddc102..4ab8c5d2 100644
--- a/varnish-cache/bin/varnishd/rfc2616.c
+++ b/varnish-cache/bin/varnishd/rfc2616.c
@@ -29,6 +29,8 @@
  * $Id$
  */
 
+#include "config.h"
+
 #include <sys/types.h>
 
 #include <stdio.h>
diff --git a/varnish-cache/bin/varnishd/shmlog.c b/varnish-cache/bin/varnishd/shmlog.c
index 9a42c7c2..821ed8d1 100644
--- a/varnish-cache/bin/varnishd/shmlog.c
+++ b/varnish-cache/bin/varnishd/shmlog.c
@@ -29,6 +29,8 @@
  * $Id$
  */
 
+#include "config.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
diff --git a/varnish-cache/bin/varnishd/stevedore.c b/varnish-cache/bin/varnishd/stevedore.c
index ce67f531..ed25af27 100644
--- a/varnish-cache/bin/varnishd/stevedore.c
+++ b/varnish-cache/bin/varnishd/stevedore.c
@@ -28,6 +28,8 @@
  * $Id$
  */
 
+#include "config.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/varnish-cache/bin/varnishd/storage_file.c b/varnish-cache/bin/varnishd/storage_file.c
index 834ebb99..ce772374 100644
--- a/varnish-cache/bin/varnishd/storage_file.c
+++ b/varnish-cache/bin/varnishd/storage_file.c
@@ -31,6 +31,8 @@
  * Storage method based on mmap'ed file
  */
 
+#include "config.h"
+
 #include <sys/param.h>
 #include <sys/mman.h>
 #include <sys/socket.h>
diff --git a/varnish-cache/bin/varnishd/storage_malloc.c b/varnish-cache/bin/varnishd/storage_malloc.c
index df2e263f..db4a8080 100644
--- a/varnish-cache/bin/varnishd/storage_malloc.c
+++ b/varnish-cache/bin/varnishd/storage_malloc.c
@@ -31,6 +31,8 @@
  * Storage method based on malloc(3)
  */
 
+#include "config.h"
+
 #include <sys/types.h>
 
 #include <stdlib.h>
diff --git a/varnish-cache/bin/varnishd/tcp.c b/varnish-cache/bin/varnishd/tcp.c
index 52d557fa..b8526b51 100644
--- a/varnish-cache/bin/varnishd/tcp.c
+++ b/varnish-cache/bin/varnishd/tcp.c
@@ -29,6 +29,8 @@
  * $Id$
  */
 
+#include "config.h"
+
 #include <sys/types.h>
 #include <sys/socket.h>
 
diff --git a/varnish-cache/bin/varnishd/varnishd.c b/varnish-cache/bin/varnishd/varnishd.c
index 3dc8e7f4..2ebd122a 100644
--- a/varnish-cache/bin/varnishd/varnishd.c
+++ b/varnish-cache/bin/varnishd/varnishd.c
@@ -31,6 +31,8 @@
  * The management process and CLI handling
  */
 
+#include "config.h"
+
 #include <sys/stat.h>
 
 #include <ctype.h>
diff --git a/varnish-cache/bin/varnishhist/Makefile.am b/varnish-cache/bin/varnishhist/Makefile.am
index 6f65f7e8..1f421959 100644
--- a/varnish-cache/bin/varnishhist/Makefile.am
+++ b/varnish-cache/bin/varnishhist/Makefile.am
@@ -8,8 +8,6 @@ dist_man_MANS = varnishhist.1
 
 varnishhist_SOURCES = varnishhist.c
 
-varnishhist_CFLAGS = -include config.h
-
 varnishhist_LDADD = \
 	$(top_builddir)/lib/libvarnish/libvarnish.la \
 	$(top_builddir)/lib/libvarnishcompat/libvarnishcompat.la \
diff --git a/varnish-cache/bin/varnishhist/varnishhist.c b/varnish-cache/bin/varnishhist/varnishhist.c
index 6d589c7f..838f8d34 100644
--- a/varnish-cache/bin/varnishhist/varnishhist.c
+++ b/varnish-cache/bin/varnishhist/varnishhist.c
@@ -32,6 +32,8 @@
  * Log tailer for Varnish
  */
 
+#include "config.h"
+
 #include <curses.h>
 #include <errno.h>
 #include <limits.h>
diff --git a/varnish-cache/bin/varnishlog/Makefile.am b/varnish-cache/bin/varnishlog/Makefile.am
index 6901cf7c..11d025e3 100644
--- a/varnish-cache/bin/varnishlog/Makefile.am
+++ b/varnish-cache/bin/varnishlog/Makefile.am
@@ -8,8 +8,6 @@ dist_man_MANS = varnishlog.1
 
 varnishlog_SOURCES = varnishlog.c
 
-varnishlog_CFLAGS = -include config.h
-
 varnishlog_LDADD = \
 	$(top_builddir)/lib/libvarnish/libvarnish.la \
 	$(top_builddir)/lib/libvarnishcompat/libvarnishcompat.la \
diff --git a/varnish-cache/bin/varnishlog/varnishlog.c b/varnish-cache/bin/varnishlog/varnishlog.c
index f906fe70..3152dd4f 100644
--- a/varnish-cache/bin/varnishlog/varnishlog.c
+++ b/varnish-cache/bin/varnishlog/varnishlog.c
@@ -31,6 +31,8 @@
  * Log tailer for Varnish
  */
 
+#include "config.h"
+
 #include <errno.h>
 #include <fcntl.h>
 #include <regex.h>
diff --git a/varnish-cache/bin/varnishncsa/Makefile.am b/varnish-cache/bin/varnishncsa/Makefile.am
index 2103090f..48366b48 100644
--- a/varnish-cache/bin/varnishncsa/Makefile.am
+++ b/varnish-cache/bin/varnishncsa/Makefile.am
@@ -8,8 +8,6 @@ dist_man_MANS = varnishncsa.1
 
 varnishncsa_SOURCES = varnishncsa.c
 
-varnishncsa_CFLAGS = -include config.h
-
 varnishncsa_LDADD = \
 	$(top_builddir)/lib/libvarnish/libvarnish.la \
 	$(top_builddir)/lib/libvarnishcompat/libvarnishcompat.la \
diff --git a/varnish-cache/bin/varnishncsa/varnishncsa.c b/varnish-cache/bin/varnishncsa/varnishncsa.c
index 905c061d..39993135 100644
--- a/varnish-cache/bin/varnishncsa/varnishncsa.c
+++ b/varnish-cache/bin/varnishncsa/varnishncsa.c
@@ -59,6 +59,8 @@
  *		- Maybe rotate/compress log
  */
 
+#include "config.h"
+
 #include <ctype.h>
 #include <errno.h>
 #include <signal.h>
diff --git a/varnish-cache/bin/varnishreplay/Makefile.am b/varnish-cache/bin/varnishreplay/Makefile.am
index bef4a6fb..a7e4b8a0 100644
--- a/varnish-cache/bin/varnishreplay/Makefile.am
+++ b/varnish-cache/bin/varnishreplay/Makefile.am
@@ -8,8 +8,6 @@ dist_man_MANS = varnishreplay.1
 
 varnishreplay_SOURCES = \
 	varnishreplay.c
-	
-varnishreplay_CFLAGS = -include config.h
 
 varnishreplay_LDADD = \
 	$(top_builddir)/lib/libvarnish/libvarnish.la \
diff --git a/varnish-cache/bin/varnishreplay/varnishreplay.c b/varnish-cache/bin/varnishreplay/varnishreplay.c
index 09fe4486..043de39c 100644
--- a/varnish-cache/bin/varnishreplay/varnishreplay.c
+++ b/varnish-cache/bin/varnishreplay/varnishreplay.c
@@ -28,6 +28,8 @@
  * $Id$
  */
 
+#include "config.h"
+
 #include <ctype.h>
 #include <errno.h>
 #include <fcntl.h>
diff --git a/varnish-cache/bin/varnishstat/Makefile.am b/varnish-cache/bin/varnishstat/Makefile.am
index 647ecb46..7bc1c964 100644
--- a/varnish-cache/bin/varnishstat/Makefile.am
+++ b/varnish-cache/bin/varnishstat/Makefile.am
@@ -8,8 +8,6 @@ dist_man_MANS = varnishstat.1
 
 varnishstat_SOURCES = varnishstat.c
 
-varnishstat_CFLAGS = -include config.h
-
 varnishstat_LDADD = \
 	$(top_builddir)/lib/libvarnish/libvarnish.la \
 	$(top_builddir)/lib/libvarnishcompat/libvarnishcompat.la \
diff --git a/varnish-cache/bin/varnishstat/varnishstat.c b/varnish-cache/bin/varnishstat/varnishstat.c
index 9c95ab4c..71e49372 100644
--- a/varnish-cache/bin/varnishstat/varnishstat.c
+++ b/varnish-cache/bin/varnishstat/varnishstat.c
@@ -32,6 +32,8 @@
  * Log tailer for Varnish
  */
 
+#include "config.h"
+
 #include <sys/time.h>
 
 #include <curses.h>
diff --git a/varnish-cache/bin/varnishtop/Makefile.am b/varnish-cache/bin/varnishtop/Makefile.am
index 618892ae..8d0291a0 100644
--- a/varnish-cache/bin/varnishtop/Makefile.am
+++ b/varnish-cache/bin/varnishtop/Makefile.am
@@ -8,8 +8,6 @@ dist_man_MANS = varnishtop.1
 
 varnishtop_SOURCES = varnishtop.c
 
-varnishtop_CFLAGS = -include config.h
-
 varnishtop_LDADD = \
 	$(top_builddir)/lib/libvarnish/libvarnish.la \
 	$(top_builddir)/lib/libvarnishcompat/libvarnishcompat.la \
diff --git a/varnish-cache/bin/varnishtop/varnishtop.c b/varnish-cache/bin/varnishtop/varnishtop.c
index 56d8c819..bcc45be2 100644
--- a/varnish-cache/bin/varnishtop/varnishtop.c
+++ b/varnish-cache/bin/varnishtop/varnishtop.c
@@ -32,6 +32,8 @@
  * Log tailer for Varnish
  */
 
+#include "config.h"
+
 #include <ctype.h>
 #include <curses.h>
 #include <errno.h>
diff --git a/varnish-cache/lib/libvarnish/Makefile.am b/varnish-cache/lib/libvarnish/Makefile.am
index b035203f..692a485c 100644
--- a/varnish-cache/lib/libvarnish/Makefile.am
+++ b/varnish-cache/lib/libvarnish/Makefile.am
@@ -20,8 +20,6 @@ libvarnish_la_SOURCES = \
 	vss.c \
 	vtmpfile.c
 
-libvarnish_la_CFLAGS = -include config.h
-
 libvarnish_la_LIBADD = ${RT_LIBS} ${NET_LIBS}
 
 TESTS = num_c_test
diff --git a/varnish-cache/lib/libvarnish/argv.c b/varnish-cache/lib/libvarnish/argv.c
index 8cac45bd..f5b6ea8b 100644
--- a/varnish-cache/lib/libvarnish/argv.c
+++ b/varnish-cache/lib/libvarnish/argv.c
@@ -38,6 +38,8 @@
  *
  */
 
+#include "config.h"
+
 #include <ctype.h>
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/varnish-cache/lib/libvarnish/assert.c b/varnish-cache/lib/libvarnish/assert.c
index f715cc74..b9ea7399 100644
--- a/varnish-cache/lib/libvarnish/assert.c
+++ b/varnish-cache/lib/libvarnish/assert.c
@@ -29,6 +29,8 @@
  * $Id$
  */
 
+#include "config.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/varnish-cache/lib/libvarnish/binary_heap.c b/varnish-cache/lib/libvarnish/binary_heap.c
index 3ec0f9cc..1b0a6322 100644
--- a/varnish-cache/lib/libvarnish/binary_heap.c
+++ b/varnish-cache/lib/libvarnish/binary_heap.c
@@ -36,6 +36,8 @@
  * XXX: the array is not scaled back when items are deleted.
  */
 
+#include "config.h"
+
 #include <unistd.h>
 #include <stdlib.h>
 
diff --git a/varnish-cache/lib/libvarnish/cli.c b/varnish-cache/lib/libvarnish/cli.c
index 3f6f8c00..7827d34a 100644
--- a/varnish-cache/lib/libvarnish/cli.c
+++ b/varnish-cache/lib/libvarnish/cli.c
@@ -31,6 +31,8 @@
  * Stuff for handling the CLI protocol
  */
 
+#include "config.h"
+
 #include <ctype.h>
 #include <string.h>
 #include <stdio.h>
diff --git a/varnish-cache/lib/libvarnish/cli_common.c b/varnish-cache/lib/libvarnish/cli_common.c
index f9210137..d375428d 100644
--- a/varnish-cache/lib/libvarnish/cli_common.c
+++ b/varnish-cache/lib/libvarnish/cli_common.c
@@ -29,6 +29,8 @@
  * $Id$
  */
 
+#include "config.h"
+
 #include <sys/types.h>
 #include <sys/uio.h>
 
diff --git a/varnish-cache/lib/libvarnish/crc32.c b/varnish-cache/lib/libvarnish/crc32.c
index 35834968..883439d6 100644
--- a/varnish-cache/lib/libvarnish/crc32.c
+++ b/varnish-cache/lib/libvarnish/crc32.c
@@ -31,6 +31,8 @@
  * This CRC32 implementation is in the public domain.
  */
 
+#include "config.h"
+
 #include "libvarnish.h"
 
 /*--------------------------------------------------------------------*/
diff --git a/varnish-cache/lib/libvarnish/flopen.c b/varnish-cache/lib/libvarnish/flopen.c
index f180b999..98eb95ae 100644
--- a/varnish-cache/lib/libvarnish/flopen.c
+++ b/varnish-cache/lib/libvarnish/flopen.c
@@ -29,6 +29,8 @@
  * $FreeBSD: src/lib/libutil/flopen.c,v 1.7 2007/05/23 12:09:33 des Exp $
  */
 
+#include "config.h"
+
 #include <sys/file.h>
 #include <sys/stat.h>
 
diff --git a/varnish-cache/lib/libvarnish/num.c b/varnish-cache/lib/libvarnish/num.c
index bf16f0c8..517619a1 100644
--- a/varnish-cache/lib/libvarnish/num.c
+++ b/varnish-cache/lib/libvarnish/num.c
@@ -30,6 +30,8 @@
  * Deal with numbers with data storage suffix scaling
  */
 
+#include "config.h"
+
 #include <math.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/varnish-cache/lib/libvarnish/time.c b/varnish-cache/lib/libvarnish/time.c
index c8cbb240..8061c8c8 100644
--- a/varnish-cache/lib/libvarnish/time.c
+++ b/varnish-cache/lib/libvarnish/time.c
@@ -46,6 +46,8 @@
  *
  */
 
+#include "config.h"
+
 #include <sys/time.h>
 
 #include <stdio.h>
diff --git a/varnish-cache/lib/libvarnish/version.c b/varnish-cache/lib/libvarnish/version.c
index 1530b743..f1ffa47d 100644
--- a/varnish-cache/lib/libvarnish/version.c
+++ b/varnish-cache/lib/libvarnish/version.c
@@ -31,6 +31,8 @@
  * Display a standardized version message.
  */
 
+#include "config.h"
+
 #include <stdio.h>
 
 #include "libvarnish.h"
diff --git a/varnish-cache/lib/libvarnish/vpf.c b/varnish-cache/lib/libvarnish/vpf.c
index 17e24572..72e9bed9 100644
--- a/varnish-cache/lib/libvarnish/vpf.c
+++ b/varnish-cache/lib/libvarnish/vpf.c
@@ -28,6 +28,8 @@
  * $FreeBSD: src/lib/libutil/pidfile.c,v 1.5 2007/05/11 11:10:05 des Exp $
  */
 
+#include "config.h"
+
 #include <sys/param.h>
 #include <sys/file.h>
 #include <sys/stat.h>
diff --git a/varnish-cache/lib/libvarnish/vsb.c b/varnish-cache/lib/libvarnish/vsb.c
index 998b80ff..8c96f1e6 100644
--- a/varnish-cache/lib/libvarnish/vsb.c
+++ b/varnish-cache/lib/libvarnish/vsb.c
@@ -29,6 +29,8 @@
  * $FreeBSD: src/sys/kern/subr_sbuf.c,v 1.30 2005/12/23 11:49:53 phk Exp $
  */
 
+#include "config.h"
+
 #include <ctype.h>
 #include <stdarg.h>
 #include <stdio.h>
diff --git a/varnish-cache/lib/libvarnish/vss.c b/varnish-cache/lib/libvarnish/vss.c
index 03d96ead..2bfff35e 100644
--- a/varnish-cache/lib/libvarnish/vss.c
+++ b/varnish-cache/lib/libvarnish/vss.c
@@ -30,6 +30,8 @@
  * $Id$
  */
 
+#include "config.h"
+
 #include <sys/types.h>
 #include <sys/socket.h>
 
diff --git a/varnish-cache/lib/libvarnish/vtmpfile.c b/varnish-cache/lib/libvarnish/vtmpfile.c
index ec0aa530..ae64be32 100644
--- a/varnish-cache/lib/libvarnish/vtmpfile.c
+++ b/varnish-cache/lib/libvarnish/vtmpfile.c
@@ -29,6 +29,8 @@
  * $Id$
  */
 
+#include "config.h"
+
 #include <errno.h>
 #include <fcntl.h>
 #include <stdio.h>
diff --git a/varnish-cache/lib/libvarnishapi/Makefile.am b/varnish-cache/lib/libvarnishapi/Makefile.am
index 5a6114a4..6973fcda 100644
--- a/varnish-cache/lib/libvarnishapi/Makefile.am
+++ b/varnish-cache/lib/libvarnishapi/Makefile.am
@@ -9,5 +9,5 @@ libvarnishapi_la_SOURCES = \
 	instance.c \
 	shmlog.c
 
-libvarnishapi_la_CFLAGS = -include config.h \
+libvarnishapi_la_CFLAGS = \
 	-DVARNISH_STATE_DIR='"${VARNISH_STATE_DIR}"'
diff --git a/varnish-cache/lib/libvarnishapi/base64.c b/varnish-cache/lib/libvarnishapi/base64.c
index b4d3a906..4506ba48 100644
--- a/varnish-cache/lib/libvarnishapi/base64.c
+++ b/varnish-cache/lib/libvarnishapi/base64.c
@@ -6,6 +6,8 @@
  * $Id$
  */
 
+#include "config.h"
+
 #include <sys/types.h>
 #include <stdint.h>
 #include "varnishapi.h"
diff --git a/varnish-cache/lib/libvarnishapi/instance.c b/varnish-cache/lib/libvarnishapi/instance.c
index 93906ba6..f75d20f4 100644
--- a/varnish-cache/lib/libvarnishapi/instance.c
+++ b/varnish-cache/lib/libvarnishapi/instance.c
@@ -28,6 +28,8 @@
  * $Id$
  */
 
+#include "config.h"
+
 #include <errno.h>
 #include <stdio.h>
 #include <unistd.h>
diff --git a/varnish-cache/lib/libvarnishapi/shmlog.c b/varnish-cache/lib/libvarnishapi/shmlog.c
index ce6f6e75..7311aa9b 100644
--- a/varnish-cache/lib/libvarnishapi/shmlog.c
+++ b/varnish-cache/lib/libvarnishapi/shmlog.c
@@ -29,6 +29,8 @@
  * $Id$
  */
 
+#include "config.h"
+
 #include <sys/types.h>
 #include <sys/mman.h>
 
diff --git a/varnish-cache/lib/libvarnishcompat/Makefile.am b/varnish-cache/lib/libvarnishcompat/Makefile.am
index 07a4ebda..83390a63 100644
--- a/varnish-cache/lib/libvarnishcompat/Makefile.am
+++ b/varnish-cache/lib/libvarnishcompat/Makefile.am
@@ -14,5 +14,3 @@ libvarnishcompat_la_SOURCES = \
 	strlcpy.c \
 	strndup.c \
 	vis.c
-
-libvarnishcompat_la_CFLAGS = -include config.h
diff --git a/varnish-cache/lib/libvarnishcompat/asprintf.c b/varnish-cache/lib/libvarnishcompat/asprintf.c
index eb41ce8b..551bebe8 100644
--- a/varnish-cache/lib/libvarnishcompat/asprintf.c
+++ b/varnish-cache/lib/libvarnishcompat/asprintf.c
@@ -30,6 +30,8 @@
  *
  */
 
+#include "config.h"
+
 #ifndef HAVE_ASPRINTF
 
 #include <stdarg.h>
diff --git a/varnish-cache/lib/libvarnishcompat/daemon.c b/varnish-cache/lib/libvarnishcompat/daemon.c
index a1c5f3b4..cac5d6e1 100644
--- a/varnish-cache/lib/libvarnishcompat/daemon.c
+++ b/varnish-cache/lib/libvarnishcompat/daemon.c
@@ -31,6 +31,8 @@
  * $FreeBSD: src/lib/libc/gen/daemon.c,v 1.8 2007/01/09 00:27:53 imp Exp $
  */
 
+#include "config.h"
+
 #ifndef HAVE_DAEMON
 
 #include <errno.h>
diff --git a/varnish-cache/lib/libvarnishcompat/setproctitle.c b/varnish-cache/lib/libvarnishcompat/setproctitle.c
index f863f977..6fdda48e 100644
--- a/varnish-cache/lib/libvarnishcompat/setproctitle.c
+++ b/varnish-cache/lib/libvarnishcompat/setproctitle.c
@@ -29,6 +29,8 @@
  * $Id$
  */
 
+#include "config.h"
+
 #ifndef HAVE_SETPROCTITLE
 
 #include <stdarg.h>
diff --git a/varnish-cache/lib/libvarnishcompat/srandomdev.c b/varnish-cache/lib/libvarnishcompat/srandomdev.c
index c21bf6ec..b1d3ecc9 100644
--- a/varnish-cache/lib/libvarnishcompat/srandomdev.c
+++ b/varnish-cache/lib/libvarnishcompat/srandomdev.c
@@ -29,6 +29,8 @@
  * $Id$
  */
 
+#include "config.h"
+
 #ifndef HAVE_SRANDOMDEV
 
 #include <sys/time.h>
diff --git a/varnish-cache/lib/libvarnishcompat/strlcat.c b/varnish-cache/lib/libvarnishcompat/strlcat.c
index 3dd45f87..c68767d9 100644
--- a/varnish-cache/lib/libvarnishcompat/strlcat.c
+++ b/varnish-cache/lib/libvarnishcompat/strlcat.c
@@ -17,6 +17,8 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#include "config.h"
+
 #ifndef HAVE_STRLCAT
 
 #include <sys/types.h>
diff --git a/varnish-cache/lib/libvarnishcompat/strlcpy.c b/varnish-cache/lib/libvarnishcompat/strlcpy.c
index c8c5109b..d7903eb4 100644
--- a/varnish-cache/lib/libvarnishcompat/strlcpy.c
+++ b/varnish-cache/lib/libvarnishcompat/strlcpy.c
@@ -17,6 +17,8 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#include "config.h"
+
 #ifndef HAVE_STRLCPY
 
 #include <sys/types.h>
diff --git a/varnish-cache/lib/libvarnishcompat/strndup.c b/varnish-cache/lib/libvarnishcompat/strndup.c
index 219cc00c..f5c2bc73 100644
--- a/varnish-cache/lib/libvarnishcompat/strndup.c
+++ b/varnish-cache/lib/libvarnishcompat/strndup.c
@@ -30,6 +30,8 @@
  *
  */
 
+#include "config.h"
+
 #ifndef HAVE_STRNDUP
 
 #include <stdlib.h>
diff --git a/varnish-cache/lib/libvarnishcompat/vasprintf.c b/varnish-cache/lib/libvarnishcompat/vasprintf.c
index b86971c0..12cd215e 100644
--- a/varnish-cache/lib/libvarnishcompat/vasprintf.c
+++ b/varnish-cache/lib/libvarnishcompat/vasprintf.c
@@ -30,6 +30,8 @@
  *
  */
 
+#include "config.h"
+
 #ifndef HAVE_VASPRINTF
 
 #include <stdarg.h>
diff --git a/varnish-cache/lib/libvarnishcompat/vis.c b/varnish-cache/lib/libvarnishcompat/vis.c
index 82303bc3..4668dfba 100644
--- a/varnish-cache/lib/libvarnishcompat/vis.c
+++ b/varnish-cache/lib/libvarnishcompat/vis.c
@@ -31,6 +31,8 @@
  * $Id$
  */
 
+#include "config.h"
+
 #if !defined(HAVE_VIS) || !defined(HAVE_STRVIS) || !defined(HAVE_STRVISX)
 
 #include <sys/types.h>
diff --git a/varnish-cache/lib/libvcl/Makefile.am b/varnish-cache/lib/libvcl/Makefile.am
index 4c0a4257..140ab27d 100644
--- a/varnish-cache/lib/libvcl/Makefile.am
+++ b/varnish-cache/lib/libvcl/Makefile.am
@@ -20,5 +20,3 @@ libvcl_la_SOURCES = \
 	vcc_token.c \
 	vcc_var.c \
 	vcc_xref.c
-
-libvcl_la_CFLAGS = -include config.h
diff --git a/varnish-cache/lib/libvcl/vcc_acl.c b/varnish-cache/lib/libvcl/vcc_acl.c
index 7cf0acdd..00d4d13e 100644
--- a/varnish-cache/lib/libvcl/vcc_acl.c
+++ b/varnish-cache/lib/libvcl/vcc_acl.c
@@ -29,6 +29,8 @@
  * $Id$
  */
 
+#include "config.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 
diff --git a/varnish-cache/lib/libvcl/vcc_action.c b/varnish-cache/lib/libvcl/vcc_action.c
index 29062e42..ebe8f447 100644
--- a/varnish-cache/lib/libvcl/vcc_action.c
+++ b/varnish-cache/lib/libvcl/vcc_action.c
@@ -29,6 +29,8 @@
  * $Id$
  */
 
+#include "config.h"
+
 #include <stdio.h>
 
 #include "vsb.h"
diff --git a/varnish-cache/lib/libvcl/vcc_backend.c b/varnish-cache/lib/libvcl/vcc_backend.c
index 84cef5cc..7c5f1187 100644
--- a/varnish-cache/lib/libvcl/vcc_backend.c
+++ b/varnish-cache/lib/libvcl/vcc_backend.c
@@ -29,6 +29,8 @@
  * $Id$
  */
 
+#include "config.h"
+
 #include <sys/types.h>
 #include <sys/socket.h>
 
diff --git a/varnish-cache/lib/libvcl/vcc_compile.c b/varnish-cache/lib/libvcl/vcc_compile.c
index 9416452c..e4f8dbd6 100644
--- a/varnish-cache/lib/libvcl/vcc_compile.c
+++ b/varnish-cache/lib/libvcl/vcc_compile.c
@@ -60,6 +60,8 @@
  *	and all the rest...
  */
 
+#include "config.h"
+
 #include <sys/stat.h>
 
 #include <ctype.h>
diff --git a/varnish-cache/lib/libvcl/vcc_fixed_token.c b/varnish-cache/lib/libvcl/vcc_fixed_token.c
index e69da52a..aa1d974d 100644
--- a/varnish-cache/lib/libvcl/vcc_fixed_token.c
+++ b/varnish-cache/lib/libvcl/vcc_fixed_token.c
@@ -6,6 +6,8 @@
  * Edit vcc_gen_fixed_token.tcl instead
  */
 
+#include "config.h"
+
 #include <stdio.h>
 #include <ctype.h>
 #include "vcc_priv.h"
diff --git a/varnish-cache/lib/libvcl/vcc_gen_obj.tcl b/varnish-cache/lib/libvcl/vcc_gen_obj.tcl
index 45c8d4ee..3a77f597 100755
--- a/varnish-cache/lib/libvcl/vcc_gen_obj.tcl
+++ b/varnish-cache/lib/libvcl/vcc_gen_obj.tcl
@@ -305,6 +305,7 @@ proc vars {v pa} {
 	puts $fo "\t{ NULL }"
 }
 
+puts $fo "#include \"config.h\""
 puts $fo "#include <stdio.h>"
 puts $fo "#include \"vcc_compile.h\""
 puts $fo ""
diff --git a/varnish-cache/lib/libvcl/vcc_parse.c b/varnish-cache/lib/libvcl/vcc_parse.c
index 0954ad98..09cd6c49 100644
--- a/varnish-cache/lib/libvcl/vcc_parse.c
+++ b/varnish-cache/lib/libvcl/vcc_parse.c
@@ -29,6 +29,8 @@
  * $Id$
  */
 
+#include "config.h"
+
 #include <stdio.h>
 #include <string.h>
 
diff --git a/varnish-cache/lib/libvcl/vcc_string.c b/varnish-cache/lib/libvcl/vcc_string.c
index 7fe4efbf..25d3c53d 100644
--- a/varnish-cache/lib/libvcl/vcc_string.c
+++ b/varnish-cache/lib/libvcl/vcc_string.c
@@ -29,6 +29,8 @@
  * $Id$
  */
 
+#include "config.h"
+
 #include <stdio.h>
 #include <string.h>
 
diff --git a/varnish-cache/lib/libvcl/vcc_token.c b/varnish-cache/lib/libvcl/vcc_token.c
index b04b460d..68e4bbd3 100644
--- a/varnish-cache/lib/libvcl/vcc_token.c
+++ b/varnish-cache/lib/libvcl/vcc_token.c
@@ -29,6 +29,8 @@
  * $Id$
  */
 
+#include "config.h"
+
 #include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/varnish-cache/lib/libvcl/vcc_var.c b/varnish-cache/lib/libvcl/vcc_var.c
index 32b0393f..66a4f211 100644
--- a/varnish-cache/lib/libvcl/vcc_var.c
+++ b/varnish-cache/lib/libvcl/vcc_var.c
@@ -29,6 +29,8 @@
  * $Id$
  */
 
+#include "config.h"
+
 #include <stdio.h>
 #include <string.h>
 
diff --git a/varnish-cache/lib/libvcl/vcc_xref.c b/varnish-cache/lib/libvcl/vcc_xref.c
index f935d114..ab2be5ac 100644
--- a/varnish-cache/lib/libvcl/vcc_xref.c
+++ b/varnish-cache/lib/libvcl/vcc_xref.c
@@ -39,6 +39,8 @@
  * they are called.
  */
 
+#include "config.h"
+
 #include <stdio.h>
 
 #include "vsb.h"
-- 
2.39.5