diff --git a/src/compositor/meta-surface-actor.c b/src/compositor/meta-surface-actor.c
index 40177ad17..536b83d58 100644
--- a/src/compositor/meta-surface-actor.c
+++ b/src/compositor/meta-surface-actor.c
@@ -20,9 +20,7 @@
 
 struct _MetaSurfaceActorPrivate
 {
-  MetaShapedTexture *texture;
-  MetaWaylandBuffer *buffer;
-  Pixmap pixmap;
+  MetaSurfaceContentWayland *main_content;
 };
 
 G_DEFINE_TYPE (MetaSurfaceActor, meta_surface_actor, CLUTTER_TYPE_ACTOR);
diff --git a/src/compositor/meta-surface-content-wayland.c b/src/compositor/meta-surface-content-wayland.c
new file mode 100644
index 000000000..50330b0cf
--- /dev/null
+++ b/src/compositor/meta-surface-content-wayland.c
@@ -0,0 +1,13 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+#include "config.h"
+
+struct _MetaSurfaceContentWayland {
+  MetaShapedTexture *texture;
+  MetaWaylandSurface *surface;
+};
+
+MetaSurfaceContentWayland *
+meta_surface_content_wayland_new (MetaWaylandSurface *surface)
+{
+}