diff --git a/src/Makefile.am b/src/Makefile.am
index 2221a5d7d..8df85fbd7 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -189,6 +189,7 @@ libmutter_wayland_la_SOURCES = \
ui/theme-private.h \
ui/ui.c \
wayland/meta-wayland.c \
+ wayland/meta-wayland.h \
wayland/meta-wayland-private.h \
wayland/meta-xwayland-private.h \
wayland/meta-xwayland.c \
diff --git a/src/compositor/meta-plugin.c b/src/compositor/meta-plugin.c
index 8cdc0ed63..444d81e85 100644
--- a/src/compositor/meta-plugin.c
+++ b/src/compositor/meta-plugin.c
@@ -30,6 +30,7 @@
#include "meta-plugin-manager.h"
#include
#include
+#include
#include
#include
diff --git a/src/compositor/meta-surface-actor-wayland.c b/src/compositor/meta-surface-actor-wayland.c
index c8381930c..56dd8bd13 100644
--- a/src/compositor/meta-surface-actor-wayland.c
+++ b/src/compositor/meta-surface-actor-wayland.c
@@ -28,6 +28,7 @@
#include
#include "meta-shaped-texture-private.h"
+#include "meta-wayland-private.h"
struct _MetaSurfaceActorWaylandPrivate
{
diff --git a/src/compositor/meta-surface-actor-wayland.h b/src/compositor/meta-surface-actor-wayland.h
index 89c6b300f..fbca3ff4d 100644
--- a/src/compositor/meta-surface-actor-wayland.h
+++ b/src/compositor/meta-surface-actor-wayland.h
@@ -29,7 +29,7 @@
#include "meta-surface-actor.h"
-#include "meta-wayland-private.h"
+#include "meta-wayland.h"
G_BEGIN_DECLS
diff --git a/src/compositor/meta-surface-actor.c b/src/compositor/meta-surface-actor.c
index 1d9a7ad35..7b4fc298d 100644
--- a/src/compositor/meta-surface-actor.c
+++ b/src/compositor/meta-surface-actor.c
@@ -15,7 +15,6 @@
#include
#include
-#include "meta-wayland-private.h"
#include "meta-cullable.h"
#include "meta-shaped-texture-private.h"
diff --git a/src/compositor/meta-window-actor-private.h b/src/compositor/meta-window-actor-private.h
index 021ddc607..2d2785055 100644
--- a/src/compositor/meta-window-actor-private.h
+++ b/src/compositor/meta-window-actor-private.h
@@ -5,9 +5,6 @@
#include
-#include
-#include
-
#include
#include
#include "meta-surface-actor.h"
diff --git a/src/compositor/meta-window-actor.c b/src/compositor/meta-window-actor.c
index 89c6b4e93..cf62d998f 100644
--- a/src/compositor/meta-window-actor.c
+++ b/src/compositor/meta-window-actor.c
@@ -28,9 +28,9 @@
#include "meta-window-actor-private.h"
#include "meta-texture-rectangle.h"
#include "region-utils.h"
-#include "meta-wayland-private.h"
#include "monitor-private.h"
#include "meta-cullable.h"
+#include "meta-wayland-private.h"
#include "meta-surface-actor.h"
#include "meta-surface-actor-x11.h"
diff --git a/src/core/keybindings.c b/src/core/keybindings.c
index 6004829c9..adfa2c677 100644
--- a/src/core/keybindings.c
+++ b/src/core/keybindings.c
@@ -41,7 +41,7 @@
#include "screen-private.h"
#include
#include "util-private.h"
-#include "meta-wayland-private.h"
+#include "meta-wayland.h"
#include
#include
diff --git a/src/core/main.c b/src/core/main.c
index 84da691d1..5a8f91b66 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -53,7 +53,7 @@
#include "session.h"
#include
#include
-#include "meta-wayland-private.h"
+#include "meta-wayland.h"
#include
#include
diff --git a/src/core/monitor.c b/src/core/monitor.c
index 9c22992ac..2b2c1f781 100644
--- a/src/core/monitor.c
+++ b/src/core/monitor.c
@@ -34,7 +34,6 @@
#include "util-private.h"
#include
#include "monitor-private.h"
-#include "meta-wayland-private.h"
#include "meta-dbus-xrandr.h"
diff --git a/src/core/screen.c b/src/core/screen.c
index d99814b2d..5bcc6bf5b 100644
--- a/src/core/screen.c
+++ b/src/core/screen.c
@@ -43,7 +43,7 @@
#include
#include "mutter-enum-types.h"
#include "core.h"
-#include "meta-wayland-private.h"
+#include "meta-wayland.h"
#include "meta-cursor-tracker-private.h"
#include
diff --git a/src/wayland/meta-wayland-keyboard.h b/src/wayland/meta-wayland-keyboard.h
index b51d3c02a..8d2cb0609 100644
--- a/src/wayland/meta-wayland-keyboard.h
+++ b/src/wayland/meta-wayland-keyboard.h
@@ -47,6 +47,7 @@
#include
#include
+#include
struct _MetaWaylandKeyboardGrabInterface
{
diff --git a/src/wayland/meta-wayland-private.h b/src/wayland/meta-wayland-private.h
index 69de1b8b8..a2a2b90a5 100644
--- a/src/wayland/meta-wayland-private.h
+++ b/src/wayland/meta-wayland-private.h
@@ -21,7 +21,6 @@
#define META_WAYLAND_PRIVATE_H
#include
-#include
#include
#include
@@ -31,7 +30,7 @@
#include "meta-weston-launch.h"
#include
-#include "meta-wayland-types.h"
+#include "meta-wayland.h"
#include "meta-wayland-versions.h"
#include "meta-wayland-surface.h"
#include "meta-wayland-seat.h"
@@ -91,30 +90,8 @@ struct _MetaWaylandCompositor
MetaWaylandSeat *seat;
};
-void meta_wayland_init (void);
-void meta_wayland_finalize (void);
-
-/* We maintain a singleton MetaWaylandCompositor which can be got at via this
- * API after meta_wayland_init() has been called. */
-MetaWaylandCompositor *meta_wayland_compositor_get_default (void);
-
-void meta_wayland_compositor_repick (MetaWaylandCompositor *compositor);
-
-void meta_wayland_compositor_set_input_focus (MetaWaylandCompositor *compositor,
- MetaWindow *window);
-gboolean meta_wayland_compositor_handle_event (MetaWaylandCompositor *compositor,
- const ClutterEvent *event);
-
MetaWaylandBuffer * meta_wayland_buffer_from_resource (struct wl_resource *resource);
void meta_wayland_buffer_ref (MetaWaylandBuffer *buffer);
void meta_wayland_buffer_unref (MetaWaylandBuffer *buffer);
-void meta_wayland_compositor_update (MetaWaylandCompositor *compositor,
- const ClutterEvent *event);
-void meta_wayland_compositor_paint_finished (MetaWaylandCompositor *compositor);
-
-gboolean meta_wayland_compositor_activate_vt (MetaWaylandCompositor *compositor,
- int vt,
- GError **error);
-
#endif /* META_WAYLAND_PRIVATE_H */
diff --git a/src/wayland/meta-wayland.h b/src/wayland/meta-wayland.h
new file mode 100644
index 000000000..481695a75
--- /dev/null
+++ b/src/wayland/meta-wayland.h
@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2014 Red Hat
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ *
+ * Written by:
+ * Jasper St. Pierre
+ */
+
+#ifndef META_WAYLAND_H
+#define META_WAYLAND_H
+
+#include "meta-wayland-types.h"
+
+void meta_wayland_init (void);
+void meta_wayland_finalize (void);
+
+/* We maintain a singleton MetaWaylandCompositor which can be got at via this
+ * API after meta_wayland_init() has been called. */
+MetaWaylandCompositor *meta_wayland_compositor_get_default (void);
+
+void meta_wayland_compositor_repick (MetaWaylandCompositor *compositor);
+
+void meta_wayland_compositor_set_input_focus (MetaWaylandCompositor *compositor,
+ MetaWindow *window);
+gboolean meta_wayland_compositor_handle_event (MetaWaylandCompositor *compositor,
+ const ClutterEvent *event);
+
+void meta_wayland_compositor_update (MetaWaylandCompositor *compositor,
+ const ClutterEvent *event);
+void meta_wayland_compositor_paint_finished (MetaWaylandCompositor *compositor);
+
+gboolean meta_wayland_compositor_activate_vt (MetaWaylandCompositor *compositor,
+ int vt,
+ GError **error);
+
+#endif
+