1 diff --git a/Makefile.am b/Makefile.am
2 index cdf82ab4..d990d400 100644
5 @@ -993,6 +993,7 @@ ivi_shell_la_LDFLAGS = -module -avoid-version
6 ivi_shell_la_LIBADD = \
8 libweston-@LIBWESTON_MAJOR@.la \
9 + libweston-desktop-@LIBWESTON_MAJOR@.la \
11 ivi_shell_la_CFLAGS = $(AM_CFLAGS) $(COMPOSITOR_CFLAGS)
12 ivi_shell_la_SOURCES = \
13 diff --git a/ivi-shell/ivi-layout-private.h b/ivi-shell/ivi-layout-private.h
14 index fe5be01a..c054130b 100644
15 --- a/ivi-shell/ivi-layout-private.h
16 +++ b/ivi-shell/ivi-layout-private.h
19 #include "compositor.h"
20 #include "ivi-layout-export.h"
21 +#include "libweston-desktop/libweston-desktop.h"
23 struct ivi_layout_view {
24 struct wl_list link; /* ivi_layout::view_list */
25 @@ -52,6 +53,7 @@ struct ivi_layout_surface {
27 struct ivi_layout *layout;
28 struct weston_surface *surface;
29 + struct weston_desktop_surface *weston_desktop_surface;
31 struct ivi_layout_surface_properties prop;
33 diff --git a/ivi-shell/ivi-shell.c b/ivi-shell/ivi-shell.c
34 index f3156d35..84db2c97 100644
35 --- a/ivi-shell/ivi-shell.c
36 +++ b/ivi-shell/ivi-shell.c
39 #include "ivi-shell.h"
40 #include "ivi-application-server-protocol.h"
41 -#include "ivi-layout-export.h"
42 +#include "ivi-layout-private.h"
43 #include "ivi-layout-shell.h"
44 #include "shared/helpers.h"
45 #include "compositor/weston.h"
46 @@ -271,6 +271,8 @@ application_surface_create(struct wl_client *client,
50 + layout_surface->weston_desktop_surface = NULL;
52 ivisurf = zalloc(sizeof *ivisurf);
53 if (ivisurf == NULL) {
54 wl_resource_post_no_memory(resource);
55 diff --git a/ivi-shell/ivi-shell.h b/ivi-shell/ivi-shell.h
56 index e35f75f2..be430853 100644
57 --- a/ivi-shell/ivi-shell.h
58 +++ b/ivi-shell/ivi-shell.h
62 #include "compositor.h"
63 +#include "libweston-desktop/libweston-desktop.h"
67 @@ -37,6 +38,7 @@ struct ivi_shell
69 struct weston_compositor *compositor;
71 + struct weston_desktop *desktop;
72 struct wl_list ivi_surface_list; /* struct ivi_shell_surface::link */
74 struct text_backend *text_backend;