[master] 68c4724 Flexelinting

[Poul-Henning Kamp]

commit 68c4724113611a52036c11010b40d9bccbe29443
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Tue Feb 27 09:14:24 2018 +0000

    Flexelinting

diff --git a/bin/varnishd/Makefile.am b/bin/varnishd/Makefile.am
index a121c8e..890428a 100644
--- a/bin/varnishd/Makefile.am
+++ b/bin/varnishd/Makefile.am
@@ -198,6 +198,7 @@ builtin_vcl.c:	builtin.vcl
 	echo ' * Edit builtin.vcl instead and run make' >> $@
 	echo ' *' >> $@
 	echo ' */' >> $@
+	echo '#include "config.h"' >> $@
 	echo '#include "mgt/mgt.h"' >> $@
 	echo '' >> $@
 	echo 'const char * const builtin_vcl =' >> $@
diff --git a/lib/libvmod_debug/vmod_debug.c b/lib/libvmod_debug/vmod_debug.c
index 56dd7ef..579d384 100644
--- a/lib/libvmod_debug/vmod_debug.c
+++ b/lib/libvmod_debug/vmod_debug.c
@@ -39,7 +39,6 @@
 
 #include "vsa.h"
 #include "vsb.h"
-#include "vtcp.h"
 #include "vtim.h"
 #include "vcc_if.h"
 #include "VSC_debug.h"