diff --git a/src/xwl.c b/src/xwl.c
index 6e81c6cc..212ad423 100644
--- a/src/xwl.c
+++ b/src/xwl.c
@@ -58,6 +58,10 @@ void xwl_surface_destroy(struct wl_listener *listener, void *data)
 {
 	struct view *view = wl_container_of(listener, view, destroy);
 	wl_list_remove(&view->link);
+	wl_list_remove(&view->map.link);
+	wl_list_remove(&view->unmap.link);
+	wl_list_remove(&view->destroy.link);
+	wl_list_remove(&view->request_configure.link);
 	free(view);
 }
 
diff --git a/tools/asan_suppressions.txt b/tools/asan_suppressions.txt
index 0e14a205..49c9e58e 100644
--- a/tools/asan_suppressions.txt
+++ b/tools/asan_suppressions.txt
@@ -1,3 +1 @@
-leak:libfontconfig
-leak:libglib-2.0
 leak:libxcb*