diff --git a/src/basic/path-util.h b/src/basic/path-util.h
index 17d31bbd89..52a93b1c3f 100644
--- a/src/basic/path-util.h
+++ b/src/basic/path-util.h
@@ -7,6 +7,7 @@
 
 #include "macro.h"
 #include "string-util.h"
+#include "strv.h"
 #include "time-util.h"
 
 #define PATH_SPLIT_SBIN_BIN(x) x "sbin:" x "bin"
diff --git a/src/core/umount.c b/src/core/umount.c
index 47313da231..9e6c404ab9 100644
--- a/src/core/umount.c
+++ b/src/core/umount.c
@@ -121,9 +121,7 @@ int mount_points_list_get(const char *mountinfo, MountPoint **head) {
                  * unmount these things, hence don't bother. */
                 if (mount_point_is_api(p) ||
                     mount_point_ignore(p) ||
-                    path_startswith(p, "/dev") ||
-                    path_startswith(p, "/sys") ||
-                    path_startswith(p, "/proc"))
+                    PATH_STARTSWITH_SET(p, "/dev", "/sys", "/proc"))
                         continue;
 
                 /* If we are in a container, don't attempt to
diff --git a/src/libsystemd/sd-device/sd-device.c b/src/libsystemd/sd-device/sd-device.c
index d8df1250fe..dc75f91e21 100644
--- a/src/libsystemd/sd-device/sd-device.c
+++ b/src/libsystemd/sd-device/sd-device.c
@@ -793,9 +793,9 @@ _public_ int sd_device_get_subsystem(sd_device *device, const char **ret) {
                 else if (path_startswith(device->devpath, "/module/"))
                         r = device_set_subsystem(device, "module");
                 else if (!(drivers = strstr(syspath, "/drivers/")) &&
-                         (path_startswith(device->devpath, "/subsystem/") ||
-                          path_startswith(device->devpath, "/class/") ||
-                          path_startswith(device->devpath, "/bus/")))
+                         PATH_STARTSWITH_SET(device->devpath, "/subsystem/",
+                                                              "/class/",
+                                                              "/bus/"))
                         r = device_set_subsystem(device, "subsystem");
                 if (r < 0 && r != -ENOENT)
                         return log_device_debug_errno(device, r, "sd-device: Failed to set subsystem for %s: %m", device->devpath);
diff --git a/src/libudev/libudev-device.c b/src/libudev/libudev-device.c
index 19695b5ee4..1e7d774ba9 100644
--- a/src/libudev/libudev-device.c
+++ b/src/libudev/libudev-device.c
@@ -150,8 +150,6 @@ _public_ const char *udev_device_get_subsystem(struct udev_device *udev_device)
         r = sd_device_get_subsystem(udev_device->device, &subsystem);
         if (r < 0)
                 return_with_errno(NULL, r);
-        if (!subsystem)
-                return_with_errno(NULL, ENODATA);
 
         return subsystem;
 }