diff --git a/apps/backend/backend_plugin_restconf.c b/apps/backend/backend_plugin_restconf.c
index c7db8249..3d04d2fa 100644
--- a/apps/backend/backend_plugin_restconf.c
+++ b/apps/backend/backend_plugin_restconf.c
@@ -44,6 +44,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <errno.h>
+#include <signal.h>
 #include <assert.h>
 #include <sys/stat.h>
 
diff --git a/apps/backend/clixon_backend_handle.c b/apps/backend/clixon_backend_handle.c
index dd9714de..f4eb77ac 100644
--- a/apps/backend/clixon_backend_handle.c
+++ b/apps/backend/clixon_backend_handle.c
@@ -52,6 +52,7 @@
 #include <sys/time.h>
 #include <regex.h>
 #include <syslog.h>
+#include <signal.h>
 #include <netinet/in.h>
 #include <limits.h>
 
diff --git a/apps/backend/clixon_backend_transaction.c b/apps/backend/clixon_backend_transaction.c
index e7af1c7c..0a7889ce 100644
--- a/apps/backend/clixon_backend_transaction.c
+++ b/apps/backend/clixon_backend_transaction.c
@@ -51,6 +51,7 @@
 #include <ctype.h>
 #include <sys/types.h>
 #include <regex.h>
+#include <signal.h>
 #include <netinet/in.h>
 #include <limits.h>
 
diff --git a/apps/cli/cli_generate.c b/apps/cli/cli_generate.c
index a2cd6cfb..fe365836 100644
--- a/apps/cli/cli_generate.c
+++ b/apps/cli/cli_generate.c
@@ -78,6 +78,7 @@ You can see which CLISPEC it generates via clixon_cli -D 2:
 #include <errno.h>
 #include <fcntl.h>
 #include <syslog.h>
+#include <signal.h>
 #include <sys/param.h>
 
 /* cligen */
diff --git a/apps/cli/cli_handle.c b/apps/cli/cli_handle.c
index e4fddeb1..5e992a08 100644
--- a/apps/cli/cli_handle.c
+++ b/apps/cli/cli_handle.c
@@ -51,6 +51,7 @@
 #include <dlfcn.h>
 #include <dirent.h>
 #include <grp.h>
+#include <signal.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/param.h>
diff --git a/apps/cli/cli_plugin.c b/apps/cli/cli_plugin.c
index cf52bd7b..77b60cbe 100644
--- a/apps/cli/cli_plugin.c
+++ b/apps/cli/cli_plugin.c
@@ -52,6 +52,7 @@
 #include <dirent.h>
 #include <libgen.h>
 #include <grp.h>
+#include <signal.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/param.h>
@@ -69,7 +70,6 @@
 #include "cli_handle.h"
 #include "cli_generate.h"
 
-
 /*
  * Constants
  */
diff --git a/apps/restconf/restconf_api_native.c b/apps/restconf/restconf_api_native.c
index 956f33bd..981a4e98 100644
--- a/apps/restconf/restconf_api_native.c
+++ b/apps/restconf/restconf_api_native.c
@@ -44,6 +44,7 @@
 #include <stdio.h>
 #include <unistd.h>
 #include <string.h>
+#include <signal.h>
 #include <sys/socket.h>
 #include <arpa/inet.h>
 #include <openssl/ssl.h>
diff --git a/apps/restconf/restconf_handle.c b/apps/restconf/restconf_handle.c
index ef413d08..2573e237 100644
--- a/apps/restconf/restconf_handle.c
+++ b/apps/restconf/restconf_handle.c
@@ -47,6 +47,7 @@
 #include <dirent.h>
 #include <errno.h>
 #include <unistd.h>
+#include <signal.h>
 #include <assert.h>
 #include <sys/types.h>
 #include <sys/time.h>
diff --git a/example/main/example_netconf.c b/example/main/example_netconf.c
index 2a35c939..00a21913 100644
--- a/example/main/example_netconf.c
+++ b/example/main/example_netconf.c
@@ -40,6 +40,7 @@
 #include <errno.h>
 #include <syslog.h>
 #include <unistd.h>
+#include <signal.h>
 #include <sys/stat.h>
 #include <sys/param.h>
 
diff --git a/util/Makefile.in b/util/Makefile.in
index 7e4d21ed..fe6936f8 100644
--- a/util/Makefile.in
+++ b/util/Makefile.in
@@ -103,7 +103,6 @@ APPSRC   += clixon_util_ssl.c # requires http/2
 #APPSRC   += clixon_util_grpc.c # work in progress
 endif
 
-
 APPS	  = $(APPSRC:.c=)
 
 all:	 $(APPS)
diff --git a/util/clixon_util_datastore.c b/util/clixon_util_datastore.c
index 65e611f2..92d6401d 100644
--- a/util/clixon_util_datastore.c
+++ b/util/clixon_util_datastore.c
@@ -48,6 +48,7 @@
 #include <signal.h>
 #include <fcntl.h>
 #include <time.h>
+#include <signal.h>
 #include <syslog.h>
 #include <sys/time.h>
 #include <sys/socket.h>
diff --git a/util/clixon_util_dispatcher.c b/util/clixon_util_dispatcher.c
index 45571daa..2cd00ddb 100644
--- a/util/clixon_util_dispatcher.c
+++ b/util/clixon_util_dispatcher.c
@@ -53,6 +53,7 @@
 #include <stdint.h>
 #include <syslog.h>
 #include <fcntl.h>
