diff --git a/ldpd/ldpd.c b/ldpd/ldpd.c
index 621f0c9a43..a4d45d9c8d 100644
--- a/ldpd/ldpd.c
+++ b/ldpd/ldpd.c
@@ -10,6 +10,7 @@
 
 #include <zebra.h>
 
+#include <signal.h>
 #include <fcntl.h>
 #include <sys/wait.h>
 
diff --git a/lib/event.c b/lib/event.c
index 3ca27f6d8c..a7851f6983 100644
--- a/lib/event.c
+++ b/lib/event.c
@@ -6,6 +6,8 @@
 /* #define DEBUG */
 
 #include <zebra.h>
+
+#include <signal.h>
 #include <sys/resource.h>
 
 #include "frrevent.h"
diff --git a/lib/frr_pthread.c b/lib/frr_pthread.c
index c4ead01bf6..761969266a 100644
--- a/lib/frr_pthread.c
+++ b/lib/frr_pthread.c
@@ -5,6 +5,9 @@
  */
 
 #include <zebra.h>
+
+#include <signal.h>
+
 #include <pthread.h>
 #ifdef HAVE_PTHREAD_NP_H
 #include <pthread_np.h>
diff --git a/lib/libfrr.c b/lib/libfrr.c
index 4cc04babe9..d38b4ec4c0 100644
--- a/lib/libfrr.c
+++ b/lib/libfrr.c
@@ -6,6 +6,8 @@
  */
 
 #include <zebra.h>
+
+#include <signal.h>
 #include <sys/stat.h>
 #include <sys/un.h>
 #include <fcntl.h>
diff --git a/lib/sigevent.c b/lib/sigevent.c
index 3cd65eb800..06f80db4cc 100644
--- a/lib/sigevent.c
+++ b/lib/sigevent.c
@@ -4,6 +4,8 @@
  */
 
 #include <zebra.h>
+
+#include <signal.h>
 #include <sigevent.h>
 #include <log.h>
 #include <memory.h>
diff --git a/lib/zebra.h b/lib/zebra.h
index e38dba0deb..339b832e9d 100644
--- a/lib/zebra.h
+++ b/lib/zebra.h
@@ -18,7 +18,6 @@
 #include <stddef.h>
 #include <ctype.h>
 #include <errno.h>
-#include <signal.h>
 #include <string.h>
 #ifdef HAVE_STROPTS_H
 #include <stropts.h>
diff --git a/vtysh/vtysh_main.c b/vtysh/vtysh_main.c
index 58b1ded23e..6065776f11 100644
--- a/vtysh/vtysh_main.c
+++ b/vtysh/vtysh_main.c
@@ -5,6 +5,7 @@
 
 #include <zebra.h>
 
+#include <signal.h>
 #include <sys/stat.h>
 #include <sys/un.h>
 #include <setjmp.h>
diff --git a/watchfrr/watchfrr.c b/watchfrr/watchfrr.c
index 406765a781..707e01f4ef 100644
--- a/watchfrr/watchfrr.c
+++ b/watchfrr/watchfrr.c
@@ -6,6 +6,8 @@
  */
 
 #include <zebra.h>
+
+#include <signal.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 
diff --git a/watchfrr/watchfrr_vty.c b/watchfrr/watchfrr_vty.c
index 3afc76761d..0547c1e8b3 100644
--- a/watchfrr/watchfrr_vty.c
+++ b/watchfrr/watchfrr_vty.c
@@ -6,6 +6,8 @@
  */
 
 #include <zebra.h>
+
+#include <signal.h>
 #include <sys/wait.h>
 
 #include "memory.h"