[master] 2d4da769f polish previous commit

[Nils Goroll]

commit 2d4da769f5f59374a6baf9f9f6efdf327d0dee8a
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Tue Jul 28 09:51:51 2020 +0200

    polish previous commit
    
    - remove a duplicate sys/wait.h include
    - remove a stray vapi/voptget.h include
    - move include in vsig.h to the right place

diff --git a/bin/varnishtest/vtc_subr.c b/bin/varnishtest/vtc_subr.c
index 087cb71b7..fe5fe2008 100644
--- a/bin/varnishtest/vtc_subr.c
+++ b/bin/varnishtest/vtc_subr.c
@@ -44,7 +44,6 @@
 #include "vnum.h"
 #include "vre.h"
 
-#include "vapi/voptget.h"
 #include "vapi/vsig.h"
 
 struct vsb *
diff --git a/include/vapi/vsig.h b/include/vapi/vsig.h
index 0c1bdcb7d..25e6647d5 100644
--- a/include/vapi/vsig.h
+++ b/include/vapi/vsig.h
@@ -32,6 +32,8 @@
 #ifndef VAPI_VSIG_H_INCLUDED
 #define VAPI_VSIG_H_INCLUDED
 
+#include <sys/wait.h>
+
 #define VSIG_SIGNAL(UPPER, lower)		\
 	extern sig_atomic_t VSIG_##lower;	\
 	void VSIG_Got_##lower(int sig);		\
@@ -39,8 +41,6 @@
 
 #include "tbl/vsig_list.h"
 
-#include <sys/wait.h>
-
 #ifndef WCOREDUMP
 #  ifdef WIFCORED
 #    define WCOREDUMP(s) WIFCORED(s)
diff --git a/lib/libvarnish/vsub.c b/lib/libvarnish/vsub.c
index 56308f6b3..b528c12c4 100644
--- a/lib/libvarnish/vsub.c
+++ b/lib/libvarnish/vsub.c
@@ -33,8 +33,6 @@
 
 #include "config.h"
 
-#include <sys/wait.h>
-
 #include <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>		// Solaris closefrom(3c)