diff --git a/clients/terminal.c b/clients/terminal.c
index f792badc..ebc5bbe2 100644
--- a/clients/terminal.c
+++ b/clients/terminal.c
@@ -2610,7 +2610,7 @@ recompute_selection(struct terminal *terminal)
 	int side_margin, top_margin;
 	int start_x, end_x;
 	int cw, ch;
-	union utf8_char *data;
+	union utf8_char *data = NULL;
 
 	cw = terminal->average_width;
 	ch = terminal->extents.height;
diff --git a/libweston/compositor-drm.c b/libweston/compositor-drm.c
index b1be4922..91031c8c 100644
--- a/libweston/compositor-drm.c
+++ b/libweston/compositor-drm.c
@@ -6680,7 +6680,7 @@ drm_device_is_kms(struct drm_backend *b, struct udev_device *device)
 	const char *filename = udev_device_get_devnode(device);
 	const char *sysnum = udev_device_get_sysnum(device);
 	drmModeRes *res;
-	int id, fd;
+	int id = -1, fd;
 
 	if (!filename)
 		return false;