[master] 6d4df3639 more include shuffling for vsig.h

[Nils Goroll]

commit 6d4df3639725bbec6d1657b07867ec44f4ba14f8
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Tue Jul 28 10:00:31 2020 +0200

    more include shuffling for vsig.h

diff --git a/bin/varnishadm/varnishadm.c b/bin/varnishadm/varnishadm.c
index f93ace25d..e3e76efa3 100644
--- a/bin/varnishadm/varnishadm.c
+++ b/bin/varnishadm/varnishadm.c
@@ -54,7 +54,6 @@
 #include <math.h>
 #include <fcntl.h>
 #include <poll.h>
-#include <signal.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/bin/varnishd/mgt/mgt_child.c b/bin/varnishd/mgt/mgt_child.c
index 418851f86..6be347d92 100644
--- a/bin/varnishd/mgt/mgt_child.c
+++ b/bin/varnishd/mgt/mgt_child.c
@@ -36,7 +36,6 @@
 #include <sys/types.h>
 
 #include <poll.h>
-#include <signal.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/bin/varnishhist/varnishhist.c b/bin/varnishhist/varnishhist.c
index a2e94cb5d..63bf8e73e 100644
--- a/bin/varnishhist/varnishhist.c
+++ b/bin/varnishhist/varnishhist.c
@@ -38,7 +38,6 @@
 #include <limits.h>
 #include <math.h>
 #include <pthread.h>
-#include <signal.h>
 #include <stdarg.h>
 #include <stdlib.h>
 #include <string.h>
@@ -52,10 +51,10 @@
 #include "vapi/vsl.h"
 #include "vapi/vsm.h"
 #include "vapi/voptget.h"
+#include "vapi/vsig.h"
 #include "vas.h"
 #include "vut.h"
 #include "vtim.h"
-#include "vapi/vsig.h"
 
 #if 1
 #define AC(x) assert((x) != ERR)
diff --git a/bin/varnishstat/varnishstat_curses.c b/bin/varnishstat/varnishstat_curses.c
index b8d5c7cf4..f7c486db1 100644
--- a/bin/varnishstat/varnishstat_curses.c
+++ b/bin/varnishstat/varnishstat_curses.c
@@ -38,7 +38,6 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
-#include <signal.h>
 #include <stdint.h>
 #include <math.h>
 
diff --git a/include/vapi/vsig.h b/include/vapi/vsig.h
index 25e6647d5..3f896e037 100644
--- a/include/vapi/vsig.h
+++ b/include/vapi/vsig.h
@@ -33,6 +33,7 @@
 #define VAPI_VSIG_H_INCLUDED
 
 #include <sys/wait.h>
+#include <signal.h>
 
 #define VSIG_SIGNAL(UPPER, lower)		\
 	extern sig_atomic_t VSIG_##lower;	\
diff --git a/lib/libvarnishapi/vsm.c b/lib/libvarnishapi/vsm.c
index 4bc283ad2..6ec9fd536 100644
--- a/lib/libvarnishapi/vsm.c
+++ b/lib/libvarnishapi/vsm.c
@@ -38,7 +38,6 @@
 #include <fcntl.h>
 #include <float.h>
 #include <math.h>
-#include <signal.h>
 #include <stdarg.h>
 #include <stdint.h>
 #include <stdio.h>
diff --git a/lib/libvarnishapi/vut.c b/lib/libvarnishapi/vut.c
index 165c2e34d..6e8384572 100644
--- a/lib/libvarnishapi/vut.c
+++ b/lib/libvarnishapi/vut.c
@@ -40,7 +40,6 @@
 #include <unistd.h>
 #include <stdio.h>
 #include <string.h>
-#include <signal.h>
 #include <sys/stat.h> /* for MUSL */
 
 #include "compat/daemon.h"
@@ -55,11 +54,12 @@
 #include "vsb.h"
 #include "vfil.h"
 
-#include "vut.h"
-
 #include "vapi/voptget.h"
 #include "vapi/vsig.h"
 
+#include "vut.h"
+
+
 static int vut_synopsis(const struct vopt_spec *);
 static int vut_options(const struct vopt_spec *);