diff --git a/compositor/main.c b/compositor/main.c
index de091bc9..646fb3a6 100644
--- a/compositor/main.c
+++ b/compositor/main.c
@@ -122,6 +122,7 @@ struct wet_compositor {
 	int (*simple_output_configure)(struct weston_output *output);
 	bool init_failed;
 	struct wl_list layoutput_list;	/**< wet_layoutput::compositor_link */
+	struct wl_list child_process_list;
 };
 
 static FILE *weston_logfile = NULL;
@@ -344,22 +345,27 @@ protocol_log_fn(void *user_data,
 	free(logstr);
 }
 
-static struct wl_list child_process_list;
+static struct wet_compositor *
+to_wet_compositor(struct weston_compositor *compositor)
+{
+	return weston_compositor_get_user_data(compositor);
+}
 
 static int
 sigchld_handler(int signal_number, void *data)
 {
 	struct weston_process *p;
+	struct wet_compositor *wet = data;
 	int status;
 	pid_t pid;
 
 	while ((pid = waitpid(-1, &status, WNOHANG)) > 0) {
-		wl_list_for_each(p, &child_process_list, link) {
+		wl_list_for_each(p, &wet->child_process_list, link) {
 			if (p->pid == pid)
 				break;
 		}
 
-		if (&p->link == &child_process_list) {
+		if (&p->link == &wet->child_process_list) {
 			weston_log("unknown child process exited\n");
 			continue;
 		}
@@ -454,15 +460,17 @@ weston_client_launch(struct weston_compositor *compositor,
 
 	proc->pid = pid;
 	proc->cleanup = cleanup;
-	weston_watch_process(proc);
+	wet_watch_process(compositor, proc);
 
 	return client;
 }
 
 WL_EXPORT void
-weston_watch_process(struct weston_process *process)
+wet_watch_process(struct weston_compositor *compositor,
+		  struct weston_process *process)
 {
-	wl_list_insert(&child_process_list, &process->link);
+	struct wet_compositor *wet = to_wet_compositor(compositor);
+	wl_list_insert(&wet->child_process_list, &process->link);
 }
 
 struct process_info {
@@ -536,12 +544,6 @@ log_uname(void)
 						usys.version, usys.machine);
 }
 
-static struct wet_compositor *
-to_wet_compositor(struct weston_compositor *compositor)
-{
-	return weston_compositor_get_user_data(compositor);
-}
-
 static struct wet_output_config *
 wet_init_parsed_options(struct weston_compositor *ec)
 {
@@ -3286,9 +3288,9 @@ wet_main(int argc, char *argv[], const struct weston_testsuite_data *test_data)
 	signals[2] = wl_event_loop_add_signal(loop, SIGQUIT, on_term_signal,
 					      display);
 
-	wl_list_init(&child_process_list);
+	wl_list_init(&wet.child_process_list);
 	signals[3] = wl_event_loop_add_signal(loop, SIGCHLD, sigchld_handler,
-					      NULL);
+					      &wet);
 
 	if (!signals[0] || !signals[1] || !signals[2] || !signals[3])
 		goto out_signals;
diff --git a/compositor/weston.h b/compositor/weston.h
index f166052f..23f2b2c4 100644
--- a/compositor/weston.h
+++ b/compositor/weston.h
@@ -56,7 +56,8 @@ struct wl_client *
 weston_client_start(struct weston_compositor *compositor, const char *path);
 
 void
-weston_watch_process(struct weston_process *process);
+wet_watch_process(struct weston_compositor *compositor,
+				  struct weston_process *process);
 
 struct weston_config *
 wet_get_config(struct weston_compositor *compositor);
diff --git a/compositor/xwayland.c b/compositor/xwayland.c
index b67176f6..cbb27b51 100644
--- a/compositor/xwayland.c
+++ b/compositor/xwayland.c
@@ -154,7 +154,7 @@ spawn_xserver(void *user_data, const char *display, int abstract_fd, int unix_fd
 		wxw->wm_fd = wm[0];
 
 		wxw->process.pid = pid;
-		weston_watch_process(&wxw->process);
+		wet_watch_process(wxw->compositor, &wxw->process);
 		break;
 
 	case -1: