diff --git a/libweston/backend-drm/libbacklight.c b/libweston/backend-drm/libbacklight.c
index ca7f2d68..973d15ff 100644
--- a/libweston/backend-drm/libbacklight.c
+++ b/libweston/backend-drm/libbacklight.c
@@ -41,6 +41,7 @@
 #include <drm.h>
 #include <fcntl.h>
 #include <malloc.h>
+#include <libgen.h>
 #include <string.h>
 #include <errno.h>
 
@@ -167,7 +168,7 @@ struct backlight *backlight_init(struct udev_device *drm_device,
 	DIR *backlights = NULL;
 	struct dirent *entry;
 	enum backlight_type type = 0;
-	char buffer[100];
+	char buffer[100], basename_buffer[100];
 	struct backlight *backlight = NULL;
 	int ret;
 
@@ -186,9 +187,10 @@ struct backlight *backlight_init(struct udev_device *drm_device,
 	free(path);
 	if (ret < 0)
 		return NULL;
-
+	strncpy(basename_buffer, buffer, ret);
 	buffer[ret] = '\0';
-	pci_name = basename(buffer);
+	basename_buffer[ret] = '\0';
+	pci_name = basename(basename_buffer);
 
 	if (connector_type <= 0)
 		return NULL;
diff --git a/tools/zunitc/src/zunitc_impl.c b/tools/zunitc/src/zunitc_impl.c
index 18f03015..9b460fa0 100644
--- a/tools/zunitc/src/zunitc_impl.c
+++ b/tools/zunitc/src/zunitc_impl.c
@@ -27,6 +27,7 @@
 
 #include <errno.h>
 #include <fcntl.h>
+#include <libgen.h>
 #include <stdarg.h>
 #include <stdbool.h>
 #include <stdio.h>