[master] f3244fd GC a lot of #includes
Poul-Henning Kamp
phk at FreeBSD.org
Mon May 15 11:45:07 CEST 2017
commit f3244fda73750b6702b771af50192c081b16472a
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date: Mon May 15 09:44:00 2017 +0000
GC a lot of #includes
diff --git a/bin/varnishadm/varnishadm.c b/bin/varnishadm/varnishadm.c
index 1c046b2..efca881 100644
--- a/bin/varnishadm/varnishadm.c
+++ b/bin/varnishadm/varnishadm.c
@@ -58,7 +58,6 @@
#include <string.h>
#include <unistd.h>
-#include "vapi/vsl.h"
#include "vapi/vsm.h"
#include "vas.h"
#include "vcli.h"
diff --git a/bin/varnishd/cache/cache_backend_probe.c b/bin/varnishd/cache/cache_backend_probe.c
index 52de48f..c3cfd8c 100644
--- a/bin/varnishd/cache/cache_backend_probe.c
+++ b/bin/varnishd/cache/cache_backend_probe.c
@@ -43,9 +43,6 @@
#include <stdio.h>
#include <stdlib.h>
-#include <netinet/in.h>
-#include <netinet/tcp.h>
-
#include "binary_heap.h"
#include "vcli_serve.h"
#include "vrt.h"
diff --git a/bin/varnishd/cache/cache_esi_deliver.c b/bin/varnishd/cache/cache_esi_deliver.c
index b2d013c..46a5d7d 100644
--- a/bin/varnishd/cache/cache_esi_deliver.c
+++ b/bin/varnishd/cache/cache_esi_deliver.c
@@ -32,7 +32,6 @@
#include "cache.h"
-#include <stdio.h>
#include <stdlib.h>
#include "cache_transport.h"
diff --git a/bin/varnishd/cache/cache_obj.c b/bin/varnishd/cache/cache_obj.c
index 4dcedd5..cf7b708 100644
--- a/bin/varnishd/cache/cache_obj.c
+++ b/bin/varnishd/cache/cache_obj.c
@@ -87,7 +87,6 @@
#include "cache_obj.h"
#include "vend.h"
#include "storage/storage.h"
-#include "hash/hash_slinger.h"
static const struct obj_methods *
obj_getmethods(const struct objcore *oc)
diff --git a/bin/varnishd/cache/cache_pool.c b/bin/varnishd/cache/cache_pool.c
index 57b7e8d..671ceca 100644
--- a/bin/varnishd/cache/cache_pool.c
+++ b/bin/varnishd/cache/cache_pool.c
@@ -35,7 +35,6 @@
#include "config.h"
-#include <errno.h>
#include <stdlib.h>
#include "cache.h"
diff --git a/bin/varnishd/cache/cache_req.c b/bin/varnishd/cache/cache_req.c
index a3499ca..601574a 100644
--- a/bin/varnishd/cache/cache_req.c
+++ b/bin/varnishd/cache/cache_req.c
@@ -34,7 +34,6 @@
#include "cache.h"
-#include <poll.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/bin/varnishd/cache/cache_vrt_var.c b/bin/varnishd/cache/cache_vrt_var.c
index d0380a8..5c7a7b1 100644
--- a/bin/varnishd/cache/cache_vrt_var.c
+++ b/bin/varnishd/cache/cache_vrt_var.c
@@ -32,7 +32,6 @@
#include "cache.h"
#include "common/heritage.h"
-#include "hash/hash_slinger.h"
#include "cache_director.h"
#include "vrt.h"
diff --git a/bin/varnishd/cache/cache_vrt_vmod.c b/bin/varnishd/cache/cache_vrt_vmod.c
index 97a18b2..65e7074 100644
--- a/bin/varnishd/cache/cache_vrt_vmod.c
+++ b/bin/varnishd/cache/cache_vrt_vmod.c
@@ -34,11 +34,8 @@
#include "cache.h"
#include <dlfcn.h>
-#include <errno.h>
-#include <fcntl.h>
#include <stdio.h>
#include <stdlib.h>
-#include <unistd.h>
#include "vcli_serve.h"
#include "vrt.h"
diff --git a/bin/varnishd/common/common_vsc.c b/bin/varnishd/common/common_vsc.c
index c064f73..9cd6a5c 100644
--- a/bin/varnishd/common/common_vsc.c
+++ b/bin/varnishd/common/common_vsc.c
@@ -30,8 +30,6 @@
#include "config.h"
-#include "common.h"
-
/* Build the static vsc type names */
#define VSC_TYPE_F(n,t,l,e,d) const char *VSC_type_##n = t;
#include "tbl/vsc_types.h"
diff --git a/bin/varnishd/common/common_vsm.c b/bin/varnishd/common/common_vsm.c
index 22ae5c3..7994d95 100644
--- a/bin/varnishd/common/common_vsm.c
+++ b/bin/varnishd/common/common_vsm.c
@@ -34,7 +34,6 @@
#include "config.h"
-#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
diff --git a/bin/varnishd/hash/mgt_hash.c b/bin/varnishd/hash/mgt_hash.c
index 6e772b2..fc715c0 100644
--- a/bin/varnishd/hash/mgt_hash.c
+++ b/bin/varnishd/hash/mgt_hash.c
@@ -30,7 +30,6 @@
#include "config.h"
-#include <math.h>
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
diff --git a/bin/varnishd/http1/cache_http1_fetch.c b/bin/varnishd/http1/cache_http1_fetch.c
index 5d3933a..e5032eb 100644
--- a/bin/varnishd/http1/cache_http1_fetch.c
+++ b/bin/varnishd/http1/cache_http1_fetch.c
@@ -35,12 +35,9 @@
#include <stdio.h>
#include <stdlib.h>
-#include "vrt.h"
#include "vtcp.h"
#include "vtim.h"
-#include "hash/hash_slinger.h"
-
#include "cache_http1.h"
/*--------------------------------------------------------------------
diff --git a/bin/varnishd/http1/cache_http1_fsm.c b/bin/varnishd/http1/cache_http1_fsm.c
index bd68ae8..ceaf4c8 100644
--- a/bin/varnishd/http1/cache_http1_fsm.c
+++ b/bin/varnishd/http1/cache_http1_fsm.c
@@ -39,7 +39,6 @@
#include <stdio.h>
#include <stdlib.h>
-#include "cache/cache_filter.h"
#include "cache/cache_transport.h"
#include "cache_http1.h"
#include "hash/hash_slinger.h"
diff --git a/bin/varnishd/http1/cache_http1_pipe.c b/bin/varnishd/http1/cache_http1_pipe.c
index 678a2b1..b6a2e30 100644
--- a/bin/varnishd/http1/cache_http1_pipe.c
+++ b/bin/varnishd/http1/cache_http1_pipe.c
@@ -36,8 +36,6 @@
#include <poll.h>
#include <stdio.h>
-#include "vrt.h"
-
#include "cache_http1.h"
static struct lock pipestat_mtx;
diff --git a/bin/varnishd/http2/cache_http2_session.c b/bin/varnishd/http2/cache_http2_session.c
index dc3ac30..0e04a84 100644
--- a/bin/varnishd/http2/cache_http2_session.c
+++ b/bin/varnishd/http2/cache_http2_session.c
@@ -34,10 +34,8 @@
#include <stdio.h>
#include "cache/cache_transport.h"
-#include "cache/cache_filter.h"
#include "http2/cache_http2.h"
-#include "vend.h"
#include "vtim.h"
static const char h2_resp_101[] =
diff --git a/bin/varnishd/mgt/mgt_acceptor.c b/bin/varnishd/mgt/mgt_acceptor.c
index f9926f4..38be706 100644
--- a/bin/varnishd/mgt/mgt_acceptor.c
+++ b/bin/varnishd/mgt/mgt_acceptor.c
@@ -34,7 +34,6 @@
#include <sys/types.h>
#include <sys/socket.h>
#include <errno.h>
-#include <fcntl.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
diff --git a/bin/varnishd/mgt/mgt_child.c b/bin/varnishd/mgt/mgt_child.c
index 338ca53..ed398b7 100644
--- a/bin/varnishd/mgt/mgt_child.c
+++ b/bin/varnishd/mgt/mgt_child.c
@@ -31,13 +31,13 @@
#include "config.h"
-#include <signal.h>
#include <sys/types.h>
#include <sys/wait.h>
#include <errno.h>
#include <fcntl.h>
#include <poll.h>
+#include <signal.h>
#include <string.h>
#include <syslog.h>
#include <unistd.h>
diff --git a/bin/varnishd/mgt/mgt_main.c b/bin/varnishd/mgt/mgt_main.c
index 4f9b324..1a50c51 100644
--- a/bin/varnishd/mgt/mgt_main.c
+++ b/bin/varnishd/mgt/mgt_main.c
@@ -31,7 +31,6 @@
#include "config.h"
-#include <stdarg.h>
#include <ctype.h>
#include <errno.h>
#include <fcntl.h>
@@ -53,7 +52,6 @@
#include "vin.h"
#include "vpf.h"
#include "vrnd.h"
-#include "vsb.h"
#include "vsha256.h"
#include "vsub.h"
#include "vtim.h"
diff --git a/bin/varnishd/mgt/mgt_param_bits.c b/bin/varnishd/mgt/mgt_param_bits.c
index 89b6005..b2edd05 100644
--- a/bin/varnishd/mgt/mgt_param_bits.c
+++ b/bin/varnishd/mgt/mgt_param_bits.c
@@ -29,7 +29,6 @@
#include "config.h"
-#include <unistd.h>
#include <string.h>
#include "mgt/mgt.h"
diff --git a/bin/varnishd/mgt/mgt_param_tcp.c b/bin/varnishd/mgt/mgt_param_tcp.c
index 9567d6f..1519d9d 100644
--- a/bin/varnishd/mgt/mgt_param_tcp.c
+++ b/bin/varnishd/mgt/mgt_param_tcp.c
@@ -37,7 +37,6 @@
#include <sys/types.h>
#include <sys/socket.h>
#include <stdlib.h>
-#include <string.h>
#include <netinet/in.h>
#include <netinet/tcp.h>
#include <unistd.h>
diff --git a/bin/varnishd/mgt/mgt_param_tweak.c b/bin/varnishd/mgt/mgt_param_tweak.c
index b26581e..0f95237 100644
--- a/bin/varnishd/mgt/mgt_param_tweak.c
+++ b/bin/varnishd/mgt/mgt_param_tweak.c
@@ -36,7 +36,6 @@
#include <math.h>
#include <stdlib.h>
#include <string.h>
-#include <unistd.h>
#include "mgt/mgt.h"
diff --git a/bin/varnishd/mgt/mgt_shmem.c b/bin/varnishd/mgt/mgt_shmem.c
index 858d871..771080f 100644
--- a/bin/varnishd/mgt/mgt_shmem.c
+++ b/bin/varnishd/mgt/mgt_shmem.c
@@ -31,7 +31,6 @@
#include "config.h"
#include <sys/mman.h>
-#include <sys/stat.h>
#include <errno.h>
#include <fcntl.h>
diff --git a/bin/varnishd/mgt/mgt_vcc.c b/bin/varnishd/mgt/mgt_vcc.c
index d2fcdb1..00f1e6f 100644
--- a/bin/varnishd/mgt/mgt_vcc.c
+++ b/bin/varnishd/mgt/mgt_vcc.c
@@ -31,7 +31,6 @@
#include "config.h"
-#include <dlfcn.h>
#include <errno.h>
#include <fcntl.h>
#include <stdlib.h>
diff --git a/bin/varnishd/proxy/cache_proxy_proto.c b/bin/varnishd/proxy/cache_proxy_proto.c
index d4231bc..0f6b691 100644
--- a/bin/varnishd/proxy/cache_proxy_proto.c
+++ b/bin/varnishd/proxy/cache_proxy_proto.c
@@ -34,7 +34,6 @@
#include <netinet/in.h>
#include <netdb.h>
-#include <stdlib.h>
#include "cache/cache_transport.h"
diff --git a/bin/varnishd/storage/mgt_stevedore.c b/bin/varnishd/storage/mgt_stevedore.c
index da3f4a1..b05ecf8 100644
--- a/bin/varnishd/storage/mgt_stevedore.c
+++ b/bin/varnishd/storage/mgt_stevedore.c
@@ -33,7 +33,6 @@
#include "config.h"
-#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
diff --git a/bin/varnishd/storage/stevedore.c b/bin/varnishd/storage/stevedore.c
index 48a3c7b..f8253cc 100644
--- a/bin/varnishd/storage/stevedore.c
+++ b/bin/varnishd/storage/stevedore.c
@@ -38,8 +38,6 @@
#include <stdio.h>
#include <stdlib.h>
-#include "hash/hash_slinger.h"
-
#include "storage/storage.h"
#include "vrt.h"
#include "vrt_obj.h"
diff --git a/bin/varnishd/storage/stevedore_utils.c b/bin/varnishd/storage/stevedore_utils.c
index 6225112..d6ea9a4 100644
--- a/bin/varnishd/storage/stevedore_utils.c
+++ b/bin/varnishd/storage/stevedore_utils.c
@@ -31,12 +31,10 @@
#include "config.h"
-#include <sys/types.h>
#include <sys/stat.h>
#include <errno.h>
#include <fcntl.h>
-#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
diff --git a/bin/varnishd/storage/storage_lru.c b/bin/varnishd/storage/storage_lru.c
index f3588b1..e7f0bff 100644
--- a/bin/varnishd/storage/storage_lru.c
+++ b/bin/varnishd/storage/storage_lru.c
@@ -33,7 +33,6 @@
#include <stdlib.h>
#include "cache/cache.h"
-#include "cache/cache_obj.h"
#include "hash/hash_slinger.h"
#include "storage/storage.h"
diff --git a/bin/varnishd/storage/storage_persistent.c b/bin/varnishd/storage/storage_persistent.c
index 9bdf536..9d2cc92 100644
--- a/bin/varnishd/storage/storage_persistent.c
+++ b/bin/varnishd/storage/storage_persistent.c
@@ -37,7 +37,6 @@
#include "cache/cache.h"
-#include <sys/param.h>
#include <sys/mman.h>
#include <stdio.h>
diff --git a/bin/varnishd/storage/storage_persistent_silo.c b/bin/varnishd/storage/storage_persistent_silo.c
index 5061188..780df0d 100644
--- a/bin/varnishd/storage/storage_persistent_silo.c
+++ b/bin/varnishd/storage/storage_persistent_silo.c
@@ -39,7 +39,6 @@
#include <stdio.h>
#include <stdlib.h>
-#include "cache/cache_obj.h"
#include "storage/storage.h"
#include "storage/storage_simple.h"
diff --git a/bin/varnishd/storage/storage_simple.c b/bin/varnishd/storage/storage_simple.c
index aaf2c48..ad33b7e 100644
--- a/bin/varnishd/storage/storage_simple.c
+++ b/bin/varnishd/storage/storage_simple.c
@@ -31,9 +31,6 @@
#include "cache/cache.h"
-#include <stdio.h>
-#include <stdlib.h>
-
#include "cache/cache_obj.h"
#include "hash/hash_slinger.h"
diff --git a/bin/varnishd/waiter/cache_waiter.c b/bin/varnishd/waiter/cache_waiter.c
index 28f50b1..3d4b17d 100644
--- a/bin/varnishd/waiter/cache_waiter.c
+++ b/bin/varnishd/waiter/cache_waiter.c
@@ -32,7 +32,6 @@
#include "cache/cache.h"
-#include <stdio.h>
#include <stdlib.h>
#include "binary_heap.h"
diff --git a/bin/varnishd/waiter/cache_waiter_epoll.c b/bin/varnishd/waiter/cache_waiter_epoll.c
index 23684b6..ffbf947 100644
--- a/bin/varnishd/waiter/cache_waiter_epoll.c
+++ b/bin/varnishd/waiter/cache_waiter_epoll.c
@@ -37,13 +37,11 @@
#include <sys/epoll.h>
-#include <stdlib.h>
#include <errno.h>
#include "cache/cache.h"
#include "waiter/waiter_priv.h"
-#include "waiter/mgt_waiter.h"
#include "vtim.h"
#ifndef EPOLLRDHUP
diff --git a/bin/varnishd/waiter/cache_waiter_poll.c b/bin/varnishd/waiter/cache_waiter_poll.c
index 19fde5d..7d84c03 100644
--- a/bin/varnishd/waiter/cache_waiter_poll.c
+++ b/bin/varnishd/waiter/cache_waiter_poll.c
@@ -37,7 +37,6 @@
#include "cache/cache.h"
#include "waiter/waiter_priv.h"
-#include "waiter/mgt_waiter.h"
#include "vtim.h"
struct vwp {
diff --git a/bin/varnishd/waiter/mgt_waiter.c b/bin/varnishd/waiter/mgt_waiter.c
index 3010d86..01780d3 100644
--- a/bin/varnishd/waiter/mgt_waiter.c
+++ b/bin/varnishd/waiter/mgt_waiter.c
@@ -29,9 +29,7 @@
*/
#include "config.h"
-#include <stdio.h>
#include <unistd.h>
-#include <string.h>
#include "mgt/mgt.h"
#include "waiter/mgt_waiter.h"
diff --git a/bin/varnishhist/varnishhist.c b/bin/varnishhist/varnishhist.c
index 51c5038..d82b1ce 100644
--- a/bin/varnishhist/varnishhist.c
+++ b/bin/varnishhist/varnishhist.c
@@ -33,15 +33,11 @@
#include "config.h"
-#include <sys/types.h>
-
#include <errno.h>
#include <limits.h>
#include <math.h>
#include <pthread.h>
-#include <regex.h>
#include <signal.h>
-#include <stdint.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
diff --git a/bin/varnishlog/varnishlog.c b/bin/varnishlog/varnishlog.c
index b4739e5..87f98a3 100644
--- a/bin/varnishlog/varnishlog.c
+++ b/bin/varnishlog/varnishlog.c
@@ -37,16 +37,12 @@
#include <unistd.h>
#include <string.h>
#include <errno.h>
-#include <stdarg.h>
#include <stdint.h>
-#include <sys/stat.h>
-#include "vapi/vsm.h"
#include "vapi/vsl.h"
#include "vapi/voptget.h"
#include "vas.h"
#include "vdef.h"
-#include "vpf.h"
#include "vut.h"
#include "miniobj.h"
diff --git a/bin/varnishncsa/varnishncsa.c b/bin/varnishncsa/varnishncsa.c
index 1629aa1..dc64f4b 100644
--- a/bin/varnishncsa/varnishncsa.c
+++ b/bin/varnishncsa/varnishncsa.c
@@ -54,7 +54,6 @@
#include <math.h>
#include "base64.h"
-#include "vapi/vsm.h"
#include "vapi/vsl.h"
#include "vapi/voptget.h"
#include "vas.h"
diff --git a/bin/varnishstat/varnishstat.c b/bin/varnishstat/varnishstat.c
index 7650bf1..5dfabb9 100644
--- a/bin/varnishstat/varnishstat.c
+++ b/bin/varnishstat/varnishstat.c
@@ -32,14 +32,12 @@
#include "config.h"
-#include <sys/time.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <time.h>
#include <unistd.h>
#include <math.h>
-#include <stdint.h>
#include "vapi/voptget.h"
#include "vapi/vsl.h"
diff --git a/bin/varnishstat/varnishstat_curses.c b/bin/varnishstat/varnishstat_curses.c
index 586ee18..59bdb32 100644
--- a/bin/varnishstat/varnishstat_curses.c
+++ b/bin/varnishstat/varnishstat_curses.c
@@ -35,12 +35,9 @@
#include "config.h"
#include <stdlib.h>
-#include <stdio.h>
#include <unistd.h>
#include <string.h>
#include <signal.h>
-#include <time.h>
-#include <sys/time.h>
#include <poll.h>
#include <stdint.h>
#include <math.h>
@@ -49,8 +46,6 @@
#include "vas.h"
#include "miniobj.h"
#include "vqueue.h"
-#include "vapi/vsm.h"
-#include "vapi/vsc.h"
#include "vtim.h"
#include "varnishstat.h"
diff --git a/bin/varnishtest/vtc.c b/bin/varnishtest/vtc.c
index 0934661..feadd9f 100644
--- a/bin/varnishtest/vtc.c
+++ b/bin/varnishtest/vtc.c
@@ -28,7 +28,6 @@
#include "config.h"
-#include <sys/types.h>
#include <sys/wait.h>
#include <ctype.h>
@@ -36,9 +35,7 @@
#include <grp.h>
#include <math.h>
#include <pwd.h>
-#include <signal.h>
#include <stdarg.h>
-#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/bin/varnishtest/vtc_barrier.c b/bin/varnishtest/vtc_barrier.c
index 8cd80d9..0280211 100644
--- a/bin/varnishtest/vtc_barrier.c
+++ b/bin/varnishtest/vtc_barrier.c
@@ -29,14 +29,11 @@
#include "config.h"
#include <errno.h>
-#include <pthread.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
-#include <sys/select.h>
-#include <sys/types.h>
#include <sys/socket.h>
#include "vtc.h"
diff --git a/bin/varnishtest/vtc_client.c b/bin/varnishtest/vtc_client.c
index 7f317ac..4515282 100644
--- a/bin/varnishtest/vtc_client.c
+++ b/bin/varnishtest/vtc_client.c
@@ -28,7 +28,6 @@
#include "config.h"
-#include <sys/types.h>
#include <sys/socket.h>
#include <errno.h>
diff --git a/bin/varnishtest/vtc_http.c b/bin/varnishtest/vtc_http.c
index 22c00bd..7645faa 100644
--- a/bin/varnishtest/vtc_http.c
+++ b/bin/varnishtest/vtc_http.c
@@ -28,7 +28,6 @@
#include "config.h"
-#include <sys/types.h>
#include <sys/socket.h>
#include <errno.h>
diff --git a/bin/varnishtest/vtc_http2.c b/bin/varnishtest/vtc_http2.c
index 4fcd243..c819cdd 100644
--- a/bin/varnishtest/vtc_http2.c
+++ b/bin/varnishtest/vtc_http2.c
@@ -38,14 +38,12 @@
#include <stdlib.h>
#include <unistd.h>
#include <string.h>
-#include <ctype.h>
#include <netinet/in.h>
#include "vtc.h"
#include "vtc_http.h"
#include "vfil.h"
-#include "vgz.h"
#include "hpack.h"
#include "vend.h"
diff --git a/bin/varnishtest/vtc_main.c b/bin/varnishtest/vtc_main.c
index e872807..975f0b8 100644
--- a/bin/varnishtest/vtc_main.c
+++ b/bin/varnishtest/vtc_main.c
@@ -30,13 +30,10 @@
#include <sys/mman.h>
#include <sys/stat.h>
-#include <sys/socket.h>
-#include <sys/types.h>
#include <sys/wait.h>
#include <ctype.h>
#include <errno.h>
-#include <fcntl.h>
#include <poll.h>
#include <stdio.h>
#include <stdlib.h>
@@ -49,7 +46,6 @@
#include "vev.h"
#include "vfil.h"
#include "vnum.h"
-#include "vqueue.h"
#include "vrnd.h"
#include "vss.h"
#include "vsub.h"
diff --git a/bin/varnishtest/vtc_process.c b/bin/varnishtest/vtc_process.c
index eaf8d02..f3b9943 100644
--- a/bin/varnishtest/vtc_process.c
+++ b/bin/varnishtest/vtc_process.c
@@ -29,13 +29,10 @@
#include "config.h"
#include <sys/resource.h>
-#include <sys/types.h>
-#include <sys/stat.h>
#include <sys/wait.h>
#include <errno.h>
#include <fcntl.h>
-#include <signal.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/bin/varnishtest/vtc_proxy.c b/bin/varnishtest/vtc_proxy.c
index b1a6b05..03e186b 100644
--- a/bin/varnishtest/vtc_proxy.c
+++ b/bin/varnishtest/vtc_proxy.c
@@ -28,7 +28,6 @@
#include "config.h"
-#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
diff --git a/bin/varnishtest/vtc_server.c b/bin/varnishtest/vtc_server.c
index 13dd336..fb811df 100644
--- a/bin/varnishtest/vtc_server.c
+++ b/bin/varnishtest/vtc_server.c
@@ -28,7 +28,6 @@
#include "config.h"
-#include <sys/types.h>
#include <sys/socket.h>
#include <errno.h>
diff --git a/bin/varnishtop/varnishtop.c b/bin/varnishtop/varnishtop.c
index c7d48ff..1911dd3 100644
--- a/bin/varnishtop/varnishtop.c
+++ b/bin/varnishtop/varnishtop.c
@@ -35,17 +35,14 @@
#include <ctype.h>
#include <errno.h>
-#include <limits.h>
#include <pthread.h>
#include <signal.h>
#include <stdint.h>
-#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include "vcurses.h"
-#include "vapi/vsm.h"
#include "vapi/vsl.h"
#include "vapi/voptget.h"
#include "vas.h"
diff --git a/lib/libvarnish/vss.c b/lib/libvarnish/vss.c
index 251b420..1f8af2a 100644
--- a/lib/libvarnish/vss.c
+++ b/lib/libvarnish/vss.c
@@ -30,16 +30,11 @@
#include "config.h"
-#include <sys/types.h>
#include <sys/socket.h>
-#include <netinet/in.h>
-
#include <netdb.h>
-#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <unistd.h>
#include "vas.h"
#include "vsa.h"
diff --git a/lib/libvarnish/vsub.c b/lib/libvarnish/vsub.c
index ea86699..9abf3f7 100644
--- a/lib/libvarnish/vsub.c
+++ b/lib/libvarnish/vsub.c
@@ -34,10 +34,7 @@
#include <sys/wait.h>
#include <errno.h>
-#include <fcntl.h>
-#include <stdio.h>
#include <stdint.h>
-#include <stdlib.h>
#include <string.h>
#include <unistd.h>
diff --git a/lib/libvarnish/vtcp.c b/lib/libvarnish/vtcp.c
index 9122f3e..941a90b 100644
--- a/lib/libvarnish/vtcp.c
+++ b/lib/libvarnish/vtcp.c
@@ -32,7 +32,6 @@
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/ioctl.h>
-#include <sys/time.h>
#ifdef HAVE_SYS_FILIO_H
# include <sys/filio.h>
#endif
@@ -45,7 +44,6 @@
#include <netdb.h>
#include <poll.h>
#include <stdio.h>
-#include <stdlib.h>
#include <string.h>
#include <unistd.h>
diff --git a/lib/libvarnish/vtim.c b/lib/libvarnish/vtim.c
index 5e71a20..b2d47dd 100644
--- a/lib/libvarnish/vtim.c
+++ b/lib/libvarnish/vtim.c
@@ -61,7 +61,6 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <unistd.h>
#ifdef __MACH__
#include <mach/mach_time.h>
#endif
diff --git a/lib/libvarnishapi/daemon.c b/lib/libvarnishapi/daemon.c
index feb7924..1d253c7 100644
--- a/lib/libvarnishapi/daemon.c
+++ b/lib/libvarnishapi/daemon.c
@@ -32,11 +32,7 @@
//lint -e{766}
#include "config.h"
-#include <errno.h>
-#include <fcntl.h>
#include <signal.h>
-#include <stdlib.h>
-#include <unistd.h>
#include "compat/daemon.h"
#include "vdef.h"
diff --git a/lib/libvarnishapi/vsc.c b/lib/libvarnishapi/vsc.c
index 99add7b..725a5f7 100644
--- a/lib/libvarnishapi/vsc.c
+++ b/lib/libvarnishapi/vsc.c
@@ -30,12 +30,10 @@
#include "config.h"
-#include <sys/types.h>
#include <sys/stat.h>
#include <fnmatch.h>
#include <stdint.h>
-#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/lib/libvarnishapi/vsl.c b/lib/libvarnishapi/vsl.c
index 127a4bb..3a879d3 100644
--- a/lib/libvarnishapi/vsl.c
+++ b/lib/libvarnishapi/vsl.c
@@ -30,16 +30,10 @@
#include "config.h"
-#include <sys/stat.h>
-#include <sys/types.h>
-
#include <errno.h>
#include <stdarg.h>
#include <stdint.h>
#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
#include "vdef.h"
#include "vas.h"
@@ -51,7 +45,6 @@
#include "vre.h"
#include "vsb.h"
-#include "vapi/vsm.h"
#include "vapi/vsl.h"
#include "vsl_api.h"
diff --git a/lib/libvarnishapi/vsl_arg.c b/lib/libvarnishapi/vsl_arg.c
index 9c8032c..829dbc3 100644
--- a/lib/libvarnishapi/vsl_arg.c
+++ b/lib/libvarnishapi/vsl_arg.c
@@ -30,18 +30,11 @@
#include "config.h"
-#include <sys/types.h>
-#include <sys/stat.h>
-
#include <ctype.h>
-#include <fcntl.h>
#include <limits.h>
#include <math.h>
-#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
#include "vdef.h"
#include "vas.h"
diff --git a/lib/libvarnishapi/vsl_dispatch.c b/lib/libvarnishapi/vsl_dispatch.c
index a19ce5d..67d3cb0 100644
--- a/lib/libvarnishapi/vsl_dispatch.c
+++ b/lib/libvarnishapi/vsl_dispatch.c
@@ -35,7 +35,6 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <unistd.h>
#include "vdef.h"
#include "vas.h"
diff --git a/lib/libvarnishapi/vsl_query.c b/lib/libvarnishapi/vsl_query.c
index b2d43a8..42596af 100644
--- a/lib/libvarnishapi/vsl_query.c
+++ b/lib/libvarnishapi/vsl_query.c
@@ -32,12 +32,7 @@
#include <ctype.h>
#include <math.h>
-#include <stdint.h>
#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <strings.h>
-#include <unistd.h>
#include "vdef.h"
#include "vas.h"
diff --git a/lib/libvarnishapi/vsm.c b/lib/libvarnishapi/vsm.c
index da5f90f..83bab97 100644
--- a/lib/libvarnishapi/vsm.c
+++ b/lib/libvarnishapi/vsm.c
@@ -32,13 +32,11 @@
#include <sys/mman.h>
#include <sys/stat.h>
-#include <sys/types.h>
#include <errno.h>
#include <fcntl.h>
#include <stdarg.h>
#include <stdint.h>
-#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
diff --git a/lib/libvarnishapi/vut.c b/lib/libvarnishapi/vut.c
index 9079b22..83a08da 100644
--- a/lib/libvarnishapi/vut.c
+++ b/lib/libvarnishapi/vut.c
@@ -41,7 +41,6 @@
#include <string.h>
#include <signal.h>
#include <math.h>
-#include <sys/stat.h>
#include "compat/daemon.h"
#include "vdef.h"
diff --git a/lib/libvarnishapi/vxp.c b/lib/libvarnishapi/vxp.c
index 558a99d..ae86282 100644
--- a/lib/libvarnishapi/vxp.c
+++ b/lib/libvarnishapi/vxp.c
@@ -31,7 +31,6 @@
#include "config.h"
#include <ctype.h>
-#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/lib/libvarnishapi/vxp_lexer.c b/lib/libvarnishapi/vxp_lexer.c
index d858d40..0848ee3 100644
--- a/lib/libvarnishapi/vxp_lexer.c
+++ b/lib/libvarnishapi/vxp_lexer.c
@@ -31,7 +31,6 @@
#include "config.h"
#include <ctype.h>
-#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/lib/libvarnishapi/vxp_parse.c b/lib/libvarnishapi/vxp_parse.c
index 201d03a..a37faec 100644
--- a/lib/libvarnishapi/vxp_parse.c
+++ b/lib/libvarnishapi/vxp_parse.c
@@ -32,10 +32,7 @@
#include <ctype.h>
#include <math.h>
-#include <stdint.h>
#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
#include "vdef.h"
#include "vas.h"
diff --git a/lib/libvcc/vcc_acl.c b/lib/libvcc/vcc_acl.c
index b54f5ad..c98dfea 100644
--- a/lib/libvcc/vcc_acl.c
+++ b/lib/libvcc/vcc_acl.c
@@ -29,15 +29,11 @@
#include "config.h"
-#include <stddef.h>
-
-#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
#include <netdb.h>
-#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/lib/libvcc/vcc_compile.c b/lib/libvcc/vcc_compile.c
index 16a29d1..1f9b0eb 100644
--- a/lib/libvcc/vcc_compile.c
+++ b/lib/libvcc/vcc_compile.c
@@ -52,10 +52,8 @@
#include "config.h"
-#include <ctype.h>
#include <errno.h>
#include <stdarg.h>
-#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/lib/libvcc/vcc_compile.h b/lib/libvcc/vcc_compile.h
index fd7daf1..5de8a2a 100644
--- a/lib/libvcc/vcc_compile.h
+++ b/lib/libvcc/vcc_compile.h
@@ -28,8 +28,6 @@
*
*/
-#include <sys/types.h>
-
#include <stdio.h>
#include <stdint.h>
diff --git a/lib/libvcc/vcc_types.c b/lib/libvcc/vcc_types.c
index 4f0a5c4..af41455 100644
--- a/lib/libvcc/vcc_types.c
+++ b/lib/libvcc/vcc_types.c
@@ -30,10 +30,6 @@
#include "config.h"
-#include <math.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
#include <string.h>
#include "vcc_compile.h"
diff --git a/lib/libvcc/vcc_utils.c b/lib/libvcc/vcc_utils.c
index 89ccccc..7d464c5 100644
--- a/lib/libvcc/vcc_utils.c
+++ b/lib/libvcc/vcc_utils.c
@@ -32,13 +32,11 @@
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
-#include <sys/types.h>
#include <sys/socket.h>
#include "vcc_compile.h"
#include "vre.h"
-#include "vrt.h"
#include "vsa.h"
#include "vss.h"
#include "vtcp.h"
diff --git a/lib/libvcc/vcc_var.c b/lib/libvcc/vcc_var.c
index 00fc022..9e4c8cb 100644
--- a/lib/libvcc/vcc_var.c
+++ b/lib/libvcc/vcc_var.c
@@ -29,9 +29,6 @@
#include "config.h"
-#include <stdio.h>
-#include <string.h>
-
#include "vcc_compile.h"
#include "vct.h"
diff --git a/lib/libvmod_std/vmod_std.c b/lib/libvmod_std/vmod_std.c
index 717982e..28cfe2f 100644
--- a/lib/libvmod_std/vmod_std.c
+++ b/lib/libvmod_std/vmod_std.c
@@ -29,14 +29,12 @@
#include "config.h"
#include <sys/stat.h>
-#include <sys/types.h>
#include <netinet/in.h>
#include <ctype.h>
#include <stdlib.h>
#include <syslog.h>
-#include <unistd.h>
#include "cache/cache.h"
More information about the varnish-commit
mailing list