+#include <signal.h>
 #include <sys/stat.h>
 
 /* cligen */
diff --git a/util/clixon_util_json.c b/util/clixon_util_json.c
index 389b27ca..43a4ff5a 100644
--- a/util/clixon_util_json.c
+++ b/util/clixon_util_json.c
@@ -50,6 +50,7 @@
 #include <limits.h>
 #include <stdint.h>
 #include <syslog.h>
+#include <signal.h>
 
 /* cligen */
 #include <cligen/cligen.h>
diff --git a/util/clixon_util_path.c b/util/clixon_util_path.c
index f75a36da..7f7a034e 100644
--- a/util/clixon_util_path.c
+++ b/util/clixon_util_path.c
@@ -49,6 +49,7 @@
 #include <stdint.h>
 #include <syslog.h>
 #include <fcntl.h>
+#include <signal.h>
 #include <sys/stat.h>
 
 /* cligen */
diff --git a/util/clixon_util_regexp.c b/util/clixon_util_regexp.c
index edf5255c..0d02c55b 100644
--- a/util/clixon_util_regexp.c
+++ b/util/clixon_util_regexp.c
@@ -47,6 +47,7 @@
 #include <syslog.h>
 #include <stdlib.h>
 #include <limits.h>
+#include <signal.h>
 
 #ifdef HAVE_LIBXML2 /* Actually it should check for  a header file */
 #include <libxml/xmlregexp.h>
diff --git a/util/clixon_util_socket.c b/util/clixon_util_socket.c
index 28ce05b0..409e30f1 100644
--- a/util/clixon_util_socket.c
+++ b/util/clixon_util_socket.c
@@ -52,6 +52,7 @@
 #include <stdint.h>
 #include <syslog.h>
 #include <fcntl.h>
+#include <signal.h>
 #include <sys/time.h>
 #include <sys/stat.h>
 
diff --git a/util/clixon_util_ssl.c b/util/clixon_util_ssl.c
index 68a17aa1..7e4b17ef 100644
--- a/util/clixon_util_ssl.c
+++ b/util/clixon_util_ssl.c
@@ -49,6 +49,7 @@
 #include <string.h>
 #include <errno.h>
 #include <syslog.h>
+#include <signal.h>
 #include <netdb.h>      /* gethostbyname */
 #include <arpa/inet.h>  /* inet_pton */
 #include <netinet/tcp.h> /* TCP_NODELAY */
diff --git a/util/clixon_util_stream.c b/util/clixon_util_stream.c
index ebf3df83..41fd7d07 100644
--- a/util/clixon_util_stream.c
+++ b/util/clixon_util_stream.c
@@ -50,6 +50,7 @@
 #include <limits.h>
 #include <stdint.h>
 #include <syslog.h>
+#include <signal.h>
 #include <curl/curl.h>
 
 /* cligen */
diff --git a/util/clixon_util_validate.c b/util/clixon_util_validate.c
index a64465fe..415c2dda 100644
--- a/util/clixon_util_validate.c
+++ b/util/clixon_util_validate.c
@@ -53,6 +53,7 @@
 #include <stdint.h>
 #include <syslog.h>
 #include <fcntl.h>
+#include <signal.h>
 #include <sys/time.h>
 #include <sys/stat.h>
 
diff --git a/util/clixon_util_xml.c b/util/clixon_util_xml.c
index 87a35d9c..b59ae889 100644
--- a/util/clixon_util_xml.c
+++ b/util/clixon_util_xml.c
@@ -56,6 +56,7 @@
 #include <stdint.h>
 #include <syslog.h>
 #include <fcntl.h>
+#include <signal.h>
 #include <sys/time.h>
 #include <sys/stat.h>
 
diff --git a/util/clixon_util_xml_mod.c b/util/clixon_util_xml_mod.c
index 7347842c..49db916e 100644
--- a/util/clixon_util_xml_mod.c
+++ b/util/clixon_util_xml_mod.c
@@ -58,6 +58,7 @@
 #include <stdint.h>
 #include <syslog.h>
 #include <fcntl.h>
+#include <signal.h>
 
 /* cligen */
 #include <cligen/cligen.h>
diff --git a/util/clixon_util_xpath.c b/util/clixon_util_xpath.c
index 878dcb39..9726ae1c 100644
--- a/util/clixon_util_xpath.c
+++ b/util/clixon_util_xpath.c
@@ -50,6 +50,7 @@ See https://www.w3.org/TR/xpath/
 #include <stdint.h>
 #include <syslog.h>
 #include <fcntl.h>
+#include <signal.h>
 #include <sys/stat.h>
 
 /* cligen */
diff --git a/util/clixon_util_yang.c b/util/clixon_util_yang.c
index 7f7ea051..f85a811c 100644
--- a/util/clixon_util_yang.c
+++ b/util/clixon_util_yang.c
@@ -51,11 +51,11 @@
 #include <regex.h>
 #include <dirent.h>
 #include <syslog.h>
+#include <signal.h>
 #include <sys/stat.h>
 #include <libgen.h>
 #include <netinet/in.h>
 
-
 /* cligen */
 #include <cligen/cligen.h>