More #include cleanuppery

include/Makefile.am

@@ -3,9 +3,15 @@
 pkginclude_HEADERS = \
 	tbl/acct_fields.h \
 	tbl/backend_poll.h \
+	tbl/ban_vars.h \
 	tbl/body_status.h \
+	tbl/http_headers.h \
+	tbl/http_response.h \
 	tbl/locks.h \
 	tbl/steps.h \
+	tbl/vcc_types.h \
+	tbl/vcl_returns.h \
+	tbl/vrt_stv_var.h \
 	tbl/vsc_all.h \
 	tbl/vsc_fields.h \
 	tbl/vsl_tags.h \
@@ -28,11 +34,6 @@ nobase_noinst_HEADERS = \
 	libvcl.h \
 	miniobj.h \
 	persistent.h \
-	tbl/ban_vars.h \
-	tbl/http_headers.h \
-	tbl/http_response.h \
-	tbl/vcl_returns.h \
-	tbl/vrt_stv_var.h \
 	vas.h \
 	vav.h \
 	vbm.h \

lib/libvcl/Makefile.am

@@ -10,7 +10,6 @@ libvcl_la_SOURCES = \
 	vcc_priv.h \
 	vcc_compile.h \
 	vcc_token_defs.h \
-	vcc_types.h \
 	symbol_kind.h \
 	\
 	vcc_acl.c \

lib/libvcl/vcc_acl.c

@@ -30,7 +30,6 @@
 #include "config.h"
 
 #include <stdio.h>
-#include <stdlib.h>
 #include <stddef.h>
 #include <string.h>
 #include <sys/types.h>
@@ -38,10 +37,10 @@
 #include <netdb.h>
 #include <netinet/in.h>
 
-#include "vrt.h"
 
-#include "vcc_priv.h"
 #include "vcc_compile.h"
+#include "vrt.h"
+#include "vcc_priv.h"
 #include "libvarnish.h"
 
 struct acl_e {

lib/libvcl/vcc_action.c

@@ -32,11 +32,9 @@
 
 #include "config.h"
 
-#include <stdio.h>
-#include <string.h>
 
-#include "vcc_priv.h"
 #include "vcc_compile.h"
+#include "vcc_priv.h"
 #include "libvarnish.h"
 
 /*--------------------------------------------------------------------*/

lib/libvcl/vcc_backend.c

@@ -55,16 +55,13 @@
 
 #include <limits.h>
 #include <netdb.h>
-#include <stdio.h>
-#include <stdarg.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include "vss.h"
-
-#include "vcc_priv.h"
 #include "vcc_compile.h"
+#include "vcc_priv.h"
 #include "libvarnish.h"
+#include "vss.h"
 
 struct host {
 	VTAILQ_ENTRY(host)      list;

lib/libvcl/vcc_compile.c

@@ -52,18 +52,15 @@
 
 #include "config.h"
 
-#include <sys/stat.h>
-
 #include <ctype.h>
 #include <errno.h>
 #include <stdio.h>
 #include <stdarg.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
 
-#include "vcc_priv.h"
 #include "vcc_compile.h"
+#include "vcc_priv.h"
 
 #include "libvcl.h"
 #include "libvarnish.h"

lib/libvcl/vcc_compile.h

@@ -44,7 +44,7 @@ struct symbol;
 
 enum var_type {
 #define VCC_TYPE(foo)		foo,
-#include "vcc_types.h"
+#include "tbl/vcc_types.h"
 #undef VCC_TYPE
 };
 

lib/libvcl/vcc_dir_dns.c

@@ -28,16 +28,12 @@
 
 #include "config.h"
 
-#include <sys/types.h>
-#include <sys/socket.h>
-
 #include <stdio.h>
-#include <stdarg.h>
 #include <string.h>
 #include <limits.h>
 
-#include "vcc_priv.h"
 #include "vcc_compile.h"
+#include "vcc_priv.h"
 #include "libvarnish.h"
 
 /*--------------------------------------------------------------------

lib/libvcl/vcc_dir_random.c

@@ -29,15 +29,8 @@
 
 #include "config.h"
 
-#include <sys/types.h>
-#include <sys/socket.h>
-
-#include <stdio.h>
-#include <stdarg.h>
-#include <string.h>
-
-#include "vcc_priv.h"
 #include "vcc_compile.h"
+#include "vcc_priv.h"
 #include "libvarnish.h"
 
 /*--------------------------------------------------------------------

lib/libvcl/vcc_dir_round_robin.c

@@ -28,15 +28,8 @@
 
 #include "config.h"
 
-#include <sys/types.h>
-#include <sys/socket.h>
-
-#include <stdio.h>
-#include <stdarg.h>
-#include <string.h>
-
-#include "vcc_priv.h"
 #include "vcc_compile.h"
+#include "vcc_priv.h"
 #include "libvarnish.h"
 
 /*--------------------------------------------------------------------

lib/libvcl/vcc_expr.c

@@ -46,7 +46,7 @@ vcc_Type(enum var_type fmt)
 {
 	switch(fmt) {
 #define VCC_TYPE(a)	case a: return(#a);
-#include "vcc_types.h"
+#include "tbl/vcc_types.h"
 #undef VCC_TYPE
 	default:
 		assert("Unknwon Type");
@@ -403,7 +403,7 @@ vcc_arg_type(const char **p)
 {
 
 #define VCC_TYPE(a) if (!strcmp(#a, *p)) { *p += strlen(#a) + 1; return (a);}
-#include "vcc_types.h"
+#include "tbl/vcc_types.h"
 #undef VCC_TYPE
 	return (VOID);
 }