15 files changed, 67 insertions, 65 deletions
diff --git a/src/libsystemd-terminal/evcat.c b/src/libsystemd-terminal/evcat.c
index d274225ed0..2aeefc2e16 100644
--- a/src/libsystemd-terminal/evcat.c
+++ b/src/libsystemd-terminal/evcat.c
@@ -35,19 +35,20 @@
 #include <stdlib.h>
 #include <sys/ioctl.h>
 #include <sys/stat.h>
-#include <systemd/sd-bus.h>
-#include <systemd/sd-event.h>
-#include <systemd/sd-login.h>
 #include <termios.h>
 #include <unistd.h>
 #include <xkbcommon/xkbcommon.h>
+#include "sd-bus.h"
+#include "sd-event.h"
+#include "sd-login.h"
 #include "build.h"
 #include "event-util.h"
-#include "idev.h"
 #include "macro.h"
+#include "signal-util.h"
+#include "util.h"
+#include "idev.h"
 #include "sysview.h"
 #include "term-internal.h"
-#include "util.h"
 
 typedef struct Evcat Evcat;
 
@@ -153,7 +154,7 @@ static int evcat_new(Evcat **out) {
         if (r < 0)
                 return r;
 
-        r = sigprocmask_many(SIG_BLOCK, SIGTERM, SIGINT, -1);
+        r = sigprocmask_many(SIG_BLOCK, NULL, SIGTERM, SIGINT, -1);
         if (r < 0)
                 return r;
 
diff --git a/src/libsystemd-terminal/grdev-drm.c b/src/libsystemd-terminal/grdev-drm.c
index 01a70fd320..30c1a726eb 100644
--- a/src/libsystemd-terminal/grdev-drm.c
+++ b/src/libsystemd-terminal/grdev-drm.c
@@ -27,22 +27,22 @@
 #include <sys/ioctl.h>
 #include <sys/mman.h>
 #include <sys/types.h>
-#include <systemd/sd-bus.h>
-#include <systemd/sd-event.h>
 #include <unistd.h>
 
 /* Yuck! DRM headers need system headers included first.. but we have to
- * include it before shared/missing.h to avoid redefining ioctl bits */
+ * include it before util/missing.h to avoid redefining ioctl bits */
 #include <drm.h>
 #include <drm_fourcc.h>
 #include <drm_mode.h>
 
-#include "bus-util.h"
+#include "sd-bus.h"
+#include "sd-event.h"
 #include "hashmap.h"
-#include "grdev.h"
-#include "grdev-internal.h"
 #include "macro.h"
 #include "util.h"
+#include "bus-util.h"
+#include "grdev.h"
+#include "grdev-internal.h"
 
 #define GRDRM_MAX_TRIES (16)
 
diff --git a/src/libsystemd-terminal/grdev-internal.h b/src/libsystemd-terminal/grdev-internal.h
index f455dd4172..46d65f0248 100644
--- a/src/libsystemd-terminal/grdev-internal.h
+++ b/src/libsystemd-terminal/grdev-internal.h
@@ -25,12 +25,12 @@
 #include <libudev.h>
 #include <stdbool.h>
 #include <stdlib.h>
-#include <systemd/sd-bus.h>
-#include <systemd/sd-event.h>
-#include "grdev.h"
+#include "sd-bus.h"
+#include "sd-event.h"
 #include "hashmap.h"
 #include "list.h"
 #include "util.h"
+#include "grdev.h"
 
 typedef struct grdev_tile               grdev_tile;
 typedef struct grdev_display_cache      grdev_display_cache;
diff --git a/src/libsystemd-terminal/grdev.c b/src/libsystemd-terminal/grdev.c
index feed579295..71f0bd31e7 100644
--- a/src/libsystemd-terminal/grdev.c
+++ b/src/libsystemd-terminal/grdev.c
@@ -22,14 +22,14 @@
 #include <libudev.h>
 #include <stdbool.h>
 #include <stdlib.h>
-#include <systemd/sd-bus.h>
-#include <systemd/sd-event.h>
-#include "grdev.h"
-#include "grdev-internal.h"
+#include "sd-bus.h"
+#include "sd-event.h"
 #include "hashmap.h"
-#include "login-shared.h"
+#include "login-util.h"
 #include "macro.h"
 #include "util.h"
+#include "grdev.h"
+#include "grdev-internal.h"
 
 static void pipe_enable(grdev_pipe *pipe);
 static void pipe_disable(grdev_pipe *pipe);
diff --git a/src/libsystemd-terminal/grdev.h b/src/libsystemd-terminal/grdev.h
index db2a508fd8..110d24e6d5 100644
--- a/src/libsystemd-terminal/grdev.h
+++ b/src/libsystemd-terminal/grdev.h
@@ -56,8 +56,8 @@
 #include <libudev.h>
 #include <stdbool.h>
 #include <stdlib.h>
-#include <systemd/sd-bus.h>
-#include <systemd/sd-event.h>
+#include "sd-bus.h"
+#include "sd-event.h"
 #include "util.h"
 
 typedef struct grdev_fb                 grdev_fb;
diff --git a/src/libsystemd-terminal/idev-evdev.c b/src/libsystemd-terminal/idev-evdev.c
index 64e703eb67..f1a18b91d3 100644
--- a/src/libsystemd-terminal/idev-evdev.c
+++ b/src/libsystemd-terminal/idev-evdev.c
@@ -24,13 +24,13 @@
 #include <libudev.h>
 #include <stdbool.h>
 #include <stdlib.h>
-#include <systemd/sd-bus.h>
-#include <systemd/sd-event.h>
+#include "sd-bus.h"
+#include "sd-event.h"
+#include "macro.h"
+#include "util.h"
 #include "bus-util.h"
 #include "idev.h"
 #include "idev-internal.h"
-#include "macro.h"
-#include "util.h"
 
 typedef struct idev_evdev idev_evdev;
 typedef struct unmanaged_evdev unmanaged_evdev;
diff --git a/src/libsystemd-terminal/idev-internal.h b/src/libsystemd-terminal/idev-internal.h
index a159aef211..a02a16c408 100644
--- a/src/libsystemd-terminal/idev-internal.h
+++ b/src/libsystemd-terminal/idev-internal.h
@@ -26,13 +26,13 @@
 #include <linux/input.h>
 #include <stdbool.h>
 #include <stdlib.h>
-#include <systemd/sd-bus.h>
-#include <systemd/sd-event.h>
 #include <xkbcommon/xkbcommon.h>
+#include "sd-bus.h"
+#include "sd-event.h"
 #include "hashmap.h"
-#include "idev.h"
 #include "list.h"
 #include "util.h"
+#include "idev.h"
 
 typedef struct idev_link                idev_link;
 typedef struct idev_device_vtable       idev_device_vtable;
diff --git a/src/libsystemd-terminal/idev-keyboard.c b/src/libsystemd-terminal/idev-keyboard.c
index ef56ee2482..93f49e9458 100644
--- a/src/libsystemd-terminal/idev-keyboard.c
+++ b/src/libsystemd-terminal/idev-keyboard.c
@@ -21,17 +21,17 @@
 
 #include <stdbool.h>
 #include <stdlib.h>
-#include <systemd/sd-bus.h>
-#include <systemd/sd-event.h>
 #include <xkbcommon/xkbcommon.h>
 #include <xkbcommon/xkbcommon-compose.h>
-#include "bus-util.h"
+#include "sd-bus.h"
+#include "sd-event.h"
 #include "hashmap.h"
+#include "macro.h"
+#include "util.h"
+#include "bus-util.h"
 #include "idev.h"
 #include "idev-internal.h"
-#include "macro.h"
 #include "term-internal.h"
-#include "util.h"
 
 typedef struct kbdtbl kbdtbl;
 typedef struct kbdmap kbdmap;
diff --git a/src/libsystemd-terminal/idev.c b/src/libsystemd-terminal/idev.c
index 0ba2b28ab7..b92a393b69 100644
--- a/src/libsystemd-terminal/idev.c
+++ b/src/libsystemd-terminal/idev.c
@@ -22,14 +22,14 @@
 #include <libudev.h>
 #include <stdbool.h>
 #include <stdlib.h>
-#include <systemd/sd-bus.h>
-#include <systemd/sd-event.h>
+#include "sd-bus.h"
+#include "sd-event.h"
 #include "hashmap.h"
-#include "idev.h"
-#include "idev-internal.h"
-#include "login-shared.h"
+#include "login-util.h"
 #include "macro.h"
 #include "util.h"
+#include "idev.h"
+#include "idev-internal.h"
 
 static void element_open(idev_element *e);
 static void element_close(idev_element *e);
diff --git a/src/libsystemd-terminal/idev.h b/src/libsystemd-terminal/idev.h
index 0e846179e6..241677cbbe 100644
--- a/src/libsystemd-terminal/idev.h
+++ b/src/libsystemd-terminal/idev.h
@@ -28,9 +28,9 @@
 #include <libudev.h>
 #include <linux/input.h>
 #include <stdbool.h>
-#include <systemd/sd-bus.h>
-#include <systemd/sd-event.h>
 #include <xkbcommon/xkbcommon.h>
+#include "sd-bus.h"
+#include "sd-event.h"
 
 typedef struct idev_data                idev_data;
 typedef struct idev_data_evdev          idev_data_evdev;
diff --git a/src/libsystemd-terminal/modeset.c b/src/libsystemd-terminal/modeset.c
index 621d6c4fa3..790a244772 100644
--- a/src/libsystemd-terminal/modeset.c
+++ b/src/libsystemd-terminal/modeset.c
@@ -35,18 +35,18 @@
 #include <stdlib.h>
 #include <sys/ioctl.h>
 #include <sys/stat.h>
-#include <systemd/sd-bus.h>
-#include <systemd/sd-event.h>
-#include <systemd/sd-login.h>
 #include <termios.h>
 #include <unistd.h>
-
+#include "sd-bus.h"
+#include "sd-event.h"
+#include "sd-login.h"
 #include "build.h"
-#include "grdev.h"
 #include "macro.h"
-#include "sysview.h"
-#include "util.h"
 #include "random-util.h"
+#include "signal-util.h"
+#include "util.h"
+#include "grdev.h"
+#include "sysview.h"
 
 typedef struct Modeset Modeset;
 
@@ -170,7 +170,7 @@ static int modeset_new(Modeset **out) {
         if (r < 0)
                 return r;
 
-        r = sigprocmask_many(SIG_BLOCK, SIGTERM, SIGINT, -1);
+        r = sigprocmask_many(SIG_BLOCK, NULL, SIGTERM, SIGINT, -1);
         if (r < 0)
                 return r;
 
diff --git a/src/libsystemd-terminal/subterm.c b/src/libsystemd-terminal/subterm.c
index 983a2a14ab..5f12540111 100644
--- a/src/libsystemd-terminal/subterm.c
+++ b/src/libsystemd-terminal/subterm.c
@@ -34,13 +34,14 @@
 #include <string.h>
 #include <sys/ioctl.h>
 #include <termios.h>
+#include "sd-event.h"
 #include "macro.h"
 #include "pty.h"
 #include "ring.h"
-#include "sd-event.h"
-#include "term-internal.h"
-#include "util.h"
+#include "signal-util.h"
 #include "utf8.h"
+#include "util.h"
+#include "term-internal.h"
 
 typedef struct Output Output;
 typedef struct Terminal Terminal;
@@ -855,7 +856,7 @@ static int terminal_new(Terminal **out, int in_fd, int out_fd) {
                 goto error;
         }
 
-        r = sigprocmask_many(SIG_BLOCK, SIGINT, SIGQUIT, SIGTERM, SIGWINCH, SIGCHLD, -1);
+        r = sigprocmask_many(SIG_BLOCK, NULL, SIGINT, SIGQUIT, SIGTERM, SIGWINCH, SIGCHLD, -1);
         if (r < 0) {
                 log_error_errno(r, "error: sigprocmask_many() (%d): %m", r);
                 goto error;
diff --git a/src/libsystemd-terminal/sysview-internal.h b/src/libsystemd-terminal/sysview-internal.h
index f1fd4b5f53..251c8d7300 100644
--- a/src/libsystemd-terminal/sysview-internal.h
+++ b/src/libsystemd-terminal/sysview-internal.h
@@ -25,13 +25,13 @@
 #include <libudev.h>
 #include <stdbool.h>
 #include <stdlib.h>
-#include <systemd/sd-bus.h>
-#include <systemd/sd-event.h>
+#include "sd-bus.h"
+#include "sd-event.h"
 #include "hashmap.h"
 #include "list.h"
 #include "macro.h"
-#include "sysview.h"
 #include "util.h"
+#include "sysview.h"
 
 /*
  * Devices
diff --git a/src/libsystemd-terminal/sysview.c b/src/libsystemd-terminal/sysview.c
index 1e13167a79..2e9b15859a 100644
--- a/src/libsystemd-terminal/sysview.c
+++ b/src/libsystemd-terminal/sysview.c
@@ -23,15 +23,15 @@
 #include <libudev.h>
 #include <stdbool.h>
 #include <stdlib.h>
-#include <systemd/sd-bus.h>
-#include <systemd/sd-event.h>
-#include <systemd/sd-login.h>
-#include "bus-util.h"
+#include "sd-bus.h"
+#include "sd-event.h"
+#include "sd-login.h"
 #include "macro.h"
-#include "sysview.h"
-#include "sysview-internal.h"
 #include "udev-util.h"
 #include "util.h"
+#include "bus-util.h"
+#include "sysview.h"
+#include "sysview-internal.h"
 
 static int context_raise_session_control(sysview_context *c, sysview_session *session, int error);
 
@@ -196,7 +196,7 @@ int sysview_session_new(sysview_session **out, sysview_seat *seat, const char *n
                 if (r < 0)
                         return r;
 
-                session->custom = false;;
+                session->custom = false;
         } else {
                 /*
                  * No session name was given. We assume this is an unmanaged
diff --git a/src/libsystemd-terminal/sysview.h b/src/libsystemd-terminal/sysview.h
index 71e56e7ebf..a5e7a38df3 100644
--- a/src/libsystemd-terminal/sysview.h
+++ b/src/libsystemd-terminal/sysview.h
@@ -37,8 +37,8 @@
 #pragma once
 
 #include <stdbool.h>
-#include <systemd/sd-bus.h>
-#include <systemd/sd-event.h>
+#include "sd-bus.h"
+#include "sd-event.h"
 
 typedef struct sysview_event            sysview_event;
 typedef struct sysview_device           sysview_device;