diff --git a/client/display.c b/client/display.c
index 92c7955d..1ed4ff56 100644
--- a/client/display.c
+++ b/client/display.c
@@ -24,10 +24,12 @@
 #include <config.h>
 #endif
 
-#include <ell/ell.h>
+#include <stdio.h>
+#include <signal.h>
+
 #include <readline/history.h>
 #include <readline/readline.h>
-#include <stdio.h>
+#include <ell/ell.h>
 
 #include "agent.h"
 #include "command.h"
@@ -577,29 +579,19 @@ void display_quit(void)
 	rl_crlf();
 }
 
-static void signal_handler(struct l_signal *signal, uint32_t signo,
-								void *user_data)
+static void signal_handler(void *user_data)
 {
-	switch (signo) {
-	case SIGWINCH:
-		if (display_refresh.cmd)
-			display_refresh_reset();
-		break;
-	}
+	if (display_refresh.cmd)
+		display_refresh_reset();
 }
 
 void display_init(void)
 {
-	sigset_t mask;
-
 	display_refresh.redo_entries = l_queue_new();
 
 	setlinebuf(stdout);
 
-	sigemptyset(&mask);
-	sigaddset(&mask, SIGWINCH);
-
-	resize_signal = l_signal_create(&mask, signal_handler, NULL, NULL);
+	resize_signal = l_signal_create(SIGWINCH, signal_handler, NULL, NULL);
 
 	rl_attempted_completion_function = command_completion;
 	rl_completion_display_matches_hook = display_completion_matches;
diff --git a/client/main.c b/client/main.c
index ea64003f..76cdf192 100644
--- a/client/main.c
+++ b/client/main.c
@@ -25,6 +25,7 @@
 #endif
 
 #include <errno.h>
+#include <signal.h>
 #include <ell/ell.h>
 
 #include "command.h"
diff --git a/monitor/main.c b/monitor/main.c
index 0cc4cb7e..72dd74c6 100644
--- a/monitor/main.c
+++ b/monitor/main.c
@@ -25,10 +25,11 @@
 #endif
 
 #include <stdio.h>
+#include <errno.h>
 #include <ctype.h>
 #include <stdlib.h>
 #include <getopt.h>
-#include <errno.h>
+#include <signal.h>
 #include <sys/socket.h>
 #include <linux/genetlink.h>
 #include <linux/rtnetlink.h>
diff --git a/src/main.c b/src/main.c
index 3ce0f83e..a550094c 100644
--- a/src/main.c
+++ b/src/main.c
@@ -28,6 +28,7 @@
 #include <stdlib.h>
 #include <errno.h>
 #include <getopt.h>
+#include <signal.h>
 #include <ell/ell.h>
 
 #include "linux/nl80211.h"
diff --git a/tools/hwsim.c b/tools/hwsim.c
index eec39f48..edfd1d28 100644
--- a/tools/hwsim.c
+++ b/tools/hwsim.c
@@ -27,6 +27,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <getopt.h>
+#include <signal.h>
 #include <linux/if_ether.h>
 #include <linux/rtnetlink.h>
 #include <net/if_arp.h>
diff --git a/wired/dbus.c b/wired/dbus.c
index cddda78b..a3658898 100644
--- a/wired/dbus.c
+++ b/wired/dbus.c
@@ -24,6 +24,7 @@
 #include <config.h>
 #endif
 
+#include <signal.h>
 #include <ell/ell.h>
 
 #include "wired/dbus.h"