diff --git a/Makefile.am b/Makefile.am
index a72f0516..ae96b8c5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1093,6 +1093,7 @@ ivi_shell_la_LDFLAGS = -module -avoid-version
 ivi_shell_la_LIBADD =				\
 	libshared.la				\
 	libweston-@LIBWESTON_MAJOR@.la		\
+	libweston-desktop-@LIBWESTON_MAJOR@.la  \
 	$(COMPOSITOR_LIBS)
 ivi_shell_la_CFLAGS = $(AM_CFLAGS) $(COMPOSITOR_CFLAGS)
 ivi_shell_la_SOURCES =				\
diff --git a/ivi-shell/ivi-layout-private.h b/ivi-shell/ivi-layout-private.h
index fe5be01a..c054130b 100644
--- a/ivi-shell/ivi-layout-private.h
+++ b/ivi-shell/ivi-layout-private.h
@@ -30,6 +30,7 @@
 
 #include "compositor.h"
 #include "ivi-layout-export.h"
+#include "libweston-desktop/libweston-desktop.h"
 
 struct ivi_layout_view {
 	struct wl_list link;	/* ivi_layout::view_list */
@@ -52,6 +53,7 @@ struct ivi_layout_surface {
 
 	struct ivi_layout *layout;
 	struct weston_surface *surface;
+	struct weston_desktop_surface *weston_desktop_surface;
 
 	struct ivi_layout_surface_properties prop;
 
diff --git a/ivi-shell/ivi-shell.c b/ivi-shell/ivi-shell.c
index ba628551..30190d4e 100644
--- a/ivi-shell/ivi-shell.c
+++ b/ivi-shell/ivi-shell.c
@@ -44,7 +44,7 @@
 
 #include "ivi-shell.h"
 #include "ivi-application-server-protocol.h"
-#include "ivi-layout-export.h"
+#include "ivi-layout-private.h"
 #include "ivi-layout-shell.h"
 #include "shared/helpers.h"
 #include "compositor/weston.h"
@@ -265,6 +265,8 @@ application_surface_create(struct wl_client *client,
 		return;
 	}
 
+	layout_surface->weston_desktop_surface = NULL;
+
 	ivisurf = zalloc(sizeof *ivisurf);
 	if (ivisurf == NULL) {
 		wl_resource_post_no_memory(resource);
diff --git a/ivi-shell/ivi-shell.h b/ivi-shell/ivi-shell.h
index 78bf57dc..3aeddcab 100644
--- a/ivi-shell/ivi-shell.h
+++ b/ivi-shell/ivi-shell.h
@@ -30,6 +30,7 @@
 #include <stdint.h>
 
 #include "compositor.h"
+#include "libweston-desktop/libweston-desktop.h"
 
 struct ivi_shell
 {
@@ -38,6 +39,7 @@ struct ivi_shell
 
 	struct weston_compositor *compositor;
 
+	struct weston_desktop *desktop;
 	struct wl_list ivi_surface_list; /* struct ivi_shell_surface::link */
 };
 
diff --git a/ivi-shell/meson.build b/ivi-shell/meson.build
index 7a176994..fceaf804 100644
--- a/ivi-shell/meson.build
+++ b/ivi-shell/meson.build
@@ -12,7 +12,7 @@ if get_option('shell-ivi')
 		'ivi-shell',
 		srcs_shell_ivi,
 		include_directories: include_directories('..', '../shared'),
-		dependencies: dep_libweston,
+		dependencies: [ dep_lib_desktop, dep_libweston ],
 		name_prefix: '',
 		install: true,
 		install_dir: dir_module_weston