wip! native: release dumb fb after flip for EGLStreams

fixme probably need to recreate the dumb fb any time doing an explicit modeset
wip! renderer/native: start to add stream copy mode
2018-11-30 14:34:10 -05:00 · 2018-11-30 14:34:10 -05:00 · 2018-11-30 14:34:10 -05:00 · 2018-11-30 14:34:10 -05:00 · 2018-11-30 14:34:10 -05:00 · 2018-11-30 14:34:10 -05:00
948 changed files with 16238 additions and 18307 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -94,6 +94,8 @@ src/xwayland-keyboard-grab-unstable-v1-protocol.c
 src/xwayland-keyboard-grab-unstable-v1-server-protocol.h
 src/tablet-unstable-v*-protocol.c
 src/tablet-unstable-v*-server-protocol.h
 src/text-input-unstable-v*-protocol.c
 src/text-input-unstable-v*-server-protocol.h
 src/keyboard-shortcuts-inhibit-unstable-v*-protocol.c
 src/keyboard-shortcuts-inhibit-unstable-v*-server-protocol.h
 src/linux-dmabuf-unstable-v*-protocol.c
@@ -129,3 +131,4 @@ ltversion.m4
 lt~obsolete.m4
 .dirstamp
 **/tags.*
 build/
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -0,0 +1,20 @@
 image: registry.gitlab.gnome.org/gnome/mutter/master:v1
 stages:
 - build
 - test
 build-mutter:
  stage: build
  script:
    - meson . build -Degl_device=true -Dwayland_eglstream=true
    - ninja -C build
    - ninja -C build install
 test-mutter:
  stage: test
  script:
    - meson . build -Degl_device=true -Dwayland_eglstream=true
    - ninja -C build
    - glib-compile-schemas $PWD/build/data
    - env XDG_RUNTIME_DIR=/tmp/ GSETTINGS_SCHEMA_DIR=$PWD/build/data dbus-run-session -- xvfb-run -s '+iglx -noreset' meson test -C build -t 10 --verbose --no-stdsplit --wrap catchsegv
--- a/.gitlab-ci/Dockerfile
+++ b/.gitlab-ci/Dockerfile
@@ -0,0 +1,14 @@
 FROM fedora:29
 RUN dnf -y update && dnf -y upgrade && \
    dnf install -y 'dnf-command(builddep)' && \
    dnf builddep -y mutter && \
    # Until Fedora catches up with meson build-deps
    dnf install -y meson xorg-x11-server-Xorg gnome-settings-daemon-devel egl-wayland-devel xorg-x11-server-Xwayland && \
    # For running unit tests
    dnf install -y xorg-x11-server-Xvfb mesa-dri-drivers dbus dbus-x11 && \
    dnf install -y intltool redhat-rpm-config make && \
    dnf clean all
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,5 @@
 pkgdatadir = $(datadir)/mutter-$(LIBMUTTER_API_VERSION)
 pkglibdir = $(libdir)/mutter-$(LIBMUTTER_API_VERSION)
 SUBDIRS = cogl clutter data src po doc
--- a/91
+++ b/91
@@ -1,3 +1,94 @@
 3.31.2
 ======
 * Fix handling of non-UTF8 encodings [Florian; !227]
 * Fix memory leaks introduced in 3.30.1 [Jonas; #653]
 * Fix regression when overriding workspace layout [Ron; #270]
 * Fix crash when restarting window manager [Andrea; gnome-shell#595]
 * Add meson build support [Jonas; !167]
 * Freeze clock when headless [Jonas; !170]
 * Fix crash on monitor hotplug [Olivier; #189]
 * Misc. bug fixes [Jonas; #353, !132, #382]
 Contributors:
  Jonas Ådahl, Andrea Azzarone, Olivier Fourdan, Niels De Graef,
  Alexander Mikhaylenko, Florian Müllner, Akira Nakajima,
  Georges Basile Stavracas Neto, Pekka Paalanen, Peter Uithoven,
  Daniel van Vugt, Ron Yorston
 3.30.1
 ======
 * Improve trackball detection [Tony; #258]
 * Fix clipping of scaled surfaces [Jonas; #300]
 * Improve tracking of monitor switch configuration [Daniel; !213]
 * Fix parent-relative positioning of constrained windows [Jonas; #332]
 * Add clutter_input_method_forward_key() method [Carlos; gnome-shell#531]
 * Various crash fixes [Olivier, Jonas; #194, #336]
 * Misc. bug fixes [Carlos, Florian, Olivier, Jonas; gnome-shell#540, #294,
  #221, !229, #30, #331]
 Contributors:
  Jonas Ådahl, Daniel Drake, Olivier Fourdan, Carlos Garnacho, Peter Hutterer,
  Ting-Wei Lan, Florian Müllner, Tony Novak, Pekka Paalanen, Sam Spilsbury
 Translators:
  Yuras Shumovich [be], Марко Костић [sr], Marek Cernocky [cs]
 3.30.0
 ======
 Translators:
  Fran Dieguez [gl], Balázs Meskó [hu], Rūdolfs Mazurs [lv],
  Trần Ngọc Quân [vi], Ask Hjorth Larsen [da], gogo [hr]
 3.29.92
 =======
 * Avoid crash when a cursor is not found [Sebastian; #254]
 * Fix screen rotation regression [Jonas; #216]
 * Handle requests to unmanaged windows gracefully [Jonas; #240]
 * Move popups together with their parent [Jonas; #274]
 * Fix non-lowercase letters on virtual key devices [Carlos; gnome-shell#135]
 * Misc. bug fixes [Iain, Jonas; #223, #192, #279]
 Contributors:
  Jonas Ådahl, Carlos Garnacho, Sebastian Keller, Iain Lane, Robert Mader,
  Daniel van Vugt
 Translators:
  Gwan-gyeong Mun [ko], Kukuh Syafaat [id], Milo Casagrande [it],
  Anders Jonsson [sv], Rafael Fontenelle [pt_BR], Marek Cernocky [cs]
 3.29.91
 =======
 * Various crash fixes [Olivier, Iain; #255, #223]
 * Fix lock up with some DRI drivers [Alex; #127]
 * Send correct button codes from virtual evdev devices [Jonas; !190]
 * Improve grab-device clock updates on X11 [Jeff; !174]
 * Fix popups closing immediately on key down [Jonas; !180]
 * Prevent clients from modifying the shared keymap [Jonas; #784206]
 Contributors:
  Jonas Ådahl, Andrea Azzarone, Piotr Drąg, Olivier Fourdan, Carlos Garnacho,
  Jan Grulich, Iain Lane, Alex Villacís Lasso, Jeff Smith, Daniel van Vugt
 Translators:
  Matej Urbančič [sl], Mario Blättermann [de], Piotr Drąg [pl],
  Aurimas Černius [lt], Yi-Jyun Pan [zh_TW], Emin Tufan Çetin [tr],
  Fabio Tomat [fur], Bruce Cowan [en_GB]
 3.29.90
 =======
 * Various crash fixes [Olivier, Jonas, Florian; #189, #70, #194, #15, #130]
 * Don't expose resolutions that are below the minimum [Andrea; #793223]
 * Remove support for preference overrides [Florian; #786496]
 * Misc. bug fixes and cleanups [Daniel, Jonas, Florian; #131, #245, !176]
 Contributors:
  Jonas Ådahl, Andrea Azzarone, Olivier Fourdan, Florian Müllner, Kevin Tamool,
  Daniel van Vugt
 Translators:
  Daniel Mustieles [es], Claude Paroz [fr]
 3.29.4
 ======
 * Fix crash with parent-less modal dialogs [Olivier; #174]
--- a/README.md
+++ b/README.md
@@ -0,0 +1,31 @@
 # Mutter
 Mutter is a Wayland display server and X11 window manager and compositor library.
 When used as a Wayland display server, it runs on top of KMS and libinput. It
 implements the compositor side of the Wayland core protocol as well as various
 protocol extensions. It also has functionality related to running X11
 applications using Xwayland.
 When used on top of Xorg it acts as a X11 window manager and compositing manager.
 It contains functionality related to, among other things, window management,
 window compositing, focus tracking, workspace management, keybindings and
 monitor configuration.
 Internally it uses a fork of Cogl, a hardware acceleration abstraction library
 used to simplify usage of OpenGL pipelines, as well as a fork af Clutter, a
 scene graph and user interface toolkit.
 Mutter is used by, for example, GNOME Shell, the GNOME core user interface, and
 by  Gala, elementary OS's window manager. It can also be run standalone, using
 the  command "mutter", but just running plain mutter is only intended for
 debugging purposes.
 ## License
 Mutter is distributed under the terms of the GNU General Public License,
 version 2 or later. See the [COPYING][license] file for detalis.
 [bug-tracker]: https://gitlab.gnome.org/GNOME/mutter/issues
 [license]: COPYING
--- a/clutter/.gitignore
+++ b/clutter/.gitignore
@@ -23,7 +23,6 @@ clutter-build-config.h.in
 clutter-config.h
 clutter-enum-types.[ch]
 clutter-marshal.[ch]
 clutter-version.h
 gcov-report.txt
 clutter-json.h
 clutter-lcov.info
--- a/clutter/Makefile.am
+++ b/clutter/Makefile.am
@@ -2,11 +2,7 @@ NULL =
 SUBDIRS = build clutter tests
-if BUILD_EXAMPLES
+DIST_SUBDIRS = clutter tests build
 SUBDIRS += examples
 endif
 DIST_SUBDIRS = clutter tests examples build
 # XXX - this is a massive hack to make autoreconf honour the ACLOCAL_FLAGS
 # that jhbuild sets while still retaining build/autotools as the authoritative
--- a/clutter/clutter/Makefile.am
+++ b/clutter/clutter/Makefile.am
@@ -10,17 +10,13 @@ EXTRA_DIST =
 BUILT_SOURCES =
 AM_CPPFLAGS = \
 	-DCLUTTER_PREFIX=\""$(prefix)"\"	\
 	-DCLUTTER_LIBDIR=\""$(libdir)"\"	\
 	-DCLUTTER_DATADIR=\""$(datadir)"\"	\
 	-DCLUTTER_LOCALEDIR=\""$(localedir)"\"	\
 	-DCLUTTER_SYSCONFDIR=\""$(sysconfdir)"\" \
 	-DCLUTTER_COMPILATION=1			\
 	-DCOGL_DISABLE_DEPRECATION_WARNINGS	\
 	-DG_LOG_DOMAIN=\"Clutter\" 		\
 	-fvisibility=hidden			\
 	-I$(top_srcdir) 			\
 	-I$(top_srcdir)/clutter			\
 	-I$(top_srcdir)/clutter/cally		\
 	-I$(top_builddir)			\
 	-I$(top_builddir)/clutter		\
 	-I$(top_srcdir)/../cogl			\
@@ -28,7 +24,6 @@ AM_CPPFLAGS = \
 	-I$(top_builddir)/../cogl/cogl		\
 	$(CLUTTER_DEPRECATED_CFLAGS)		\
 	$(CLUTTER_DEBUG_CFLAGS)			\
 	$(CLUTTER_HIDDEN_VISIBILITY_CFLAGS)	\
 	$(NULL)
 AM_CFLAGS = $(CLUTTER_CFLAGS) $(MAINTAINER_CFLAGS)
@@ -37,7 +32,7 @@ AM_CFLAGS = $(CLUTTER_CFLAGS) $(MAINTAINER_CFLAGS)
 INTROSPECTION_GIRS =
 # the base include path for headers
-clutter_base_includedir = $(includedir)/mutter/clutter-$(LIBMUTTER_API_VERSION)
+clutter_base_includedir = $(includedir)/mutter-$(LIBMUTTER_API_VERSION)/clutter
 clutter_includedir = $(clutter_base_includedir)/clutter
 clutter_deprecateddir = $(clutter_base_includedir)/clutter/deprecated
@@ -355,10 +350,6 @@ built_source_h = \
 DISTCLEANFILES += clutter-config.h
 EXTRA_DIST += clutter-config.h.in
 # version header
 DISTCLEANFILES += clutter-version.h
 EXTRA_DIST += clutter-version.h.in clutter-version.h
 # key symbol update script
 EXTRA_DIST += clutter-keysyms-update.pl
@@ -498,9 +489,6 @@ backend_source_c_priv += $(evdev_c_priv)
 backend_source_h_priv += $(evdev_h_priv)
 backend_source_h += $(evdev_h)
 clutterevdev_includedir = $(clutter_includedir)/evdev
 clutterevdev_include_HEADERS = $(evdev_h)
 backend_source_c += evdev/clutter-xkb-utils.c
 backend_source_h_priv += evdev/clutter-xkb-utils.h
@@ -520,15 +508,10 @@ backend_source_h += $(wayland_compositor_source_h)
 backend_source_c += \
 	wayland/clutter-wayland-surface.c
 wayland_compositor_includedir = $(clutter_includedir)/wayland
 wayland_compositor_include_HEADERS = $(wayland_compositor_source_h)
 backend_source_h += $(egl_source_h)
 backend_source_c += $(egl_source_c)
 backend_source_h_priv += $(egl_source_h_priv)
 clutteregl_includedir = $(clutter_includedir)/egl
 clutteregl_include_HEADERS = $(egl_source_h)
 endif # SUPPORT_WAYLAND
 # cally
@@ -585,12 +568,12 @@ pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = $(pc_files)
 DISTCLEANFILES += $(pc_files)
-clutter_include_HEADERS = $(source_h) clutter.h clutter-version.h clutter-autocleanups.h clutter-mutter.h
+clutter_include_HEADERS = $(source_h) clutter.h clutter-autocleanups.h clutter-mutter.h
 nodist_clutter_include_HEADERS = clutter-config.h $(built_source_h)
 clutter_deprecated_HEADERS = $(deprecated_h)
-mutterlibdir = $(libdir)/mutter
+mutterlibdir = $(libdir)/mutter-@LIBMUTTER_API_VERSION@
 mutterlib_LTLIBRARIES = libmutter-clutter-@LIBMUTTER_API_VERSION@.la
 libmutter_clutter_@LIBMUTTER_API_VERSION@_la_LIBADD = \
--- a/clutter/clutter/cally/cally-actor.c
+++ b/clutter/clutter/cally/cally-actor.c
@@ -67,9 +67,7 @@
 *
 */
 #ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
 #endif
 #include <glib.h>
 #include <clutter/clutter.h>
--- a/clutter/clutter/cally/cally-actor.h
+++ b/clutter/clutter/cally/cally-actor.h
@@ -126,19 +126,19 @@ struct _CallyActorClass
  gpointer _padding_dummy[32];
 };
-CLUTTER_AVAILABLE_IN_1_4
+CLUTTER_EXPORT
 GType      cally_actor_get_type              (void) G_GNUC_CONST;
-CLUTTER_AVAILABLE_IN_1_4
+CLUTTER_EXPORT
 AtkObject* cally_actor_new                   (ClutterActor        *actor);
-CLUTTER_AVAILABLE_IN_1_4
+CLUTTER_EXPORT
 guint      cally_actor_add_action            (CallyActor          *cally_actor,
                                              const gchar         *action_name,
                                              const gchar         *action_description,
                                              const gchar         *action_keybinding,
                                              CallyActionFunc      action_func);
-CLUTTER_AVAILABLE_IN_1_6
+CLUTTER_EXPORT
 guint      cally_actor_add_action_full       (CallyActor          *cally_actor,
                                              const gchar         *action_name,
                                              const gchar         *action_description,
@@ -147,11 +147,11 @@ guint      cally_actor_add_action_full       (CallyActor          *cally_actor,
                                              gpointer             user_data,
                                              GDestroyNotify       notify);
-CLUTTER_AVAILABLE_IN_1_4
+CLUTTER_EXPORT
 gboolean   cally_actor_remove_action         (CallyActor          *cally_actor,
                                              gint                 action_id);
-CLUTTER_AVAILABLE_IN_1_4
+CLUTTER_EXPORT
 gboolean   cally_actor_remove_action_by_name (CallyActor          *cally_actor,
                                              const gchar         *action_name);
--- a/clutter/clutter/cally/cally-clone.h
+++ b/clutter/clutter/cally/cally-clone.h
@@ -74,9 +74,9 @@ struct _CallyCloneClass
  gpointer _padding_dummy[8];
 };
-CLUTTER_AVAILABLE_IN_1_4
+CLUTTER_EXPORT
 GType      cally_clone_get_type (void) G_GNUC_CONST;
-CLUTTER_AVAILABLE_IN_1_4
+CLUTTER_EXPORT
 AtkObject *cally_clone_new      (ClutterActor *actor);
 G_END_DECLS
--- a/clutter/clutter/cally/cally-group.h
+++ b/clutter/clutter/cally/cally-group.h
@@ -77,9 +77,9 @@ struct _CallyGroupClass
  gpointer _padding_dummy[8];
 };
-CLUTTER_AVAILABLE_IN_1_4
+CLUTTER_EXPORT
 GType      cally_group_get_type (void) G_GNUC_CONST;
-CLUTTER_AVAILABLE_IN_1_4
+CLUTTER_EXPORT
 AtkObject* cally_group_new      (ClutterActor *actor);
 G_END_DECLS
--- a/clutter/clutter/cally/cally-main.h
+++ b/clutter/clutter/cally/cally-main.h
@@ -34,9 +34,9 @@
 G_BEGIN_DECLS
-CLUTTER_AVAILABLE_IN_1_4
+CLUTTER_EXPORT
 gboolean cally_get_cally_initialized (void);
-CLUTTER_AVAILABLE_IN_1_4
+CLUTTER_EXPORT
 gboolean cally_accessibility_init    (void);
 G_END_DECLS
--- a/clutter/clutter/cally/cally-rectangle.h
+++ b/clutter/clutter/cally/cally-rectangle.h
@@ -74,9 +74,9 @@ struct _CallyRectangleClass
  gpointer _padding_dummy[8];
 };
-CLUTTER_AVAILABLE_IN_1_4
+CLUTTER_EXPORT
 GType      cally_rectangle_get_type (void) G_GNUC_CONST;
-CLUTTER_AVAILABLE_IN_1_4
+CLUTTER_EXPORT
 AtkObject* cally_rectangle_new      (ClutterActor *actor);
 G_END_DECLS
--- a/clutter/clutter/cally/cally-root.h
+++ b/clutter/clutter/cally/cally-root.h
@@ -74,9 +74,9 @@ struct _CallyRootClass
  gpointer _padding_dummy[16];
 };
-CLUTTER_AVAILABLE_IN_1_4
+CLUTTER_EXPORT
 GType      cally_root_get_type (void) G_GNUC_CONST;
-CLUTTER_AVAILABLE_IN_1_4
+CLUTTER_EXPORT
 AtkObject *cally_root_new      (void);
 G_END_DECLS
--- a/clutter/clutter/cally/cally-stage.h
+++ b/clutter/clutter/cally/cally-stage.h
@@ -74,9 +74,9 @@ struct _CallyStageClass
  gpointer _padding_dummy[16];
 };
-CLUTTER_AVAILABLE_IN_1_4
+CLUTTER_EXPORT
 GType      cally_stage_get_type (void) G_GNUC_CONST;
-CLUTTER_AVAILABLE_IN_1_4
+CLUTTER_EXPORT
 AtkObject *cally_stage_new      (ClutterActor *actor);
 G_END_DECLS
--- a/clutter/clutter/cally/cally-text.c
+++ b/clutter/clutter/cally/cally-text.c
@@ -39,9 +39,7 @@
 *
 */
 #ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
 #endif
 #include "cally-text.h"
 #include "cally-actor-private.h"
--- a/clutter/clutter/cally/cally-text.h
+++ b/clutter/clutter/cally/cally-text.h
@@ -74,9 +74,9 @@ struct _CallyTextClass
  gpointer _padding_dummy[8];
 };
-CLUTTER_AVAILABLE_IN_1_4
+CLUTTER_EXPORT
 GType      cally_text_get_type (void) G_GNUC_CONST;
-CLUTTER_AVAILABLE_IN_1_4
+CLUTTER_EXPORT
 AtkObject* cally_text_new      (ClutterActor *actor);
 G_END_DECLS
--- a/clutter/clutter/cally/cally-texture.h
+++ b/clutter/clutter/cally/cally-texture.h
@@ -74,9 +74,9 @@ struct _CallyTextureClass
  gpointer _padding_dummy[8];
 };
-CLUTTER_AVAILABLE_IN_1_4
+CLUTTER_EXPORT
 GType      cally_texture_get_type (void) G_GNUC_CONST;
-CLUTTER_AVAILABLE_IN_1_4
+CLUTTER_EXPORT
 AtkObject *cally_texture_new      (ClutterActor *actor);
 G_END_DECLS
--- a/clutter/clutter/cally/cally-util.c
+++ b/clutter/clutter/cally/cally-util.c
@@ -38,9 +38,7 @@
 * available any accessible object.
 */
 #ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
 #endif
 #include <stdlib.h>
 #include <string.h>
@@ -144,7 +142,7 @@ cally_util_get_toolkit_name (void)
 static const gchar *
 cally_util_get_toolkit_version (void)
 {
-  return CLUTTER_VERSION_S;
+  return MUTTER_VERSION;
 }
 static guint
--- a/clutter/clutter/cally/cally-util.h
+++ b/clutter/clutter/cally/cally-util.h
@@ -74,7 +74,7 @@ struct _CallyUtilClass
  gpointer _padding_dummy[8];
 };
-CLUTTER_AVAILABLE_IN_1_4
+CLUTTER_EXPORT
 GType cally_util_get_type (void) G_GNUC_CONST;
 void _cally_util_override_atk_util (void);
--- a/clutter/clutter/cally/cally.c
+++ b/clutter/clutter/cally/cally.c
@@ -29,9 +29,7 @@
 *
 */
 #ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
 #endif
 #define CLUTTER_DISABLE_DEPRECATION_WARNINGS
--- a/clutter/clutter/clutter-action.c
+++ b/clutter/clutter/clutter-action.c
@@ -41,9 +41,7 @@
 * #ClutterAction is available since Clutter 1.4
 */
 #ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
 #endif
 #include "clutter-action.h"
--- a/clutter/clutter/clutter-action.h
+++ b/clutter/clutter/clutter-action.h
@@ -78,32 +78,32 @@ struct _ClutterActionClass
  void (* _clutter_action8) (void);
 };
-CLUTTER_AVAILABLE_IN_1_4
+CLUTTER_EXPORT
 GType clutter_action_get_type (void) G_GNUC_CONST;
 /* ClutterActor API */
-CLUTTER_AVAILABLE_IN_1_4
+CLUTTER_EXPORT
 void           clutter_actor_add_action            (ClutterActor  *self,
                                                    ClutterAction *action);
-CLUTTER_AVAILABLE_IN_1_4
+CLUTTER_EXPORT
 void           clutter_actor_add_action_with_name  (ClutterActor  *self,
                                                    const gchar   *name,
                                                    ClutterAction *action);
-CLUTTER_AVAILABLE_IN_1_4
+CLUTTER_EXPORT
 void           clutter_actor_remove_action         (ClutterActor  *self,
                                                    ClutterAction *action);
-CLUTTER_AVAILABLE_IN_1_4
+CLUTTER_EXPORT
 void           clutter_actor_remove_action_by_name (ClutterActor  *self,
                                                    const gchar   *name);
-CLUTTER_AVAILABLE_IN_1_4
+CLUTTER_EXPORT
 ClutterAction *clutter_actor_get_action            (ClutterActor  *self,
                                                    const gchar   *name);
-CLUTTER_AVAILABLE_IN_1_4
+CLUTTER_EXPORT
 GList *        clutter_actor_get_actions           (ClutterActor  *self);
-CLUTTER_AVAILABLE_IN_1_4
+CLUTTER_EXPORT
 void           clutter_actor_clear_actions         (ClutterActor  *self);
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 gboolean       clutter_actor_has_actions           (ClutterActor  *self);
 G_END_DECLS
--- a/clutter/clutter/clutter-actor-box.c
+++ b/clutter/clutter/clutter-actor-box.c
@@ -1,6 +1,4 @@
 #ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
 #endif
 #include <math.h>
--- a/clutter/clutter/clutter-actor-meta.c
+++ b/clutter/clutter/clutter-actor-meta.c
@@ -41,9 +41,7 @@
 * #ClutterActorMeta is available since Clutter 1.4
 */
 #ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
 #endif
 #include "clutter-actor-meta-private.h"
--- a/clutter/clutter/clutter-actor-meta.h
+++ b/clutter/clutter/clutter-actor-meta.h
@@ -97,21 +97,21 @@ struct _ClutterActorMetaClass
  void (* _clutter_meta7) (void);
 };
-CLUTTER_AVAILABLE_IN_1_4
+CLUTTER_EXPORT
 GType clutter_actor_meta_get_type (void) G_GNUC_CONST;
-CLUTTER_AVAILABLE_IN_1_4
+CLUTTER_EXPORT
 void            clutter_actor_meta_set_name     (ClutterActorMeta *meta,
                                                 const gchar      *name);
-CLUTTER_AVAILABLE_IN_1_4
+CLUTTER_EXPORT
 const gchar *   clutter_actor_meta_get_name     (ClutterActorMeta *meta);
-CLUTTER_AVAILABLE_IN_1_4
+CLUTTER_EXPORT
 void            clutter_actor_meta_set_enabled  (ClutterActorMeta *meta,
                                                 gboolean          is_enabled);
-CLUTTER_AVAILABLE_IN_1_4
+CLUTTER_EXPORT
 gboolean        clutter_actor_meta_get_enabled  (ClutterActorMeta *meta);
-CLUTTER_AVAILABLE_IN_1_4
+CLUTTER_EXPORT
 ClutterActor *  clutter_actor_meta_get_actor    (ClutterActorMeta *meta);
 G_END_DECLS
--- a/clutter/clutter/clutter-actor.c
+++ b/clutter/clutter/clutter-actor.c
@@ -841,6 +841,7 @@ struct _ClutterActorPrivate
  guint needs_x_expand              : 1;
  guint needs_y_expand              : 1;
  guint needs_paint_volume_update   : 1;
  guint had_effects_on_last_paint_volume_update : 1;
 };
 enum
@@ -1093,6 +1094,11 @@ static void clutter_actor_set_child_transform_internal (ClutterActor        *sel
 static void     clutter_actor_realize_internal          (ClutterActor *self);
 static void     clutter_actor_unrealize_internal        (ClutterActor *self);
 static void clutter_actor_push_in_cloned_branch (ClutterActor *self,
                                                 gulong        count);
 static void clutter_actor_pop_in_cloned_branch (ClutterActor *self,
                                                gulong        count);
 /* Helper macro which translates by the anchor coord, applies the
   given transformation and then translates back */
 #define TRANSFORM_ABOUT_ANCHOR_COORD(a,m,c,_transform)  G_STMT_START { \
@@ -2221,25 +2227,46 @@ static void
 clutter_actor_real_pick (ClutterActor       *self,
 			 const ClutterColor *color)
 {
  CoglFramebuffer *framebuffer = cogl_get_draw_framebuffer ();
  /* the default implementation is just to paint a rectangle
   * with the same size of the actor using the passed color
   */
  if (clutter_actor_should_pick_paint (self))
    {
      static CoglPipeline *default_pick_pipeline = NULL;
      ClutterActorBox box = { 0, };
      CoglPipeline *pick_pipeline;
      float width, height;
      if (G_UNLIKELY (default_pick_pipeline == NULL))
        {
          CoglContext *ctx =
            clutter_backend_get_cogl_context (clutter_get_default_backend ());
          default_pick_pipeline = cogl_pipeline_new (ctx);
        }
      g_assert (default_pick_pipeline != NULL);
      pick_pipeline = cogl_pipeline_copy (default_pick_pipeline);
      clutter_actor_get_allocation_box (self, &box);
      width = box.x2 - box.x1;
      height = box.y2 - box.y1;
-      cogl_set_source_color4ub (color->red,
+      cogl_pipeline_set_color4ub (pick_pipeline,
-                                color->green,
+                                  color->red,
-                                color->blue,
+                                  color->green,
-                                color->alpha);
+                                  color->blue,
                                  color->alpha);
-      cogl_rectangle (0, 0, width, height);
+      cogl_framebuffer_draw_rectangle (framebuffer,
                                       pick_pipeline,
                                       0, 0,
                                       width, height);
      cogl_object_unref (pick_pipeline);
    }
  /* XXX - this thoroughly sucks, but we need to maintain compatibility
@@ -4289,6 +4316,9 @@ clutter_actor_remove_child_internal (ClutterActor                 *self,
  self->priv->age += 1;
  if (self->priv->in_cloned_branch)
    clutter_actor_pop_in_cloned_branch (child, self->priv->in_cloned_branch);
  /* if the child that got removed was visible and set to
   * expand then we want to reset the parent's state in
   * case the child was the only thing that was making it
@@ -9015,7 +9045,7 @@ _clutter_actor_queue_only_relayout (ClutterActor *self)
      priv->needs_allocation)
    return; /* save some cpu cycles */
-#if CLUTTER_ENABLE_DEBUG
+#ifdef CLUTTER_ENABLE_DEBUG
  if (!CLUTTER_ACTOR_IS_TOPLEVEL (self) && CLUTTER_ACTOR_IN_RELAYOUT (self))
    {
      g_warning ("The actor '%s' is currently inside an allocation "
@@ -12910,6 +12940,9 @@ clutter_actor_add_child_internal (ClutterActor              *self,
  self->priv->age += 1;
  if (self->priv->in_cloned_branch)
    clutter_actor_push_in_cloned_branch (child, self->priv->in_cloned_branch);
  /* if push_internal() has been called then we automatically set
   * the flag on the actor
   */
@@ -15178,9 +15211,8 @@ clutter_actor_transform_stage_point (ClutterActor *self,
   *   http://www.cs.cmu.edu/~ph/src/texfund/
   *
   * Our texture is a rectangle with origin [0, 0], so we are mapping from
-   * quad to rectangle only, which significantly simplifies things; the
+   * quad to rectangle only, which significantly simplifies things.
-   * function calls have been unrolled, and most of the math is done in fixed
+   * Function calls have been unrolled.
   * point.
   */
  clutter_actor_get_abs_allocation_vertices (self, v);
@@ -17474,7 +17506,7 @@ _clutter_actor_get_paint_volume_real (ClutterActor *self,
           */
          effects = _clutter_meta_group_peek_metas (priv->effects);
          for (l = effects;
-               l != NULL || (l != NULL && l->data != priv->current_effect);
+               l != NULL && l->data != priv->current_effect;
               l = l->next)
            {
              if (!_clutter_effect_get_paint_volume (l->data, pv))
@@ -17510,6 +17542,32 @@ _clutter_actor_get_paint_volume_real (ClutterActor *self,
  return TRUE;
 }
 static gboolean
 _clutter_actor_has_active_paint_volume_override_effects (ClutterActor *self)
 {
  const GList *l;
  if (self->priv->effects == NULL)
    return FALSE;
  /* We just need to all effects current effect to see
   * if anyone wants to override the paint volume. If so, then
   * we need to recompute, since the paint volume returned can
   * change from call to call. */
  for (l = _clutter_meta_group_peek_metas (self->priv->effects);
       l != NULL;
       l = l->next)
    {
      ClutterEffect *effect = l->data;
      if (clutter_actor_meta_get_enabled (CLUTTER_ACTOR_META (effect)) &&
          _clutter_effect_has_custom_paint_volume (effect))
        return TRUE;
    }
  return FALSE;
 }
 /* The public clutter_actor_get_paint_volume API returns a const
 * pointer since we return a pointer directly to the cached
 * PaintVolume associated with the actor and don't want the user to
@@ -17520,17 +17578,33 @@ _clutter_actor_get_paint_volume_real (ClutterActor *self,
 static ClutterPaintVolume *
 _clutter_actor_get_paint_volume_mutable (ClutterActor *self)
 {
  gboolean has_paint_volume_override_effects;
  ClutterActorPrivate *priv;
  priv = self->priv;
  has_paint_volume_override_effects = _clutter_actor_has_active_paint_volume_override_effects (self);
  if (priv->paint_volume_valid)
    {
-      if (!priv->needs_paint_volume_update)
+      /* If effects are applied, the actor paint volume
       * needs to be recomputed on each paint, since those
       * paint volumes could change over the duration of the
       * effect.
       *
       * We also need to update the paint volume if we went
       * from having effects to not having effects on the last
       * paint volume update. */
      if (!priv->needs_paint_volume_update &&
          priv->current_effect == NULL &&
          !has_paint_volume_override_effects &&
          !priv->had_effects_on_last_paint_volume_update)
        return &priv->paint_volume;
      clutter_paint_volume_free (&priv->paint_volume);
    }
  priv->had_effects_on_last_paint_volume_update = has_paint_volume_override_effects;
  if (_clutter_actor_get_paint_volume_real (self, &priv->paint_volume))
    {
      priv->paint_volume_valid = TRUE;
@@ -20704,29 +20778,31 @@ clutter_actor_get_child_transform (ClutterActor  *self,
 }
 static void
-clutter_actor_push_in_cloned_branch (ClutterActor *self)
+clutter_actor_push_in_cloned_branch (ClutterActor *self,
                                     gulong        count)
 {
  ClutterActor *iter;
  for (iter = self->priv->first_child;
       iter != NULL;
       iter = iter->priv->next_sibling)
-    clutter_actor_push_in_cloned_branch (iter);
+    clutter_actor_push_in_cloned_branch (iter, count);
-  self->priv->in_cloned_branch += 1;
+  self->priv->in_cloned_branch += count;
 }
 static void
-clutter_actor_pop_in_cloned_branch (ClutterActor *self)
+clutter_actor_pop_in_cloned_branch (ClutterActor *self,
                                    gulong        count)
 {
  ClutterActor *iter;
-  self->priv->in_cloned_branch -= 1;
+  self->priv->in_cloned_branch -= count;
  for (iter = self->priv->first_child;
       iter != NULL;
       iter = iter->priv->next_sibling)
-    clutter_actor_pop_in_cloned_branch (iter);
+    clutter_actor_pop_in_cloned_branch (iter, count);
 }
 void
@@ -20742,7 +20818,7 @@ _clutter_actor_attach_clone (ClutterActor *actor,
  g_hash_table_add (priv->clones, clone);
-  clutter_actor_push_in_cloned_branch (actor);
+  clutter_actor_push_in_cloned_branch (actor, 1);
 }
 void
@@ -20757,7 +20833,7 @@ _clutter_actor_detach_clone (ClutterActor *actor,
      g_hash_table_lookup (priv->clones, clone) == NULL)
    return;
-  clutter_actor_pop_in_cloned_branch (actor);
+  clutter_actor_pop_in_cloned_branch (actor, 1);
  g_hash_table_remove (priv->clones, clone);
@@ -21100,6 +21176,7 @@ clutter_actor_bind_model_with_properties (ClutterActor *self,
      model_property = va_arg (args, char *);
    }
  va_end (args);
  clutter_actor_bind_model (self, model, bind_child_with_properties, clos, bind_closure_free);
 }
--- a/clutter/clutter/clutter-actor.h
+++ b/clutter/clutter/clutter-actor.h
@@ -61,7 +61,7 @@ G_BEGIN_DECLS
 *   internal state.
 */
 #define CLUTTER_ACTOR_SET_FLAGS(a,f) \
-  CLUTTER_MACRO_DEPRECATED_IN_1_24 \
+  CLUTTER_MACRO_DEPRECATED \
  (((ClutterActor*)(a))->flags |= (f))
 /**
@@ -76,23 +76,23 @@ G_BEGIN_DECLS
 *   internal state.
 */
 #define CLUTTER_ACTOR_UNSET_FLAGS(a,f) \
-  CLUTTER_MACRO_DEPRECATED_IN_1_24 \
+  CLUTTER_MACRO_DEPRECATED \
  (((ClutterActor*)(a))->flags &= ~(f))
 #define CLUTTER_ACTOR_IS_MAPPED(a) \
-  CLUTTER_MACRO_DEPRECATED_IN_1_24_FOR ("Deprecated macro. Use clutter_actor_is_mapped instead") \
+  CLUTTER_MACRO_DEPRECATED_FOR ("Deprecated macro. Use clutter_actor_is_mapped instead") \
  ((((ClutterActor*)(a))->flags & CLUTTER_ACTOR_MAPPED) != FALSE)
 #define CLUTTER_ACTOR_IS_REALIZED(a) \
-  CLUTTER_MACRO_DEPRECATED_IN_1_24_FOR ("Deprecated macro. Use clutter_actor_is_realized instead") \
+  CLUTTER_MACRO_DEPRECATED_FOR ("Deprecated macro. Use clutter_actor_is_realized instead") \
  ((((ClutterActor*)(a))->flags & CLUTTER_ACTOR_REALIZED) != FALSE)
 #define CLUTTER_ACTOR_IS_VISIBLE(a) \
-  CLUTTER_MACRO_DEPRECATED_IN_1_24_FOR ("Deprecated macro. Use clutter_actor_is_visible instead") \
+  CLUTTER_MACRO_DEPRECATED_FOR ("Deprecated macro. Use clutter_actor_is_visible instead") \
  ((((ClutterActor*)(a))->flags & CLUTTER_ACTOR_VISIBLE) != FALSE)
 #define CLUTTER_ACTOR_IS_REACTIVE(a) \
-  CLUTTER_MACRO_DEPRECATED_IN_1_24_FOR ("Deprecated macro. Use clutter_actor_get_reactive instead") \
+  CLUTTER_MACRO_DEPRECATED_FOR ("Deprecated macro. Use clutter_actor_get_reactive instead") \
  ((((ClutterActor*)(a))->flags & CLUTTER_ACTOR_REACTIVE) != FALSE)
 typedef struct _ClutterActorClass    ClutterActorClass;
@@ -322,97 +322,97 @@ struct _ClutterActorIter
  gpointer CLUTTER_PRIVATE_FIELD (dummy5);
 };
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 GType clutter_actor_get_type (void) G_GNUC_CONST;
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 ClutterActor *                  clutter_actor_new                               (void);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void                            clutter_actor_set_flags                         (ClutterActor                *self,
                                                                                 ClutterActorFlags            flags);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void                            clutter_actor_unset_flags                       (ClutterActor                *self,
                                                                                 ClutterActorFlags            flags);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 ClutterActorFlags               clutter_actor_get_flags                         (ClutterActor                *self);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void                            clutter_actor_show                              (ClutterActor                *self);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void                            clutter_actor_hide                              (ClutterActor                *self);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void                            clutter_actor_realize                           (ClutterActor                *self);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void                            clutter_actor_unrealize                         (ClutterActor                *self);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void                            clutter_actor_map                               (ClutterActor                *self);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void                            clutter_actor_unmap                             (ClutterActor                *self);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void                            clutter_actor_paint                             (ClutterActor                *self);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void                            clutter_actor_continue_paint                    (ClutterActor                *self);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void                            clutter_actor_queue_redraw                      (ClutterActor                *self);
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 void                            clutter_actor_queue_redraw_with_clip            (ClutterActor                *self,
                                                                                 const cairo_rectangle_int_t *clip);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void                            clutter_actor_queue_relayout                    (ClutterActor                *self);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void                            clutter_actor_destroy                           (ClutterActor                *self);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void                            clutter_actor_set_name                          (ClutterActor                *self,
                                                                                 const gchar                 *name);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 const gchar *                   clutter_actor_get_name                          (ClutterActor                *self);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 AtkObject *                     clutter_actor_get_accessible                    (ClutterActor                *self);
-CLUTTER_AVAILABLE_IN_1_24
+CLUTTER_EXPORT
 gboolean                        clutter_actor_is_visible                        (ClutterActor                *self);
-CLUTTER_AVAILABLE_IN_1_24
+CLUTTER_EXPORT
 gboolean                        clutter_actor_is_mapped                         (ClutterActor                *self);
-CLUTTER_AVAILABLE_IN_1_24
+CLUTTER_EXPORT
 gboolean                        clutter_actor_is_realized                       (ClutterActor                *self);
 /* Size negotiation */
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void                            clutter_actor_set_request_mode                  (ClutterActor                *self,
                                                                                 ClutterRequestMode           mode);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 ClutterRequestMode              clutter_actor_get_request_mode                  (ClutterActor                *self);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void                            clutter_actor_get_preferred_width               (ClutterActor                *self,
                                                                                 gfloat                       for_height,
                                                                                 gfloat                      *min_width_p,
                                                                                 gfloat                      *natural_width_p);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void                            clutter_actor_get_preferred_height              (ClutterActor                *self,
                                                                                 gfloat                       for_width,
                                                                                 gfloat                      *min_height_p,
                                                                                 gfloat                      *natural_height_p);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void                            clutter_actor_get_preferred_size                (ClutterActor                *self,
                                                                                 gfloat                      *min_width_p,
                                                                                 gfloat                      *min_height_p,
                                                                                 gfloat                      *natural_width_p,
                                                                                 gfloat                      *natural_height_p);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void                            clutter_actor_allocate                          (ClutterActor                *self,
                                                                                 const ClutterActorBox       *box,
                                                                                 ClutterAllocationFlags       flags);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void                            clutter_actor_allocate_preferred_size           (ClutterActor                *self,
                                                                                 ClutterAllocationFlags       flags);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void                            clutter_actor_allocate_available_size           (ClutterActor                *self,
                                                                                 gfloat                       x,
                                                                                 gfloat                       y,
                                                                                 gfloat                       available_width,
                                                                                 gfloat                       available_height,
                                                                                 ClutterAllocationFlags       flags);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void                            clutter_actor_allocate_align_fill               (ClutterActor                *self,
                                                                                 const ClutterActorBox       *box,
                                                                                 gdouble                      x_align,
@@ -420,448 +420,448 @@ void                            clutter_actor_allocate_align_fill
                                                                                 gboolean                     x_fill,
                                                                                 gboolean                     y_fill,
                                                                                 ClutterAllocationFlags       flags);
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 void                            clutter_actor_set_allocation                    (ClutterActor                *self,
                                                                                 const ClutterActorBox       *box,
                                                                                 ClutterAllocationFlags       flags);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void                            clutter_actor_get_allocation_box                (ClutterActor                *self,
                                                                                 ClutterActorBox             *box);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void                            clutter_actor_get_allocation_vertices           (ClutterActor                *self,
                                                                                 ClutterActor                *ancestor,
                                                                                 ClutterVertex                verts[]);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 gboolean                        clutter_actor_has_allocation                    (ClutterActor                *self);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void                            clutter_actor_set_size                          (ClutterActor                *self,
                                                                                 gfloat                       width,
                                                                                 gfloat                       height);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void                            clutter_actor_get_size                          (ClutterActor                *self,
                                                                                 gfloat                      *width,
                                                                                 gfloat                      *height);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void                            clutter_actor_set_position                      (ClutterActor                *self,
                                                                                 gfloat                       x,
                                                                                 gfloat                       y);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void                            clutter_actor_get_position                      (ClutterActor                *self,
                                                                                 gfloat                      *x,
                                                                                 gfloat                      *y);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 gboolean                        clutter_actor_get_fixed_position_set            (ClutterActor                *self);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void                            clutter_actor_set_fixed_position_set            (ClutterActor                *self,
                                                                                 gboolean                     is_set);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void                            clutter_actor_move_by                           (ClutterActor                *self,
                                                                                 gfloat                       dx,
                                                                                 gfloat                       dy);
 /* Actor geometry */
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 gfloat                          clutter_actor_get_width                         (ClutterActor                *self);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 gfloat                          clutter_actor_get_height                        (ClutterActor                *self);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void                            clutter_actor_set_width                         (ClutterActor                *self,
                                                                                 gfloat                       width);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void                            clutter_actor_set_height                        (ClutterActor                *self,
                                                                                 gfloat                       height);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 gfloat                          clutter_actor_get_x                             (ClutterActor                *self);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 gfloat                          clutter_actor_get_y                             (ClutterActor                *self);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void                            clutter_actor_set_x                             (ClutterActor                *self,
                                                                                 gfloat                       x);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void                            clutter_actor_set_y                             (ClutterActor                *self,
                                                                                 gfloat                       y);
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 void                            clutter_actor_set_z_position                    (ClutterActor                *self,
                                                                                 gfloat                       z_position);
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 gfloat                          clutter_actor_get_z_position                    (ClutterActor                *self);
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 void                            clutter_actor_set_layout_manager                (ClutterActor                *self,
                                                                                 ClutterLayoutManager        *manager);
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 ClutterLayoutManager *          clutter_actor_get_layout_manager                (ClutterActor                *self);
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 void                            clutter_actor_set_x_align                       (ClutterActor                *self,
                                                                                 ClutterActorAlign            x_align);
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 ClutterActorAlign               clutter_actor_get_x_align                       (ClutterActor                *self);
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 void                            clutter_actor_set_y_align                       (ClutterActor                *self,
                                                                                 ClutterActorAlign            y_align);
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 ClutterActorAlign               clutter_actor_get_y_align                       (ClutterActor                *self);
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 void                            clutter_actor_set_margin_top                    (ClutterActor                *self,
                                                                                 gfloat                       margin);
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 gfloat                          clutter_actor_get_margin_top                    (ClutterActor                *self);
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 void                            clutter_actor_set_margin_bottom                 (ClutterActor                *self,
                                                                                 gfloat                       margin);
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 gfloat                          clutter_actor_get_margin_bottom                 (ClutterActor                *self);
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 void                            clutter_actor_set_margin_left                   (ClutterActor                *self,
                                                                                 gfloat                       margin);
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 gfloat                          clutter_actor_get_margin_left                   (ClutterActor                *self);
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 void                            clutter_actor_set_margin_right                  (ClutterActor                *self,
                                                                                 gfloat                       margin);
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 gfloat                          clutter_actor_get_margin_right                  (ClutterActor                *self);
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 void                            clutter_actor_set_margin                        (ClutterActor                *self,
                                                                                 const ClutterMargin         *margin);
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 void                            clutter_actor_get_margin                        (ClutterActor                *self,
                                                                                 ClutterMargin               *margin);
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 void                            clutter_actor_set_x_expand                      (ClutterActor                *self,
                                                                                 gboolean                     expand);
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 gboolean                        clutter_actor_get_x_expand                      (ClutterActor                *self);
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 void                            clutter_actor_set_y_expand                      (ClutterActor                *self,
                                                                                 gboolean                     expand);
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 gboolean                        clutter_actor_get_y_expand                      (ClutterActor                *self);
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 gboolean                        clutter_actor_needs_expand                      (ClutterActor                *self,
                                                                                 ClutterOrientation           orientation);
 /* Paint */
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void                            clutter_actor_set_clip                          (ClutterActor                *self,
                                                                                 gfloat                       xoff,
                                                                                 gfloat                       yoff,
                                                                                 gfloat                       width,
                                                                                 gfloat                       height);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void                            clutter_actor_remove_clip                       (ClutterActor               *self);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 gboolean                        clutter_actor_has_clip                          (ClutterActor               *self);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void                            clutter_actor_get_clip                          (ClutterActor               *self,
                                                                                 gfloat                     *xoff,
                                                                                 gfloat                     *yoff,
                                                                                 gfloat                     *width,
                                                                                 gfloat                     *height);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void                            clutter_actor_set_clip_to_allocation            (ClutterActor               *self,
                                                                                 gboolean                    clip_set);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 gboolean                        clutter_actor_get_clip_to_allocation            (ClutterActor               *self);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void                            clutter_actor_set_opacity                       (ClutterActor               *self,
                                                                                 guint8                      opacity);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 guint8                          clutter_actor_get_opacity                       (ClutterActor               *self);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 guint8                          clutter_actor_get_paint_opacity                 (ClutterActor               *self);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 gboolean                        clutter_actor_get_paint_visibility              (ClutterActor               *self);
-CLUTTER_AVAILABLE_IN_1_8
+CLUTTER_EXPORT
 void                            clutter_actor_set_offscreen_redirect            (ClutterActor               *self,
                                                                                 ClutterOffscreenRedirect    redirect);
-CLUTTER_AVAILABLE_IN_1_8
+CLUTTER_EXPORT
 ClutterOffscreenRedirect        clutter_actor_get_offscreen_redirect            (ClutterActor               *self);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 gboolean                        clutter_actor_should_pick_paint                 (ClutterActor               *self);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 gboolean                        clutter_actor_is_in_clone_paint                 (ClutterActor               *self);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 gboolean                        clutter_actor_get_paint_box                     (ClutterActor               *self,
                                                                                 ClutterActorBox            *box);
-CLUTTER_AVAILABLE_IN_1_8
+CLUTTER_EXPORT
 gboolean                        clutter_actor_has_overlaps                      (ClutterActor               *self);
 /* Content */
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 void                            clutter_actor_set_content                       (ClutterActor               *self,
                                                                                 ClutterContent             *content);
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 ClutterContent *                clutter_actor_get_content                       (ClutterActor               *self);
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 void                            clutter_actor_set_content_gravity               (ClutterActor               *self,
                                                                                 ClutterContentGravity       gravity);
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 ClutterContentGravity           clutter_actor_get_content_gravity               (ClutterActor               *self);
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 void                            clutter_actor_set_content_scaling_filters       (ClutterActor               *self,
                                                                                 ClutterScalingFilter        min_filter,
                                                                                 ClutterScalingFilter        mag_filter);
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 void                            clutter_actor_get_content_scaling_filters       (ClutterActor               *self,
                                                                                 ClutterScalingFilter       *min_filter,
                                                                                 ClutterScalingFilter       *mag_filter);
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 void                            clutter_actor_set_content_repeat                (ClutterActor               *self,
                                                                                 ClutterContentRepeat        repeat);
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 ClutterContentRepeat            clutter_actor_get_content_repeat                (ClutterActor               *self);
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 void                            clutter_actor_get_content_box                   (ClutterActor               *self,
                                                                                 ClutterActorBox            *box);
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 void                            clutter_actor_set_background_color              (ClutterActor               *self,
                                                                                 const ClutterColor         *color);
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 void                            clutter_actor_get_background_color              (ClutterActor               *self,
                                                                                 ClutterColor               *color);
-CLUTTER_AVAILABLE_IN_1_6
+CLUTTER_EXPORT
 const ClutterPaintVolume *      clutter_actor_get_paint_volume                  (ClutterActor               *self);
-CLUTTER_AVAILABLE_IN_1_6
+CLUTTER_EXPORT
 const ClutterPaintVolume *      clutter_actor_get_transformed_paint_volume      (ClutterActor               *self,
                                                                                 ClutterActor               *relative_to_ancestor);
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 const ClutterPaintVolume *      clutter_actor_get_default_paint_volume          (ClutterActor               *self);
 /* Events */
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void                            clutter_actor_set_reactive                      (ClutterActor               *actor,
                                                                                 gboolean                    reactive);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 gboolean                        clutter_actor_get_reactive                      (ClutterActor               *actor);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 gboolean                        clutter_actor_has_key_focus                     (ClutterActor               *self);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void                            clutter_actor_grab_key_focus                    (ClutterActor               *self);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 gboolean                        clutter_actor_event                             (ClutterActor               *actor,
                                                                                 const ClutterEvent         *event,
                                                                                 gboolean                    capture);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 gboolean                        clutter_actor_has_pointer                       (ClutterActor               *self);
 /* Text */
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 PangoContext *                  clutter_actor_get_pango_context                 (ClutterActor               *self);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 PangoContext *                  clutter_actor_create_pango_context              (ClutterActor               *self);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 PangoLayout *                   clutter_actor_create_pango_layout               (ClutterActor               *self,
                                                                                 const gchar                *text);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void                            clutter_actor_set_text_direction                (ClutterActor               *self,
                                                                                 ClutterTextDirection        text_dir);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 ClutterTextDirection            clutter_actor_get_text_direction                (ClutterActor               *self);
 /* Actor hierarchy */
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 void                            clutter_actor_add_child                         (ClutterActor               *self,
                                                                                 ClutterActor               *child);
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 void                            clutter_actor_insert_child_at_index             (ClutterActor               *self,
                                                                                 ClutterActor               *child,
                                                                                 gint                        index_);
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 void                            clutter_actor_insert_child_above                (ClutterActor               *self,
                                                                                 ClutterActor               *child,
                                                                                 ClutterActor               *sibling);
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 void                            clutter_actor_insert_child_below                (ClutterActor               *self,
                                                                                 ClutterActor               *child,
                                                                                 ClutterActor               *sibling);
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 void                            clutter_actor_replace_child                     (ClutterActor               *self,
                                                                                 ClutterActor               *old_child,
                                                                                 ClutterActor               *new_child);
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 void                            clutter_actor_remove_child                      (ClutterActor               *self,
                                                                                 ClutterActor               *child);
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 void                            clutter_actor_remove_all_children               (ClutterActor               *self);
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 void                            clutter_actor_destroy_all_children              (ClutterActor               *self);
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 GList *                         clutter_actor_get_children                      (ClutterActor               *self);
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 gint                            clutter_actor_get_n_children                    (ClutterActor               *self);
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 ClutterActor *                  clutter_actor_get_child_at_index                (ClutterActor               *self,
                                                                                 gint                        index_);
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 ClutterActor *                  clutter_actor_get_previous_sibling              (ClutterActor               *self);
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 ClutterActor *                  clutter_actor_get_next_sibling                  (ClutterActor               *self);
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 ClutterActor *                  clutter_actor_get_first_child                   (ClutterActor               *self);
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 ClutterActor *                  clutter_actor_get_last_child                    (ClutterActor               *self);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 ClutterActor *                  clutter_actor_get_parent                        (ClutterActor               *self);
-CLUTTER_AVAILABLE_IN_1_4
+CLUTTER_EXPORT
 gboolean                        clutter_actor_contains                          (ClutterActor               *self,
                                                                                 ClutterActor               *descendant);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 ClutterActor*                   clutter_actor_get_stage                         (ClutterActor               *actor);
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 void                            clutter_actor_set_child_below_sibling           (ClutterActor               *self,
                                                                                 ClutterActor               *child,
                                                                                 ClutterActor               *sibling);
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 void                            clutter_actor_set_child_above_sibling           (ClutterActor               *self,
                                                                                 ClutterActor               *child,
                                                                                 ClutterActor               *sibling);
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 void                            clutter_actor_set_child_at_index                (ClutterActor               *self,
                                                                                 ClutterActor               *child,
                                                                                 gint                        index_);
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 void                            clutter_actor_iter_init                         (ClutterActorIter           *iter,
                                                                                 ClutterActor               *root);
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 gboolean                        clutter_actor_iter_next                         (ClutterActorIter           *iter,
                                                                                 ClutterActor              **child);
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 gboolean                        clutter_actor_iter_prev                         (ClutterActorIter           *iter,
                                                                                 ClutterActor              **child);
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 void                            clutter_actor_iter_remove                       (ClutterActorIter           *iter);
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 void                            clutter_actor_iter_destroy                      (ClutterActorIter           *iter);
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 gboolean                        clutter_actor_iter_is_valid                     (const ClutterActorIter     *iter);
 /* Transformations */
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 gboolean                        clutter_actor_is_rotated                        (ClutterActor               *self);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 gboolean                        clutter_actor_is_scaled                         (ClutterActor               *self);
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 void                            clutter_actor_set_pivot_point                   (ClutterActor               *self,
                                                                                 gfloat                      pivot_x,
                                                                                 gfloat                      pivot_y);
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 void                            clutter_actor_get_pivot_point                   (ClutterActor               *self,
                                                                                 gfloat                     *pivot_x,
                                                                                 gfloat                     *pivot_y);
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 void                            clutter_actor_set_pivot_point_z                 (ClutterActor               *self,
                                                                                 gfloat                      pivot_z);
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 gfloat                          clutter_actor_get_pivot_point_z                 (ClutterActor               *self);
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 void                            clutter_actor_set_rotation_angle                (ClutterActor               *self,
                                                                                 ClutterRotateAxis           axis,
                                                                                 gdouble                     angle);
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 gdouble                         clutter_actor_get_rotation_angle                (ClutterActor               *self,
                                                                                 ClutterRotateAxis           axis);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void                            clutter_actor_set_scale                         (ClutterActor               *self,
                                                                                 gdouble                     scale_x,
                                                                                 gdouble                     scale_y);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void                            clutter_actor_get_scale                         (ClutterActor               *self,
                                                                                 gdouble                    *scale_x,
                                                                                 gdouble                    *scale_y);
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 void                            clutter_actor_set_scale_z                       (ClutterActor               *self,
                                                                                 gdouble                     scale_z);
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 gdouble                         clutter_actor_get_scale_z                       (ClutterActor               *self);
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 void                            clutter_actor_set_translation                   (ClutterActor               *self,
                                                                                 gfloat                      translate_x,
                                                                                 gfloat                      translate_y,
                                                                                 gfloat                      translate_z);
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 void                            clutter_actor_get_translation                   (ClutterActor               *self,
                                                                                 gfloat                     *translate_x,
                                                                                 gfloat                     *translate_y,
                                                                                 gfloat                     *translate_z);
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 void                            clutter_actor_set_transform                     (ClutterActor               *self,
                                                                                 const ClutterMatrix        *transform);
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 void                            clutter_actor_get_transform                     (ClutterActor               *self,
                                                                                 ClutterMatrix              *transform);
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 void                            clutter_actor_set_child_transform               (ClutterActor               *self,
                                                                                 const ClutterMatrix        *transform);
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 void                            clutter_actor_get_child_transform               (ClutterActor               *self,
                                                                                 ClutterMatrix              *transform);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void                            clutter_actor_get_transformed_position          (ClutterActor               *self,
                                                                                 gfloat                     *x,
                                                                                 gfloat                     *y);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void                            clutter_actor_get_transformed_size              (ClutterActor               *self,
                                                                                 gfloat                     *width,
                                                                                 gfloat                     *height);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 gboolean                        clutter_actor_transform_stage_point             (ClutterActor               *self,
                                                                                 gfloat                      x,
                                                                                 gfloat                      y,
                                                                                 gfloat                     *x_out,
                                                                                 gfloat                     *y_out);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void                            clutter_actor_get_abs_allocation_vertices       (ClutterActor               *self,
                                                                                 ClutterVertex               verts[]);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void                            clutter_actor_apply_transform_to_point          (ClutterActor               *self,
                                                                                 const ClutterVertex        *point,
                                                                                 ClutterVertex              *vertex);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void                            clutter_actor_apply_relative_transform_to_point (ClutterActor               *self,
                                                                                 ClutterActor               *ancestor,
                                                                                 const ClutterVertex        *point,
                                                                                 ClutterVertex              *vertex);
 /* Implicit animations */
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 void                            clutter_actor_save_easing_state                 (ClutterActor               *self);
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 void                            clutter_actor_restore_easing_state              (ClutterActor               *self);
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 void                            clutter_actor_set_easing_mode                   (ClutterActor               *self,
                                                                                 ClutterAnimationMode        mode);
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 ClutterAnimationMode            clutter_actor_get_easing_mode                   (ClutterActor               *self);
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 void                            clutter_actor_set_easing_duration               (ClutterActor               *self,
                                                                                 guint                       msecs);
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 guint                           clutter_actor_get_easing_duration               (ClutterActor               *self);
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 void                            clutter_actor_set_easing_delay                  (ClutterActor               *self,
                                                                                 guint                       msecs);
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 guint                           clutter_actor_get_easing_delay                  (ClutterActor               *self);
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 ClutterTransition *             clutter_actor_get_transition                    (ClutterActor               *self,
                                                                                 const char                 *name);
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 void                            clutter_actor_add_transition                    (ClutterActor               *self,
                                                                                 const char                 *name,
                                                                                 ClutterTransition          *transition);
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 void                            clutter_actor_remove_transition                 (ClutterActor               *self,
                                                                                 const char                 *name);
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 void                            clutter_actor_remove_all_transitions            (ClutterActor               *self);
-CLUTTER_AVAILABLE_IN_1_16
+CLUTTER_EXPORT
 gboolean                        clutter_actor_has_mapped_clones                 (ClutterActor *self);
-CLUTTER_AVAILABLE_IN_1_22
+CLUTTER_EXPORT
 void                            clutter_actor_set_opacity_override              (ClutterActor               *self,
                                                                                 gint                        opacity);
-CLUTTER_AVAILABLE_IN_1_22
+CLUTTER_EXPORT
 gint                            clutter_actor_get_opacity_override              (ClutterActor               *self);
 /**
@@ -883,13 +883,13 @@ gint                            clutter_actor_get_opacity_override
 typedef ClutterActor * (* ClutterActorCreateChildFunc) (gpointer item,
                                                        gpointer user_data);
-CLUTTER_AVAILABLE_IN_1_24
+CLUTTER_EXPORT
 void                            clutter_actor_bind_model                        (ClutterActor               *self,
                                                                                 GListModel                 *model,
                                                                                 ClutterActorCreateChildFunc create_child_func,
                                                                                 gpointer                    user_data,
                                                                                 GDestroyNotify              notify);
-CLUTTER_AVAILABLE_IN_1_24
+CLUTTER_EXPORT
 void                            clutter_actor_bind_model_with_properties        (ClutterActor               *self,
                                                                                 GListModel                 *model,
                                                                                 GType                       child_type,
--- a/clutter/clutter/clutter-align-constraint.c
+++ b/clutter/clutter/clutter-align-constraint.c
@@ -34,9 +34,7 @@
 * #ClutterAlignConstraint is available since Clutter 1.4
 */
 #ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
 #endif
 #include "clutter-align-constraint.h"
--- a/clutter/clutter/clutter-align-constraint.h
+++ b/clutter/clutter/clutter-align-constraint.h
@@ -48,28 +48,28 @@ G_BEGIN_DECLS
 typedef struct _ClutterAlignConstraint          ClutterAlignConstraint;
 typedef struct _ClutterAlignConstraintClass     ClutterAlignConstraintClass;
-CLUTTER_AVAILABLE_IN_1_4
+CLUTTER_EXPORT
 GType clutter_align_constraint_get_type (void) G_GNUC_CONST;
-CLUTTER_AVAILABLE_IN_1_4
+CLUTTER_EXPORT
 ClutterConstraint *clutter_align_constraint_new            (ClutterActor           *source,
                                                            ClutterAlignAxis        axis,
                                                            gfloat                  factor);
-CLUTTER_AVAILABLE_IN_1_4
+CLUTTER_EXPORT
 void               clutter_align_constraint_set_source     (ClutterAlignConstraint *align,
                                                            ClutterActor           *source);
-CLUTTER_AVAILABLE_IN_1_4
+CLUTTER_EXPORT
 ClutterActor *     clutter_align_constraint_get_source     (ClutterAlignConstraint *align);
-CLUTTER_AVAILABLE_IN_1_4
+CLUTTER_EXPORT
 void               clutter_align_constraint_set_align_axis (ClutterAlignConstraint *align,
                                                            ClutterAlignAxis        axis);
-CLUTTER_AVAILABLE_IN_1_4
+CLUTTER_EXPORT
 ClutterAlignAxis   clutter_align_constraint_get_align_axis (ClutterAlignConstraint *align);
-CLUTTER_AVAILABLE_IN_1_4
+CLUTTER_EXPORT
 void               clutter_align_constraint_set_factor     (ClutterAlignConstraint *align,
                                                            gfloat                  factor);
-CLUTTER_AVAILABLE_IN_1_4
+CLUTTER_EXPORT
 gfloat             clutter_align_constraint_get_factor     (ClutterAlignConstraint *align);
 G_END_DECLS
--- a/clutter/clutter/clutter-animatable.c
+++ b/clutter/clutter/clutter-animatable.c
@@ -45,9 +45,7 @@
 * #ClutterAnimatable is available since Clutter 1.0
 */
 #ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
 #endif
 #define CLUTTER_DISABLE_DEPRECATION_WARNINGS
--- a/clutter/clutter/clutter-animatable.h
+++ b/clutter/clutter/clutter-animatable.h
@@ -95,21 +95,21 @@ struct _ClutterAnimatableIface
                                     GValue            *value);
 };
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 GType clutter_animatable_get_type (void) G_GNUC_CONST;
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 GParamSpec *clutter_animatable_find_property     (ClutterAnimatable *animatable,
                                                  const gchar       *property_name);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 void        clutter_animatable_get_initial_state (ClutterAnimatable *animatable,
                                                  const gchar       *property_name,
                                                  GValue            *value);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 void        clutter_animatable_set_final_state   (ClutterAnimatable *animatable,
                                                  const gchar       *property_name,
                                                  const GValue      *value);
-CLUTTER_AVAILABLE_IN_1_8
+CLUTTER_EXPORT
 gboolean    clutter_animatable_interpolate_value (ClutterAnimatable *animatable,
                                                  const gchar       *property_name,
                                                  ClutterInterval   *interval,
--- a/clutter/clutter/clutter-backend-private.h
+++ b/clutter/clutter/clutter-backend-private.h
@@ -135,7 +135,7 @@ gboolean                _clutter_backend_translate_event                (Clutter
                                                                         gpointer                native,
                                                                         ClutterEvent           *event);
-CLUTTER_AVAILABLE_IN_MUTTER
+CLUTTER_EXPORT
 void                    _clutter_backend_add_event_translator           (ClutterBackend         *backend,
                                                                         ClutterEventTranslator *translator);
@@ -150,7 +150,7 @@ gint32                  _clutter_backend_get_units_serial               (Clutter
 PangoDirection          _clutter_backend_get_keymap_direction           (ClutterBackend         *backend);
-CLUTTER_AVAILABLE_IN_MUTTER
+CLUTTER_EXPORT
 void                    _clutter_backend_reset_cogl_framebuffer         (ClutterBackend         *backend);
 void                    clutter_set_allowed_drivers                     (const char             *drivers);
--- a/clutter/clutter/clutter-backend.c
+++ b/clutter/clutter/clutter-backend.c
@@ -38,9 +38,7 @@
 * #ClutterBackend is available since Clutter 0.4
 */
 #ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
 #endif
 #define CLUTTER_ENABLE_EXPERIMENTAL_API
@@ -53,7 +51,6 @@
 #include "clutter-stage-manager-private.h"
 #include "clutter-stage-private.h"
 #include "clutter-stage-window.h"
 #include "clutter-version.h"
 #include "clutter-device-manager-private.h"
 #define CLUTTER_DISABLE_DEPRECATION_WARNINGS
--- a/clutter/clutter/clutter-backend.h
+++ b/clutter/clutter/clutter-backend.h
@@ -53,34 +53,34 @@ G_BEGIN_DECLS
 typedef struct _ClutterBackend          ClutterBackend;
 typedef struct _ClutterBackendClass     ClutterBackendClass;
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 GType clutter_backend_get_type (void) G_GNUC_CONST;
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 ClutterBackend *                clutter_get_default_backend             (void);
-CLUTTER_AVAILABLE_IN_1_16
+CLUTTER_EXPORT
 void                            clutter_set_windowing_backend           (const char *backend_type);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 gdouble                         clutter_backend_get_resolution          (ClutterBackend             *backend);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void                            clutter_backend_set_font_options        (ClutterBackend             *backend,
                                                                         const cairo_font_options_t *options);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 const cairo_font_options_t *    clutter_backend_get_font_options        (ClutterBackend             *backend);
-CLUTTER_AVAILABLE_IN_1_8
+CLUTTER_EXPORT
 CoglContext *                   clutter_backend_get_cogl_context        (ClutterBackend             *backend);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void                            clutter_backend_bell_notify             (ClutterBackend             *backend);
-CLUTTER_AVAILABLE_IN_MUTTER
+CLUTTER_EXPORT
 ClutterInputMethod *            clutter_backend_get_input_method        (ClutterBackend             *backend);
-CLUTTER_AVAILABLE_IN_MUTTER
+CLUTTER_EXPORT
 void                            clutter_backend_set_input_method        (ClutterBackend             *backend,
                                                                         ClutterInputMethod         *method);
 G_END_DECLS
--- a/clutter/clutter/clutter-base-types.c
+++ b/clutter/clutter/clutter-base-types.c
@@ -30,9 +30,7 @@
 * across the whole API.
 */
 #ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
 #endif
 #include "clutter-types.h"
 #include "clutter-private.h"
--- a/clutter/clutter/clutter-bin-layout.c
+++ b/clutter/clutter/clutter-bin-layout.c
@@ -43,9 +43,7 @@
 * #ClutterBinLayout is available since Clutter 1.2
 */
 #ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
 #endif
 #include <math.h>
--- a/clutter/clutter/clutter-bin-layout.h
+++ b/clutter/clutter/clutter-bin-layout.h
@@ -74,10 +74,10 @@ struct _ClutterBinLayoutClass
  ClutterLayoutManagerClass parent_class;
 };
-CLUTTER_AVAILABLE_IN_1_2
+CLUTTER_EXPORT
 GType clutter_bin_layout_get_type (void) G_GNUC_CONST;
-CLUTTER_AVAILABLE_IN_1_2
+CLUTTER_EXPORT
 ClutterLayoutManager *  clutter_bin_layout_new  (ClutterBinAlignment x_align,
                                                 ClutterBinAlignment y_align);
--- a/clutter/clutter/clutter-bind-constraint.c
+++ b/clutter/clutter/clutter-bind-constraint.c
@@ -80,9 +80,7 @@
 * #ClutterBindConstraint is available since Clutter 1.4
 */
 #ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
 #endif
 #include <math.h>
--- a/clutter/clutter/clutter-bind-constraint.h
+++ b/clutter/clutter/clutter-bind-constraint.h
@@ -48,28 +48,28 @@ G_BEGIN_DECLS
 typedef struct _ClutterBindConstraint           ClutterBindConstraint;
 typedef struct _ClutterBindConstraintClass      ClutterBindConstraintClass;
-CLUTTER_AVAILABLE_IN_1_4
+CLUTTER_EXPORT
 GType clutter_bind_constraint_get_type (void) G_GNUC_CONST;
-CLUTTER_AVAILABLE_IN_1_4
+CLUTTER_EXPORT
 ClutterConstraint *   clutter_bind_constraint_new            (ClutterActor          *source,
                                                              ClutterBindCoordinate  coordinate,
                                                              gfloat                 offset);
-CLUTTER_AVAILABLE_IN_1_4
+CLUTTER_EXPORT
 void                  clutter_bind_constraint_set_source     (ClutterBindConstraint *constraint,
                                                              ClutterActor          *source);
-CLUTTER_AVAILABLE_IN_1_4
+CLUTTER_EXPORT
 ClutterActor *        clutter_bind_constraint_get_source     (ClutterBindConstraint *constraint);
-CLUTTER_AVAILABLE_IN_1_4
+CLUTTER_EXPORT
 void                  clutter_bind_constraint_set_coordinate (ClutterBindConstraint *constraint,
                                                              ClutterBindCoordinate  coordinate);
-CLUTTER_AVAILABLE_IN_1_4
+CLUTTER_EXPORT
 ClutterBindCoordinate clutter_bind_constraint_get_coordinate (ClutterBindConstraint *constraint);
-CLUTTER_AVAILABLE_IN_1_4
+CLUTTER_EXPORT
 void                  clutter_bind_constraint_set_offset     (ClutterBindConstraint *constraint,
                                                              gfloat                 offset);
-CLUTTER_AVAILABLE_IN_1_4
+CLUTTER_EXPORT
 gfloat                clutter_bind_constraint_get_offset     (ClutterBindConstraint *constraint);
 G_END_DECLS
--- a/clutter/clutter/clutter-binding-pool.c
+++ b/clutter/clutter/clutter-binding-pool.c
@@ -94,9 +94,7 @@
 * #ClutterBindingPool is available since Clutter 1.0
 */
 #ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
 #endif
 #include "clutter-binding-pool.h"
 #include "clutter-debug.h"
--- a/clutter/clutter/clutter-binding-pool.h
+++ b/clutter/clutter/clutter-binding-pool.h
@@ -71,17 +71,17 @@ typedef gboolean (* ClutterBindingActionFunc) (GObject             *gobject,
                                               ClutterModifierType  modifiers,
                                               gpointer             user_data);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 GType clutter_binding_pool_get_type (void) G_GNUC_CONST;
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 ClutterBindingPool *  clutter_binding_pool_new              (const gchar         *name);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 ClutterBindingPool *  clutter_binding_pool_get_for_class    (gpointer             klass);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 ClutterBindingPool *  clutter_binding_pool_find             (const gchar         *name);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 void                  clutter_binding_pool_install_action   (ClutterBindingPool  *pool,
                                                             const gchar         *action_name,
                                                             guint                key_val,
@@ -89,44 +89,44 @@ void                  clutter_binding_pool_install_action   (ClutterBindingPool
                                                             GCallback            callback,
                                                             gpointer             data,
                                                             GDestroyNotify       notify);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 void                  clutter_binding_pool_install_closure  (ClutterBindingPool  *pool,
                                                             const gchar         *action_name,
                                                             guint                key_val,
                                                             ClutterModifierType  modifiers,
                                                             GClosure            *closure);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 void                  clutter_binding_pool_override_action  (ClutterBindingPool  *pool,
                                                             guint                key_val,
                                                             ClutterModifierType  modifiers,
                                                             GCallback            callback,
                                                             gpointer             data,
                                                             GDestroyNotify       notify);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 void                  clutter_binding_pool_override_closure (ClutterBindingPool  *pool,
                                                             guint                key_val,
                                                             ClutterModifierType  modifiers,
                                                             GClosure            *closure);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 const gchar *         clutter_binding_pool_find_action      (ClutterBindingPool  *pool,
                                                             guint                key_val,
                                                             ClutterModifierType  modifiers);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 void                  clutter_binding_pool_remove_action    (ClutterBindingPool  *pool,
                                                             guint                key_val,
                                                             ClutterModifierType  modifiers);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 gboolean              clutter_binding_pool_activate         (ClutterBindingPool  *pool,
                                                             guint                key_val,
                                                             ClutterModifierType  modifiers,
                                                             GObject             *gobject);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 void                  clutter_binding_pool_block_action     (ClutterBindingPool  *pool,
                                                             const gchar         *action_name);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 void                  clutter_binding_pool_unblock_action   (ClutterBindingPool  *pool,
                                                             const gchar         *action_name);
--- a/clutter/clutter/clutter-blur-effect.c
+++ b/clutter/clutter/clutter-blur-effect.c
@@ -37,9 +37,7 @@
 #define CLUTTER_IS_BLUR_EFFECT_CLASS(klass)     (G_TYPE_CHECK_CLASS_TYPE ((klass), CLUTTER_TYPE_BLUR_EFFECT))
 #define CLUTTER_BLUR_EFFECT_GET_CLASS(obj)      (G_TYPE_INSTANCE_GET_CLASS ((obj), CLUTTER_TYPE_BLUR_EFFECT, ClutterBlurEffectClass))
 #ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
 #endif
 #define CLUTTER_ENABLE_EXPERIMENTAL_API
@@ -162,6 +160,7 @@ static void
 clutter_blur_effect_paint_target (ClutterOffscreenEffect *effect)
 {
  ClutterBlurEffect *self = CLUTTER_BLUR_EFFECT (effect);
  CoglFramebuffer *framebuffer = cogl_get_draw_framebuffer ();
  guint8 paint_opacity;
  paint_opacity = clutter_actor_get_paint_opacity (self->actor);
@@ -171,11 +170,11 @@ clutter_blur_effect_paint_target (ClutterOffscreenEffect *effect)
                              paint_opacity,
                              paint_opacity,
                              paint_opacity);
  cogl_push_source (self->pipeline);
-  cogl_rectangle (0, 0, self->tex_width, self->tex_height);
+  cogl_framebuffer_draw_rectangle (framebuffer,
-
+                                   self->pipeline,
-  cogl_pop_source ();
+                                   0, 0,
                                   self->tex_width, self->tex_height);
 }
 static gboolean
--- a/clutter/clutter/clutter-blur-effect.h
+++ b/clutter/clutter/clutter-blur-effect.h
@@ -48,10 +48,10 @@ G_BEGIN_DECLS
 typedef struct _ClutterBlurEffect       ClutterBlurEffect;
 typedef struct _ClutterBlurEffectClass  ClutterBlurEffectClass;
-CLUTTER_AVAILABLE_IN_1_4
+CLUTTER_EXPORT
 GType clutter_blur_effect_get_type (void) G_GNUC_CONST;
-CLUTTER_AVAILABLE_IN_1_4
+CLUTTER_EXPORT
 ClutterEffect *clutter_blur_effect_new (void);
 G_END_DECLS
--- a/clutter/clutter/clutter-box-layout.c
+++ b/clutter/clutter/clutter-box-layout.c
@@ -48,9 +48,7 @@
 * #ClutterBoxLayout is available since Clutter 1.2
 */
 #ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
 #endif
 #include <math.h>
--- a/clutter/clutter/clutter-box-layout.h
+++ b/clutter/clutter/clutter-box-layout.h
@@ -77,41 +77,41 @@ struct _ClutterBoxLayoutClass
  ClutterLayoutManagerClass parent_class;
 };
-CLUTTER_AVAILABLE_IN_1_2
+CLUTTER_EXPORT
 GType clutter_box_layout_get_type (void) G_GNUC_CONST;
-CLUTTER_AVAILABLE_IN_1_2
+CLUTTER_EXPORT
 ClutterLayoutManager *  clutter_box_layout_new                 (void);
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 void                    clutter_box_layout_set_orientation      (ClutterBoxLayout    *layout,
                                                                 ClutterOrientation   orientation);
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 ClutterOrientation      clutter_box_layout_get_orientation      (ClutterBoxLayout    *layout);
-CLUTTER_AVAILABLE_IN_1_2
+CLUTTER_EXPORT
 void                    clutter_box_layout_set_spacing          (ClutterBoxLayout    *layout,
                                                                 guint                spacing);
-CLUTTER_AVAILABLE_IN_1_2
+CLUTTER_EXPORT
 guint                   clutter_box_layout_get_spacing          (ClutterBoxLayout    *layout);
-CLUTTER_AVAILABLE_IN_1_2
+CLUTTER_EXPORT
 void                    clutter_box_layout_set_homogeneous      (ClutterBoxLayout    *layout,
                                                                 gboolean             homogeneous);
-CLUTTER_AVAILABLE_IN_1_2
+CLUTTER_EXPORT
 gboolean                clutter_box_layout_get_homogeneous      (ClutterBoxLayout    *layout);
-CLUTTER_AVAILABLE_IN_1_2
+CLUTTER_EXPORT
 void                    clutter_box_layout_set_pack_start       (ClutterBoxLayout    *layout,
                                                                 gboolean             pack_start);
-CLUTTER_AVAILABLE_IN_1_2
+CLUTTER_EXPORT
 gboolean                clutter_box_layout_get_pack_start       (ClutterBoxLayout    *layout);
-CLUTTER_DEPRECATED_IN_1_12_FOR(clutter_box_layout_set_orientation)
+CLUTTER_DEPRECATED_FOR(clutter_box_layout_set_orientation)
 void                    clutter_box_layout_set_vertical         (ClutterBoxLayout    *layout,
                                                                 gboolean             vertical);
-CLUTTER_DEPRECATED_IN_1_12_FOR(clutter_box_layout_get_orientation)
+CLUTTER_DEPRECATED_FOR(clutter_box_layout_get_orientation)
 gboolean                clutter_box_layout_get_vertical         (ClutterBoxLayout    *layout);
-CLUTTER_AVAILABLE_IN_1_2
+CLUTTER_EXPORT
 void                    clutter_box_layout_pack                 (ClutterBoxLayout    *layout,
                                                                 ClutterActor        *actor,
                                                                 gboolean             expand,
@@ -119,48 +119,48 @@ void                    clutter_box_layout_pack                 (ClutterBoxLayou
                                                                 gboolean             y_fill,
                                                                 ClutterBoxAlignment  x_align,
                                                                 ClutterBoxAlignment  y_align);
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 void                    clutter_box_layout_set_alignment        (ClutterBoxLayout    *layout,
                                                                 ClutterActor        *actor,
                                                                 ClutterBoxAlignment  x_align,
                                                                 ClutterBoxAlignment  y_align);
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 void                    clutter_box_layout_get_alignment        (ClutterBoxLayout    *layout,
                                                                 ClutterActor        *actor,
                                                                 ClutterBoxAlignment *x_align,
                                                                 ClutterBoxAlignment *y_align);
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 void                    clutter_box_layout_set_fill             (ClutterBoxLayout    *layout,
                                                                 ClutterActor        *actor,
                                                                 gboolean             x_fill,
                                                                 gboolean             y_fill);
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 void                    clutter_box_layout_get_fill             (ClutterBoxLayout    *layout,
                                                                 ClutterActor        *actor,
                                                                 gboolean            *x_fill,
                                                                 gboolean            *y_fill);
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 void                    clutter_box_layout_set_expand           (ClutterBoxLayout    *layout,
                                                                 ClutterActor        *actor,
                                                                 gboolean             expand);
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 gboolean                clutter_box_layout_get_expand           (ClutterBoxLayout    *layout,
                                                                 ClutterActor        *actor);
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 void                    clutter_box_layout_set_use_animations   (ClutterBoxLayout    *layout,
                                                                 gboolean             animate);
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 gboolean                clutter_box_layout_get_use_animations   (ClutterBoxLayout    *layout);
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 void                    clutter_box_layout_set_easing_mode      (ClutterBoxLayout    *layout,
                                                                 gulong               mode);
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 gulong                  clutter_box_layout_get_easing_mode      (ClutterBoxLayout    *layout);
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 void                    clutter_box_layout_set_easing_duration  (ClutterBoxLayout    *layout,
                                                                 guint                msecs);
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 guint                   clutter_box_layout_get_easing_duration  (ClutterBoxLayout    *layout);
 G_END_DECLS
--- a/clutter/clutter/clutter-brightness-contrast-effect.c
+++ b/clutter/clutter/clutter-brightness-contrast-effect.c
@@ -37,9 +37,7 @@
 #define CLUTTER_IS_BRIGHTNESS_CONTRAST_EFFECT_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), CLUTTER_TYPE_BRIGHTNESS_CONTRAST_EFFECT))
 #define CLUTTER_BRIGHTNESS_CONTRAST_EFFECT_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), CLUTTER_TYPE_BRIGHTNESS_CONTRAST_EFFECT, ClutterBrightnessContrastEffectClass))
 #ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
 #endif
 #include <math.h>
@@ -180,6 +178,7 @@ static void
 clutter_brightness_contrast_effect_paint_target (ClutterOffscreenEffect *effect)
 {
  ClutterBrightnessContrastEffect *self = CLUTTER_BRIGHTNESS_CONTRAST_EFFECT (effect);
  CoglFramebuffer *framebuffer = cogl_get_draw_framebuffer ();
  ClutterActor *actor;
  guint8 paint_opacity;
@@ -191,11 +190,11 @@ clutter_brightness_contrast_effect_paint_target (ClutterOffscreenEffect *effect)
                              paint_opacity,
                              paint_opacity,
                              paint_opacity);
  cogl_push_source (self->pipeline);
-  cogl_rectangle (0, 0, self->tex_width, self->tex_height);
+  cogl_framebuffer_draw_rectangle (framebuffer,
-
+                                   self->pipeline,
-  cogl_pop_source ();
+                                   0, 0,
                                   self->tex_width, self->tex_height);
 }
 static void
--- a/clutter/clutter/clutter-brightness-contrast-effect.h
+++ b/clutter/clutter/clutter-brightness-contrast-effect.h
@@ -49,35 +49,35 @@ G_BEGIN_DECLS
 typedef struct _ClutterBrightnessContrastEffect         ClutterBrightnessContrastEffect;
 typedef struct _ClutterBrightnessContrastEffectClass    ClutterBrightnessContrastEffectClass;
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 GType clutter_brightness_contrast_effect_get_type (void) G_GNUC_CONST;
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 ClutterEffect * clutter_brightness_contrast_effect_new                          (void);
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 void            clutter_brightness_contrast_effect_set_brightness_full          (ClutterBrightnessContrastEffect *effect,
                                                                                 float                            red,
                                                                                 float                            green,
                                                                                 float                            blue);
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 void            clutter_brightness_contrast_effect_set_brightness               (ClutterBrightnessContrastEffect *effect,
                                                                                 float                            brightness);
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 void            clutter_brightness_contrast_effect_get_brightness               (ClutterBrightnessContrastEffect *effect,
                                                                                 float                           *red,
                                                                                 float                           *green,
                                                                                 float                           *blue);
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 void            clutter_brightness_contrast_effect_set_contrast_full            (ClutterBrightnessContrastEffect *effect,
                                                                                 float                            red,
                                                                                 float                            green,
                                                                                 float                            blue);
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 void            clutter_brightness_contrast_effect_set_contrast                 (ClutterBrightnessContrastEffect *effect,
                                                                                 float                            contrast);
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 void            clutter_brightness_contrast_effect_get_contrast                 (ClutterBrightnessContrastEffect *effect,
                                                                                 float                           *red,
                                                                                 float                           *green,
--- a/clutter/clutter/clutter-build-config.h.meson
+++ b/clutter/clutter/clutter-build-config.h.meson
@@ -0,0 +1,14 @@
 /* Mutter version */
 #mesondefine MUTTER_VERSION
 /* List of Cogl drivers */
 #mesondefine CLUTTER_DRIVERS
 /* Have evdev support for input handling */
 #mesondefine HAVE_EVDEV
 /* Building with libwacom for advanced tablet management */
 #mesondefine HAVE_LIBWACOM
 /* Supports PangoFt2 */
 #mesondefine HAVE_PANGO_FT2
--- a/clutter/clutter/clutter-cairo.c
+++ b/clutter/clutter/clutter-cairo.c
@@ -27,9 +27,7 @@
 * Clutter provides some utility functions for using Cairo.
 */
 #ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
 #endif
 #include "clutter-cairo.h"
 #include "clutter-color.h"
--- a/clutter/clutter/clutter-cairo.h
+++ b/clutter/clutter/clutter-cairo.h
@@ -50,9 +50,9 @@ G_BEGIN_DECLS
 #define CLUTTER_CAIRO_FORMAT_ARGB32     (COGL_PIXEL_FORMAT_ARGB_8888_PRE)
 #endif
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 void    clutter_cairo_clear             (cairo_t               *cr);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 void    clutter_cairo_set_source_color  (cairo_t               *cr,
                                         const ClutterColor    *color);
--- a/clutter/clutter/clutter-canvas.c
+++ b/clutter/clutter/clutter-canvas.c
@@ -42,9 +42,7 @@
 * #ClutterCanvas is available since Clutter 1.10.
 */
 #ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
 #endif
 #include <cogl/cogl.h>
 #include <cairo-gobject.h>
--- a/clutter/clutter/clutter-canvas.h
+++ b/clutter/clutter/clutter-canvas.h
@@ -85,20 +85,20 @@ struct _ClutterCanvasClass
  gpointer _padding[16];
 };
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 GType clutter_canvas_get_type (void) G_GNUC_CONST;
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 ClutterContent *        clutter_canvas_new                      (void);
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 gboolean                clutter_canvas_set_size                 (ClutterCanvas *canvas,
                                                                 int            width,
                                                                 int            height);
-CLUTTER_AVAILABLE_IN_1_18
+CLUTTER_EXPORT
 void                    clutter_canvas_set_scale_factor         (ClutterCanvas *canvas,
                                                                 int            scale);
-CLUTTER_AVAILABLE_IN_1_18
+CLUTTER_EXPORT
 int                     clutter_canvas_get_scale_factor         (ClutterCanvas *canvas);
 G_END_DECLS
--- a/clutter/clutter/clutter-child-meta.c
+++ b/clutter/clutter/clutter-child-meta.c
@@ -36,9 +36,8 @@
 *
 * #ClutterChildMeta is available since Clutter 0.8
 */
-#ifdef HAVE_CONFIG_H
+
 #include "clutter-build-config.h"
 #endif
 #include "clutter-child-meta.h"
 #include "clutter-container.h"
--- a/clutter/clutter/clutter-child-meta.h
+++ b/clutter/clutter/clutter-child-meta.h
@@ -109,12 +109,12 @@ struct _ClutterChildMetaClass
  GObjectClass parent_class;
 }; 
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 GType clutter_child_meta_get_type (void) G_GNUC_CONST;
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 ClutterContainer *      clutter_child_meta_get_container        (ClutterChildMeta *data);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 ClutterActor     *      clutter_child_meta_get_actor            (ClutterChildMeta *data);
 G_END_DECLS
--- a/clutter/clutter/clutter-click-action.c
+++ b/clutter/clutter/clutter-click-action.c
@@ -92,9 +92,7 @@
 * #ClutterClickAction is available since Clutter 1.4
 */
 #ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
 #endif
 #include "clutter-click-action.h"
--- a/clutter/clutter/clutter-click-action.h
+++ b/clutter/clutter/clutter-click-action.h
@@ -97,22 +97,22 @@ struct _ClutterClickActionClass
  void (* _clutter_click_action7) (void);
 };
-CLUTTER_AVAILABLE_IN_1_4
+CLUTTER_EXPORT
 GType clutter_click_action_get_type (void) G_GNUC_CONST;
-CLUTTER_AVAILABLE_IN_1_4
+CLUTTER_EXPORT
 ClutterAction *        clutter_click_action_new        (void);
-CLUTTER_AVAILABLE_IN_1_4
+CLUTTER_EXPORT
 guint                  clutter_click_action_get_button (ClutterClickAction *action);
-CLUTTER_AVAILABLE_IN_1_4
+CLUTTER_EXPORT
 ClutterModifierType    clutter_click_action_get_state  (ClutterClickAction *action);
-CLUTTER_AVAILABLE_IN_1_8
+CLUTTER_EXPORT
 void                   clutter_click_action_get_coords (ClutterClickAction *action,
                                                        gfloat             *press_x,
                                                        gfloat             *press_y);
-CLUTTER_AVAILABLE_IN_1_4
+CLUTTER_EXPORT
 void                   clutter_click_action_release    (ClutterClickAction *action);
 G_END_DECLS
--- a/clutter/clutter/clutter-clone.c
+++ b/clutter/clutter/clutter-clone.c
@@ -37,9 +37,7 @@
 * #ClutterClone is available since Clutter 1.0
 */
 #ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
 #endif
 #define CLUTTER_ENABLE_EXPERIMENTAL_API
 #include "clutter-actor-private.h"
--- a/clutter/clutter/clutter-clone.h
+++ b/clutter/clutter/clutter-clone.h
@@ -78,15 +78,15 @@ struct _ClutterCloneClass
  void (*_clutter_actor_clone4) (void);
 };
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 GType clutter_clone_get_type (void) G_GNUC_CONST;
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 ClutterActor *  clutter_clone_new               (ClutterActor *source);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 void            clutter_clone_set_source        (ClutterClone *self,
                                                 ClutterActor *source);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 ClutterActor *  clutter_clone_get_source        (ClutterClone *self);
 G_END_DECLS
--- a/clutter/clutter/clutter-color.c
+++ b/clutter/clutter/clutter-color.c
@@ -33,9 +33,7 @@
 * The alpha channel is fully opaque at 255 and fully transparent at 0.
 */
 #ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
 #endif
 #include <math.h>
--- a/clutter/clutter/clutter-color.h
+++ b/clutter/clutter/clutter-color.h
@@ -68,76 +68,76 @@ struct _ClutterColor
 */
 #define CLUTTER_COLOR_INIT(r,g,b,a)     { (r), (g), (b), (a) }
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 GType clutter_color_get_type (void) G_GNUC_CONST;
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 ClutterColor *clutter_color_new         (guint8              red,
                                         guint8              green,
                                         guint8              blue,
                                         guint8              alpha);
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 ClutterColor *clutter_color_alloc       (void);
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 ClutterColor *clutter_color_init        (ClutterColor       *color,
                                         guint8              red,
                                         guint8              green,
                                         guint8              blue,
                                         guint8              alpha);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 ClutterColor *clutter_color_copy        (const ClutterColor *color);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void          clutter_color_free        (ClutterColor       *color);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void          clutter_color_add         (const ClutterColor *a,
                                         const ClutterColor *b,
                                         ClutterColor       *result);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void          clutter_color_subtract    (const ClutterColor *a,
                                         const ClutterColor *b,
                                         ClutterColor       *result);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void          clutter_color_lighten     (const ClutterColor *color,
                                         ClutterColor       *result);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void          clutter_color_darken      (const ClutterColor *color,
                                         ClutterColor       *result);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void          clutter_color_shade       (const ClutterColor *color,
                                         gdouble             factor,
                                         ClutterColor       *result);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 gchar *       clutter_color_to_string   (const ClutterColor *color);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 gboolean      clutter_color_from_string (ClutterColor       *color,
                                         const gchar        *str);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void          clutter_color_to_hls      (const ClutterColor *color,
                                         gfloat             *hue,
 					 gfloat             *luminance,
 					 gfloat             *saturation);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void          clutter_color_from_hls    (ClutterColor       *color,
                                         gfloat              hue,
                                         gfloat              luminance,
                                         gfloat              saturation);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 guint32       clutter_color_to_pixel    (const ClutterColor *color);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void          clutter_color_from_pixel  (ClutterColor       *color,
                                         guint32             pixel);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 guint         clutter_color_hash        (gconstpointer       v);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 gboolean      clutter_color_equal       (gconstpointer       v1,
                                         gconstpointer       v2);
-CLUTTER_AVAILABLE_IN_1_6
+CLUTTER_EXPORT
 void          clutter_color_interpolate (const ClutterColor *initial,
                                         const ClutterColor *final,
                                         gdouble             progress,
@@ -177,22 +177,22 @@ struct _ClutterParamSpecColor
  ClutterColor *default_value;
 };
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 void                    clutter_value_set_color         (GValue             *value,
                                                         const ClutterColor *color);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 const ClutterColor *    clutter_value_get_color         (const GValue       *value);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 GType clutter_param_color_get_type (void) G_GNUC_CONST;
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 GParamSpec *    clutter_param_spec_color        (const gchar        *name,
                                                 const gchar        *nick,
                                                 const gchar        *blurb,
                                                 const ClutterColor *default_value,
                                                 GParamFlags         flags);
-CLUTTER_AVAILABLE_IN_1_6
+CLUTTER_EXPORT
 const ClutterColor *clutter_color_get_static (ClutterStaticColor color);
 G_END_DECLS
--- a/clutter/clutter/clutter-colorize-effect.c
+++ b/clutter/clutter/clutter-colorize-effect.c
@@ -37,9 +37,7 @@
 #define CLUTTER_IS_COLORIZE_EFFECT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CLUTTER_TYPE_COLORIZE_EFFECT))
 #define CLUTTER_COLORIZE_EFFECT_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), CLUTTER_TYPE_COLORIZE_EFFECT, ClutterColorizeEffectClass))
 #ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
 #endif
 #define CLUTTER_ENABLE_EXPERIMENTAL_API
@@ -150,6 +148,7 @@ static void
 clutter_colorize_effect_paint_target (ClutterOffscreenEffect *effect)
 {
  ClutterColorizeEffect *self = CLUTTER_COLORIZE_EFFECT (effect);
  CoglFramebuffer *framebuffer = cogl_get_draw_framebuffer ();
  ClutterActor *actor;
  guint8 paint_opacity;
@@ -161,11 +160,11 @@ clutter_colorize_effect_paint_target (ClutterOffscreenEffect *effect)
                              paint_opacity,
                              paint_opacity,
                              paint_opacity);
  cogl_push_source (self->pipeline);
-  cogl_rectangle (0, 0, self->tex_width, self->tex_height);
+  cogl_framebuffer_draw_rectangle (framebuffer,
-
+                                   self->pipeline,
-  cogl_pop_source ();
+                                   0, 0,
                                   self->tex_width, self->tex_height);
 }
 static void
--- a/clutter/clutter/clutter-colorize-effect.h
+++ b/clutter/clutter/clutter-colorize-effect.h
@@ -49,16 +49,16 @@ G_BEGIN_DECLS
 typedef struct _ClutterColorizeEffect           ClutterColorizeEffect;
 typedef struct _ClutterColorizeEffectClass      ClutterColorizeEffectClass;
-CLUTTER_AVAILABLE_IN_1_4
+CLUTTER_EXPORT
 GType clutter_colorize_effect_get_type (void) G_GNUC_CONST;
-CLUTTER_AVAILABLE_IN_1_4
+CLUTTER_EXPORT
 ClutterEffect *clutter_colorize_effect_new      (const ClutterColor *tint);
-CLUTTER_AVAILABLE_IN_1_4
+CLUTTER_EXPORT
 void           clutter_colorize_effect_set_tint (ClutterColorizeEffect *effect,
                                                 const ClutterColor    *tint);
-CLUTTER_AVAILABLE_IN_1_4
+CLUTTER_EXPORT
 void           clutter_colorize_effect_get_tint (ClutterColorizeEffect *effect,
                                                 ClutterColor          *tint);
--- a/clutter/clutter/clutter-constraint.c
+++ b/clutter/clutter/clutter-constraint.c
@@ -128,9 +128,7 @@
 * can be recovered at any point using clutter_actor_meta_get_actor().
 */
 #ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
 #endif
 #include <string.h>
--- a/clutter/clutter/clutter-constraint.h
+++ b/clutter/clutter/clutter-constraint.h
@@ -96,32 +96,32 @@ struct _ClutterConstraintClass
  void (* _clutter_constraint7) (void);
 };
-CLUTTER_AVAILABLE_IN_1_4
+CLUTTER_EXPORT
 GType clutter_constraint_get_type (void) G_GNUC_CONST;
 /* ClutterActor API */
-CLUTTER_AVAILABLE_IN_1_4
+CLUTTER_EXPORT
 void               clutter_actor_add_constraint            (ClutterActor      *self,
                                                            ClutterConstraint *constraint);
-CLUTTER_AVAILABLE_IN_1_4
+CLUTTER_EXPORT
 void               clutter_actor_add_constraint_with_name  (ClutterActor      *self,
                                                            const gchar       *name,
                                                            ClutterConstraint *constraint);
-CLUTTER_AVAILABLE_IN_1_4
+CLUTTER_EXPORT
 void               clutter_actor_remove_constraint         (ClutterActor      *self,
                                                            ClutterConstraint *constraint);
-CLUTTER_AVAILABLE_IN_1_4
+CLUTTER_EXPORT
 void               clutter_actor_remove_constraint_by_name (ClutterActor      *self,
                                                            const gchar       *name);
-CLUTTER_AVAILABLE_IN_1_4
+CLUTTER_EXPORT
 GList *            clutter_actor_get_constraints           (ClutterActor      *self);
-CLUTTER_AVAILABLE_IN_1_4
+CLUTTER_EXPORT
 ClutterConstraint *clutter_actor_get_constraint            (ClutterActor      *self,
                                                            const gchar       *name);
-CLUTTER_AVAILABLE_IN_1_4
+CLUTTER_EXPORT
 void               clutter_actor_clear_constraints         (ClutterActor      *self);
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 gboolean           clutter_actor_has_constraints           (ClutterActor      *self);
 G_END_DECLS
--- a/clutter/clutter/clutter-container.c
+++ b/clutter/clutter/clutter-container.c
@@ -26,9 +26,7 @@
 * Author: Emmanuele Bassi <ebassi@openedhand.com>
 */
 #ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
 #endif
 #include <stdarg.h>
 #include <glib-object.h>
--- a/clutter/clutter/clutter-container.h
+++ b/clutter/clutter/clutter-container.h
@@ -141,52 +141,52 @@ struct _ClutterContainerIface
                          GParamSpec       *pspec);
 };
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 GType clutter_container_get_type (void) G_GNUC_CONST;
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 ClutterActor *          clutter_container_find_child_by_name            (ClutterContainer *container,
                                                                         const gchar      *child_name);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 GParamSpec *            clutter_container_class_find_child_property     (GObjectClass     *klass,
                                                                         const gchar      *property_name);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 GParamSpec **           clutter_container_class_list_child_properties   (GObjectClass     *klass,
                                                                         guint            *n_properties);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void                    clutter_container_create_child_meta             (ClutterContainer *container,
                                                                         ClutterActor     *actor);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void                    clutter_container_destroy_child_meta            (ClutterContainer *container,
                                                                         ClutterActor     *actor);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 ClutterChildMeta *      clutter_container_get_child_meta                (ClutterContainer *container,
                                                                         ClutterActor     *actor);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void                    clutter_container_child_set_property            (ClutterContainer *container,
                                                                         ClutterActor     *child,
                                                                         const gchar      * property,
                                                                         const GValue     *value);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void                    clutter_container_child_get_property            (ClutterContainer *container,
                                                                         ClutterActor     *child,
                                                                         const gchar      *property,
                                                                         GValue           *value);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void                    clutter_container_child_set                     (ClutterContainer *container,
                                                                         ClutterActor     *actor,
                                                                         const gchar      *first_prop,
                                                                         ...) G_GNUC_NULL_TERMINATED;
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void                    clutter_container_child_get                     (ClutterContainer *container,
                                                                         ClutterActor     *actor,
                                                                         const gchar      *first_prop,
                                                                         ...) G_GNUC_NULL_TERMINATED;
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void                    clutter_container_child_notify                  (ClutterContainer *container,
                                                                         ClutterActor     *child,
                                                                         GParamSpec       *pspec);
--- a/clutter/clutter/clutter-content.c
+++ b/clutter/clutter/clutter-content.c
@@ -36,9 +36,7 @@
 * #ClutterContent is available since Clutter 1.10.
 */
 #ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
 #endif
 #include "clutter-content-private.h"
--- a/clutter/clutter/clutter-content.h
+++ b/clutter/clutter/clutter-content.h
@@ -88,14 +88,14 @@ struct _ClutterContentIface
  void          (* invalidate)          (ClutterContent   *content);
 };
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 GType clutter_content_get_type (void) G_GNUC_CONST;
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 gboolean        clutter_content_get_preferred_size      (ClutterContent *content,
                                                         gfloat         *width,
                                                         gfloat         *height);
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 void            clutter_content_invalidate              (ClutterContent *content);
 G_END_DECLS
--- a/clutter/clutter/clutter-deform-effect.c
+++ b/clutter/clutter/clutter-deform-effect.c
@@ -51,9 +51,7 @@
 * deformation algorithm.
 */
 #ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
 #endif
 #define CLUTTER_ENABLE_EXPERIMENTAL_API
 #include "clutter-deform-effect.h"
--- a/clutter/clutter/clutter-deform-effect.h
+++ b/clutter/clutter/clutter-deform-effect.h
@@ -92,24 +92,24 @@ struct _ClutterDeformEffectClass
  void (*_clutter_deform7) (void);
 };
-CLUTTER_AVAILABLE_IN_1_4
+CLUTTER_EXPORT
 GType clutter_deform_effect_get_type (void) G_GNUC_CONST;
-CLUTTER_AVAILABLE_IN_1_4
+CLUTTER_EXPORT
 void            clutter_deform_effect_set_back_material (ClutterDeformEffect *effect,
                                                         CoglHandle           material);
-CLUTTER_AVAILABLE_IN_1_4
+CLUTTER_EXPORT
 CoglHandle      clutter_deform_effect_get_back_material (ClutterDeformEffect *effect);
-CLUTTER_AVAILABLE_IN_1_4
+CLUTTER_EXPORT
 void            clutter_deform_effect_set_n_tiles       (ClutterDeformEffect *effect,
                                                         guint                x_tiles,
                                                         guint                y_tiles);
-CLUTTER_AVAILABLE_IN_1_4
+CLUTTER_EXPORT
 void            clutter_deform_effect_get_n_tiles       (ClutterDeformEffect *effect,
                                                         guint               *x_tiles,
                                                         guint               *y_tiles);
-CLUTTER_AVAILABLE_IN_1_4
+CLUTTER_EXPORT
 void            clutter_deform_effect_invalidate        (ClutterDeformEffect *effect);
 G_END_DECLS
--- a/clutter/clutter/clutter-desaturate-effect.c
+++ b/clutter/clutter/clutter-desaturate-effect.c
@@ -39,9 +39,7 @@
 #define CLUTTER_IS_DESATURATE_EFFECT_CLASS(klass)     (G_TYPE_CHECK_CLASS_TYPE ((klass), CLUTTER_TYPE_DESATURATE_EFFECT))
 #define CLUTTER_DESATURATE_EFFECT_GET_CLASS(obj)      (G_TYPE_INSTANCE_GET_CLASS ((obj), CLUTTER_TYPE_DESATURATE_EFFECT, ClutterDesaturateEffectClass))
 #ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
 #endif
 #define CLUTTER_ENABLE_EXPERIMENTAL_API
@@ -157,6 +155,7 @@ static void
 clutter_desaturate_effect_paint_target (ClutterOffscreenEffect *effect)
 {
  ClutterDesaturateEffect *self = CLUTTER_DESATURATE_EFFECT (effect);
  CoglFramebuffer *framebuffer = cogl_get_draw_framebuffer ();
  ClutterActor *actor;
  CoglHandle texture;
  guint8 paint_opacity;
@@ -172,13 +171,12 @@ clutter_desaturate_effect_paint_target (ClutterOffscreenEffect *effect)
                              paint_opacity,
                              paint_opacity,
                              paint_opacity);
  cogl_push_source (self->pipeline);
-  cogl_rectangle (0, 0,
+  cogl_framebuffer_draw_rectangle (framebuffer,
-                  cogl_texture_get_width (texture),
+                                   self->pipeline,
-                  cogl_texture_get_height (texture));
+                                   0, 0,
-
+                                   cogl_texture_get_width (texture),
-  cogl_pop_source ();
+                                   cogl_texture_get_height (texture));
 }
 static void
--- a/clutter/clutter/clutter-desaturate-effect.h
+++ b/clutter/clutter/clutter-desaturate-effect.h
@@ -48,16 +48,16 @@ G_BEGIN_DECLS
 typedef struct _ClutterDesaturateEffect         ClutterDesaturateEffect;
 typedef struct _ClutterDesaturateEffectClass    ClutterDesaturateEffectClass;
-CLUTTER_AVAILABLE_IN_1_4
+CLUTTER_EXPORT
 GType clutter_desaturate_effect_get_type (void) G_GNUC_CONST;
-CLUTTER_AVAILABLE_IN_1_4
+CLUTTER_EXPORT
 ClutterEffect *clutter_desaturate_effect_new        (gdouble                  factor);
-CLUTTER_AVAILABLE_IN_1_4
+CLUTTER_EXPORT
 void           clutter_desaturate_effect_set_factor (ClutterDesaturateEffect *effect,
                                                     gdouble                  factor);
-CLUTTER_AVAILABLE_IN_1_4
+CLUTTER_EXPORT
 gdouble        clutter_desaturate_effect_get_factor (ClutterDesaturateEffect *effect);
 G_END_DECLS
--- a/clutter/clutter/clutter-device-manager.c
+++ b/clutter/clutter/clutter-device-manager.c
@@ -36,9 +36,7 @@
 * #ClutterDeviceManager is available since Clutter 1.2
 */
 #ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
 #endif
 #include "clutter-backend-private.h"
 #include "clutter-debug.h"
--- a/clutter/clutter/clutter-device-manager.h
+++ b/clutter/clutter/clutter-device-manager.h
@@ -125,34 +125,34 @@ struct _ClutterDeviceManagerClass
  gpointer _padding[6];
 };
-CLUTTER_AVAILABLE_IN_1_2
+CLUTTER_EXPORT
 GType clutter_device_manager_get_type (void) G_GNUC_CONST;
-CLUTTER_AVAILABLE_IN_1_2
+CLUTTER_EXPORT
 ClutterDeviceManager *clutter_device_manager_get_default     (void);
-CLUTTER_AVAILABLE_IN_1_2
+CLUTTER_EXPORT
 GSList *              clutter_device_manager_list_devices    (ClutterDeviceManager   *device_manager);
-CLUTTER_AVAILABLE_IN_1_2
+CLUTTER_EXPORT
 const GSList *        clutter_device_manager_peek_devices    (ClutterDeviceManager   *device_manager);
-CLUTTER_AVAILABLE_IN_1_2
+CLUTTER_EXPORT
 ClutterInputDevice *  clutter_device_manager_get_device      (ClutterDeviceManager   *device_manager,
                                                              gint                    device_id);
-CLUTTER_AVAILABLE_IN_1_2
+CLUTTER_EXPORT
 ClutterInputDevice *  clutter_device_manager_get_core_device (ClutterDeviceManager   *device_manager,
                                                              ClutterInputDeviceType  device_type);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 ClutterVirtualInputDevice *clutter_device_manager_create_virtual_device (ClutterDeviceManager  *device_manager,
                                                                         ClutterInputDeviceType device_type);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 ClutterVirtualDeviceType clutter_device_manager_get_supported_virtual_device_types (ClutterDeviceManager *device_manager);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void clutter_device_manager_set_kbd_a11y_settings (ClutterDeviceManager   *device_manager,
                                                   ClutterKbdA11ySettings *settings);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void clutter_device_manager_get_kbd_a11y_settings (ClutterDeviceManager   *device_manager,
                                                   ClutterKbdA11ySettings *settings);
--- a/clutter/clutter/clutter-drag-action.c
+++ b/clutter/clutter/clutter-drag-action.c
@@ -63,9 +63,7 @@
 * #ClutterDragAction is available since Clutter 1.4
 */
 #ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
 #endif
 #include "clutter-drag-action.h"
--- a/clutter/clutter/clutter-drag-action.h
+++ b/clutter/clutter/clutter-drag-action.h
@@ -105,45 +105,45 @@ struct _ClutterDragActionClass
  void (* _clutter_drag_action4) (void);
 };
-CLUTTER_AVAILABLE_IN_1_4
+CLUTTER_EXPORT
 GType clutter_drag_action_get_type (void) G_GNUC_CONST;
-CLUTTER_AVAILABLE_IN_1_4
+CLUTTER_EXPORT
 ClutterAction * clutter_drag_action_new                   (void);
-CLUTTER_AVAILABLE_IN_1_4
+CLUTTER_EXPORT
 void            clutter_drag_action_set_drag_threshold (ClutterDragAction *action,
                                                        gint               x_threshold,
                                                        gint               y_threshold);
-CLUTTER_AVAILABLE_IN_1_4
+CLUTTER_EXPORT
 void            clutter_drag_action_get_drag_threshold (ClutterDragAction *action,
                                                        guint             *x_threshold,
                                                        guint             *y_threshold);
-CLUTTER_AVAILABLE_IN_1_4
+CLUTTER_EXPORT
 void            clutter_drag_action_set_drag_handle    (ClutterDragAction *action,
                                                        ClutterActor      *handle);
-CLUTTER_AVAILABLE_IN_1_4
+CLUTTER_EXPORT
 ClutterActor *  clutter_drag_action_get_drag_handle    (ClutterDragAction *action);
-CLUTTER_AVAILABLE_IN_1_4
+CLUTTER_EXPORT
 void            clutter_drag_action_set_drag_axis      (ClutterDragAction *action,
                                                        ClutterDragAxis    axis);
-CLUTTER_AVAILABLE_IN_1_4
+CLUTTER_EXPORT
 ClutterDragAxis clutter_drag_action_get_drag_axis      (ClutterDragAction *action);
-CLUTTER_AVAILABLE_IN_1_4
+CLUTTER_EXPORT
 void            clutter_drag_action_get_press_coords   (ClutterDragAction *action,
                                                        gfloat            *press_x,
                                                        gfloat            *press_y);
-CLUTTER_AVAILABLE_IN_1_4
+CLUTTER_EXPORT
 void            clutter_drag_action_get_motion_coords  (ClutterDragAction *action,
                                                        gfloat            *motion_x,
                                                        gfloat            *motion_y);
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 gboolean        clutter_drag_action_get_drag_area      (ClutterDragAction *action,
                                                        ClutterRect       *drag_area);
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 void            clutter_drag_action_set_drag_area      (ClutterDragAction *action,
                                                        const ClutterRect *drag_area);
--- a/clutter/clutter/clutter-drop-action.c
+++ b/clutter/clutter/clutter-drop-action.c
@@ -58,9 +58,7 @@
 * #ClutterDropAction is available since Clutter 1.8
 */
 #ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
 #endif
 #include "clutter-drop-action.h"
--- a/clutter/clutter/clutter-drop-action.h
+++ b/clutter/clutter/clutter-drop-action.h
@@ -104,10 +104,10 @@ struct _ClutterDropActionClass
  void (*_clutter_drop_action8) (void);
 };
-CLUTTER_AVAILABLE_IN_1_8
+CLUTTER_EXPORT
 GType clutter_drop_action_get_type (void) G_GNUC_CONST;
-CLUTTER_AVAILABLE_IN_1_8
+CLUTTER_EXPORT
 ClutterAction *         clutter_drop_action_new         (void);
 G_END_DECLS
--- a/clutter/clutter/clutter-effect-private.h
+++ b/clutter/clutter/clutter-effect-private.h
@@ -9,6 +9,7 @@ gboolean        _clutter_effect_pre_paint               (ClutterEffect
 void            _clutter_effect_post_paint              (ClutterEffect           *effect);
 gboolean        _clutter_effect_get_paint_volume        (ClutterEffect           *effect,
                                                         ClutterPaintVolume      *volume);
 gboolean        _clutter_effect_has_custom_paint_volume (ClutterEffect           *effect);
 void            _clutter_effect_paint                   (ClutterEffect           *effect,
                                                         ClutterEffectPaintFlags  flags);
 void            _clutter_effect_pick                    (ClutterEffect           *effect,
--- a/clutter/clutter/clutter-effect.c
+++ b/clutter/clutter/clutter-effect.c
@@ -160,9 +160,7 @@
 * #ClutterEffect is available since Clutter 1.4
 */
 #ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
 #endif
 #include "clutter-effect.h"
@@ -308,6 +306,14 @@ _clutter_effect_get_paint_volume (ClutterEffect      *effect,
  return CLUTTER_EFFECT_GET_CLASS (effect)->get_paint_volume (effect, volume);
 }
 gboolean
 _clutter_effect_has_custom_paint_volume (ClutterEffect *effect)
 {
  g_return_val_if_fail (CLUTTER_IS_EFFECT (effect), FALSE);
  return CLUTTER_EFFECT_GET_CLASS (effect)->get_paint_volume != clutter_effect_real_get_paint_volume;
 }
 /**
 * clutter_effect_queue_repaint:
 * @effect: A #ClutterEffect which needs redrawing
--- a/clutter/clutter/clutter-effect.h
+++ b/clutter/clutter/clutter-effect.h
@@ -91,38 +91,38 @@ struct _ClutterEffectClass
  void (* _clutter_effect6) (void);
 };
-CLUTTER_AVAILABLE_IN_1_4
+CLUTTER_EXPORT
 GType clutter_effect_get_type (void) G_GNUC_CONST;
-CLUTTER_AVAILABLE_IN_1_8
+CLUTTER_EXPORT
 void    clutter_effect_queue_repaint    (ClutterEffect *effect);
 /*
 * ClutterActor API
 */
-CLUTTER_AVAILABLE_IN_1_4
+CLUTTER_EXPORT
 void           clutter_actor_add_effect            (ClutterActor  *self,
                                                    ClutterEffect *effect);
-CLUTTER_AVAILABLE_IN_1_4
+CLUTTER_EXPORT
 void           clutter_actor_add_effect_with_name  (ClutterActor  *self,
                                                    const gchar   *name,
                                                    ClutterEffect *effect);
-CLUTTER_AVAILABLE_IN_1_4
+CLUTTER_EXPORT
 void           clutter_actor_remove_effect         (ClutterActor  *self,
                                                    ClutterEffect *effect);
-CLUTTER_AVAILABLE_IN_1_4
+CLUTTER_EXPORT
 void           clutter_actor_remove_effect_by_name (ClutterActor  *self,
                                                    const gchar   *name);
-CLUTTER_AVAILABLE_IN_1_4
+CLUTTER_EXPORT
 GList *        clutter_actor_get_effects           (ClutterActor  *self);
-CLUTTER_AVAILABLE_IN_1_4
+CLUTTER_EXPORT
 ClutterEffect *clutter_actor_get_effect            (ClutterActor  *self,
                                                    const gchar   *name);
-CLUTTER_AVAILABLE_IN_1_4
+CLUTTER_EXPORT
 void           clutter_actor_clear_effects         (ClutterActor  *self);
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 gboolean       clutter_actor_has_effects           (ClutterActor  *self);
 G_END_DECLS
--- a/clutter/clutter/clutter-enum-types.h.in
+++ b/clutter/clutter/clutter-enum-types.h.in
@@ -17,7 +17,7 @@ G_BEGIN_DECLS
 /*** END file-production ***/
 /*** BEGIN value-header ***/
-CLUTTER_AVAILABLE_IN_ALL GType @enum_name@_get_type (void) G_GNUC_CONST;
+CLUTTER_EXPORT GType @enum_name@_get_type (void) G_GNUC_CONST;
 #define CLUTTER_TYPE_@ENUMSHORT@ (@enum_name@_get_type())
 /*** END value-header ***/
--- a/clutter/clutter/clutter-enums.h
+++ b/clutter/clutter/clutter-enums.h
@@ -761,6 +761,7 @@ typedef enum { /*< prefix=CLUTTER_DRAG >*/
 * ClutterEventFlags:
 * @CLUTTER_EVENT_NONE: No flag set
 * @CLUTTER_EVENT_FLAG_SYNTHETIC: Synthetic event
 * @CLUTTER_EVENT_FLAG_REPEATED: Auto-repeated event
 *
 * Flags for the #ClutterEvent
 *
@@ -769,7 +770,8 @@ typedef enum { /*< prefix=CLUTTER_DRAG >*/
 typedef enum { /*< flags prefix=CLUTTER_EVENT >*/
  CLUTTER_EVENT_NONE              = 0,
  CLUTTER_EVENT_FLAG_SYNTHETIC    = 1 << 0,
-  CLUTTER_EVENT_FLAG_INPUT_METHOD = 1 << 1
+  CLUTTER_EVENT_FLAG_INPUT_METHOD = 1 << 1,
  CLUTTER_EVENT_FLAG_REPEATED     = 1 << 2
 } ClutterEventFlags;
 /**
--- a/clutter/clutter/clutter-event-translator.h
+++ b/clutter/clutter/clutter-event-translator.h
@@ -29,7 +29,7 @@ struct _ClutterEventTranslatorIface
                                              ClutterEvent           *translated);
 };
-CLUTTER_AVAILABLE_IN_MUTTER
+CLUTTER_EXPORT
 GType _clutter_event_translator_get_type (void) G_GNUC_CONST;
 ClutterTranslateReturn _clutter_event_translator_translate_event (ClutterEventTranslator *translator,
--- a/clutter/clutter/clutter-event.c
+++ b/clutter/clutter/clutter-event.c
@@ -23,9 +23,7 @@
 *
 */
 #ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
 #endif
 #include "clutter-backend-private.h"
 #include "clutter-debug.h"
@@ -1095,7 +1093,7 @@ clutter_event_set_device (ClutterEvent       *event,
    {
      ClutterEventPrivate *real_event = (ClutterEventPrivate *) event;
-      real_event->device = device;
+      g_set_object (&real_event->device, device);
    }
  switch (event->type)
@@ -1364,8 +1362,8 @@ clutter_event_copy (const ClutterEvent *event)
    {
      ClutterEventPrivate *real_event = (ClutterEventPrivate *) event;
-      new_real_event->device = real_event->device;
+      g_set_object (&new_real_event->device, real_event->device);
-      new_real_event->source_device = real_event->source_device;
+      g_set_object (&new_real_event->source_device, real_event->source_device);
      new_real_event->delta_x = real_event->delta_x;
      new_real_event->delta_y = real_event->delta_y;
      new_real_event->is_pointer_emulated = real_event->is_pointer_emulated;
@@ -1435,6 +1433,14 @@ clutter_event_free (ClutterEvent *event)
    {
      _clutter_backend_free_event_data (clutter_get_default_backend (), event);
      if (is_event_allocated (event))
        {
          ClutterEventPrivate *real_event = (ClutterEventPrivate *) event;
          g_clear_object (&real_event->device);
          g_clear_object (&real_event->source_device);
        }
      switch (event->type)
        {
        case CLUTTER_BUTTON_PRESS:
@@ -1689,7 +1695,7 @@ clutter_event_set_source_device (ClutterEvent       *event,
    return;
  real_event = (ClutterEventPrivate *) event;
-  real_event->source_device = device;
+  g_set_object (&real_event->source_device, device);
 }
 /**
--- a/clutter/clutter/clutter-event.h
+++ b/clutter/clutter/clutter-event.h
@@ -589,185 +589,185 @@ union _ClutterEvent
 typedef gboolean (* ClutterEventFilterFunc) (const ClutterEvent *event,
                                             gpointer            user_data);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 GType clutter_event_get_type (void) G_GNUC_CONST;
-CLUTTER_AVAILABLE_IN_1_20
+CLUTTER_EXPORT
 GType clutter_event_sequence_get_type (void) G_GNUC_CONST;
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 gboolean                clutter_events_pending                  (void);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 ClutterEvent *          clutter_event_get                       (void);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 ClutterEvent *          clutter_event_peek                      (void);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void                    clutter_event_put                       (const ClutterEvent     *event);
-CLUTTER_AVAILABLE_IN_1_18
+CLUTTER_EXPORT
 guint                   clutter_event_add_filter                (ClutterStage          *stage,
                                                                 ClutterEventFilterFunc func,
                                                                 GDestroyNotify         notify,
                                                                 gpointer               user_data);
-CLUTTER_AVAILABLE_IN_1_18
+CLUTTER_EXPORT
 void                    clutter_event_remove_filter             (guint                  id);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 ClutterEvent *          clutter_event_new                       (ClutterEventType        type);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 ClutterEvent *          clutter_event_copy                      (const ClutterEvent     *event);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void                    clutter_event_free                      (ClutterEvent           *event);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 ClutterEventType        clutter_event_type                      (const ClutterEvent     *event);
-CLUTTER_AVAILABLE_IN_1_8
+CLUTTER_EXPORT
 void                    clutter_event_set_flags                 (ClutterEvent           *event,
                                                                 ClutterEventFlags       flags);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 ClutterEventFlags       clutter_event_get_flags                 (const ClutterEvent     *event);
-CLUTTER_AVAILABLE_IN_1_8
+CLUTTER_EXPORT
 void                    clutter_event_set_time                  (ClutterEvent           *event,
                                                                 guint32                 time_);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 guint32                 clutter_event_get_time                  (const ClutterEvent     *event);
-CLUTTER_AVAILABLE_IN_1_8
+CLUTTER_EXPORT
 void                    clutter_event_set_state                 (ClutterEvent           *event,
                                                                 ClutterModifierType     state);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 ClutterModifierType     clutter_event_get_state                 (const ClutterEvent     *event);
-CLUTTER_AVAILABLE_IN_1_16
+CLUTTER_EXPORT
 void                    clutter_event_get_state_full            (const ClutterEvent     *event,
 								 ClutterModifierType    *button_state,
 								 ClutterModifierType    *base_state,
 								 ClutterModifierType    *latched_state,
 								 ClutterModifierType    *locked_state,
 								 ClutterModifierType    *effective_state);
-CLUTTER_AVAILABLE_IN_1_6
+CLUTTER_EXPORT
 void                    clutter_event_set_device                (ClutterEvent           *event,
                                                                 ClutterInputDevice     *device);
-CLUTTER_AVAILABLE_IN_1_6
+CLUTTER_EXPORT
 ClutterInputDevice *    clutter_event_get_device                (const ClutterEvent     *event);
-CLUTTER_AVAILABLE_IN_1_6
+CLUTTER_EXPORT
 void                    clutter_event_set_source_device         (ClutterEvent           *event,
                                                                 ClutterInputDevice     *device);
-CLUTTER_AVAILABLE_IN_1_6
+CLUTTER_EXPORT
 ClutterInputDevice *    clutter_event_get_source_device         (const ClutterEvent     *event);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void                    clutter_event_set_device_tool           (ClutterEvent           *event,
                                                                 ClutterInputDeviceTool *tool);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 ClutterInputDeviceTool *clutter_event_get_device_tool           (const ClutterEvent     *event);
-CLUTTER_AVAILABLE_IN_1_8
+CLUTTER_EXPORT
 void                    clutter_event_set_source                (ClutterEvent           *event,
                                                                 ClutterActor           *actor);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 ClutterActor *          clutter_event_get_source                (const ClutterEvent     *event);
-CLUTTER_AVAILABLE_IN_1_8
+CLUTTER_EXPORT
 void                    clutter_event_set_stage                 (ClutterEvent           *event,
                                                                 ClutterStage           *stage);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 ClutterStage *          clutter_event_get_stage                 (const ClutterEvent     *event);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 gint                    clutter_event_get_device_id             (const ClutterEvent     *event);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 ClutterInputDeviceType  clutter_event_get_device_type           (const ClutterEvent     *event);
-CLUTTER_AVAILABLE_IN_1_8
+CLUTTER_EXPORT
 void                    clutter_event_set_coords                (ClutterEvent           *event,
                                                                 gfloat                  x,
                                                                 gfloat                  y);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void                    clutter_event_get_coords                (const ClutterEvent     *event,
                                                                 gfloat                 *x,
                                                                 gfloat                 *y);
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 void                    clutter_event_get_position              (const ClutterEvent     *event,
                                                                 ClutterPoint           *position);
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 float                   clutter_event_get_distance              (const ClutterEvent     *source,
                                                                 const ClutterEvent     *target);
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 double                  clutter_event_get_angle                 (const ClutterEvent     *source,
                                                                 const ClutterEvent     *target);
-CLUTTER_AVAILABLE_IN_1_6
+CLUTTER_EXPORT
 gdouble *               clutter_event_get_axes                  (const ClutterEvent     *event,
                                                                 guint                  *n_axes);
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 gboolean                clutter_event_has_shift_modifier        (const ClutterEvent     *event);
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 gboolean                clutter_event_has_control_modifier      (const ClutterEvent     *event);
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 gboolean                clutter_event_is_pointer_emulated       (const ClutterEvent     *event);
-CLUTTER_AVAILABLE_IN_1_8
+CLUTTER_EXPORT
 void                    clutter_event_set_key_symbol            (ClutterEvent           *event,
                                                                 guint                   key_sym);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 guint                   clutter_event_get_key_symbol            (const ClutterEvent     *event);
-CLUTTER_AVAILABLE_IN_1_8
+CLUTTER_EXPORT
 void                    clutter_event_set_key_code              (ClutterEvent           *event,
                                                                 guint16                 key_code);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 guint16                 clutter_event_get_key_code              (const ClutterEvent     *event);
-CLUTTER_AVAILABLE_IN_1_8
+CLUTTER_EXPORT
 void                    clutter_event_set_key_unicode           (ClutterEvent           *event,
                                                                 gunichar                key_unicode);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 gunichar                clutter_event_get_key_unicode           (const ClutterEvent     *event);
-CLUTTER_AVAILABLE_IN_1_8
+CLUTTER_EXPORT
 void                    clutter_event_set_button                (ClutterEvent           *event,
                                                                 guint32                 button);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 guint32                 clutter_event_get_button                (const ClutterEvent     *event);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 guint                   clutter_event_get_click_count           (const ClutterEvent     *event);
-CLUTTER_AVAILABLE_IN_1_8
+CLUTTER_EXPORT
 void                    clutter_event_set_related               (ClutterEvent           *event,
                                                                 ClutterActor           *actor);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 ClutterActor *          clutter_event_get_related               (const ClutterEvent     *event);
-CLUTTER_AVAILABLE_IN_1_8
+CLUTTER_EXPORT
 void                    clutter_event_set_scroll_direction      (ClutterEvent           *event,
                                                                 ClutterScrollDirection  direction);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 ClutterScrollDirection  clutter_event_get_scroll_direction      (const ClutterEvent     *event);
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 void                    clutter_event_set_scroll_delta          (ClutterEvent           *event,
                                                                 gdouble                 dx,
                                                                 gdouble                 dy);
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 void                    clutter_event_get_scroll_delta          (const ClutterEvent     *event,
                                                                 gdouble                *dx,
                                                                 gdouble                *dy);
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 ClutterEventSequence *  clutter_event_get_event_sequence        (const ClutterEvent     *event);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 guint32                 clutter_keysym_to_unicode               (guint                   keyval);
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 guint                   clutter_unicode_to_keysym               (guint32                 wc);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 guint32                 clutter_get_current_event_time          (void);
-CLUTTER_AVAILABLE_IN_1_2
+CLUTTER_EXPORT
 const ClutterEvent *    clutter_get_current_event               (void);
-CLUTTER_AVAILABLE_IN_1_24
+CLUTTER_EXPORT
 guint                   clutter_event_get_touchpad_gesture_finger_count (const ClutterEvent  *event);
-CLUTTER_AVAILABLE_IN_1_24
+CLUTTER_EXPORT
 gdouble                 clutter_event_get_gesture_pinch_angle_delta  (const ClutterEvent     *event);
-CLUTTER_AVAILABLE_IN_1_24
+CLUTTER_EXPORT
 gdouble                 clutter_event_get_gesture_pinch_scale        (const ClutterEvent     *event);
-CLUTTER_AVAILABLE_IN_1_24
+CLUTTER_EXPORT
 ClutterTouchpadGesturePhase clutter_event_get_gesture_phase          (const ClutterEvent     *event);
-CLUTTER_AVAILABLE_IN_1_24
+CLUTTER_EXPORT
 void                    clutter_event_get_gesture_motion_delta       (const ClutterEvent     *event,
                                                                      gdouble                *dx,
                                                                      gdouble                *dy);
@@ -775,10 +775,10 @@ void                    clutter_event_get_gesture_motion_delta       (const Clut
 ClutterScrollSource      clutter_event_get_scroll_source             (const ClutterEvent     *event);
 ClutterScrollFinishFlags clutter_event_get_scroll_finish_flags       (const ClutterEvent     *event);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 guint                    clutter_event_get_mode_group                (const ClutterEvent     *event);
-CLUTTER_AVAILABLE_IN_MUTTER
+CLUTTER_EXPORT
 gboolean                 clutter_event_get_pad_event_details         (const ClutterEvent     *event,
                                                                      guint                  *number,
                                                                      guint                  *mode,
--- a/clutter/clutter/clutter-feature.c
+++ b/clutter/clutter/clutter-feature.c
@@ -37,9 +37,7 @@
 * See also cogl_get_features() and #CoglFeatureFlags
 */
 #ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
 #endif
 #include <stdlib.h>
 #include <string.h>
--- a/clutter/clutter/clutter-feature.h
+++ b/clutter/clutter/clutter-feature.h
@@ -32,9 +32,9 @@
 G_BEGIN_DECLS
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 gboolean            clutter_feature_available       (ClutterFeatureFlags feature);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 ClutterFeatureFlags clutter_feature_get_all         (void);
 G_END_DECLS
--- a/clutter/clutter/clutter-fixed-layout.c
+++ b/clutter/clutter/clutter-fixed-layout.c
@@ -34,9 +34,7 @@
 * #ClutterFixedLayout is available since Clutter 1.2
 */
 #ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
 #endif
 #include "clutter-debug.h"
 #include "clutter-fixed-layout.h"
--- a/clutter/clutter/clutter-fixed-layout.h
+++ b/clutter/clutter/clutter-fixed-layout.h
@@ -71,10 +71,10 @@ struct _ClutterFixedLayoutClass
  ClutterLayoutManagerClass parent_class;
 };
-CLUTTER_AVAILABLE_IN_1_2
+CLUTTER_EXPORT
 GType clutter_fixed_layout_get_type (void) G_GNUC_CONST;
-CLUTTER_AVAILABLE_IN_1_2
+CLUTTER_EXPORT
 ClutterLayoutManager *clutter_fixed_layout_new (void);
 G_END_DECLS
--- a/clutter/clutter/clutter-flatten-effect.c
+++ b/clutter/clutter/clutter-flatten-effect.c
@@ -27,9 +27,7 @@
   need to do anything on top of the ClutterOffscreenEffect class so
   it only exists because that class is abstract */
 #ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
 #endif
 #include "clutter-flatten-effect.h"
 #include "clutter-private.h"
--- a/clutter/clutter/clutter-flow-layout.c
+++ b/clutter/clutter/clutter-flow-layout.c
@@ -52,9 +52,7 @@
 * #ClutterFlowLayout is available since Clutter 1.2
 */
 #ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
 #endif
 #include <math.h>
--- a/clutter/clutter/clutter-flow-layout.h
+++ b/clutter/clutter/clutter-flow-layout.h
@@ -74,54 +74,54 @@ struct _ClutterFlowLayoutClass
  ClutterLayoutManagerClass parent_class;
 };
-CLUTTER_AVAILABLE_IN_1_2
+CLUTTER_EXPORT
 GType clutter_flow_layout_get_type (void) G_GNUC_CONST;
-CLUTTER_AVAILABLE_IN_1_2
+CLUTTER_EXPORT
 ClutterLayoutManager * clutter_flow_layout_new                (ClutterFlowOrientation  orientation);
-CLUTTER_AVAILABLE_IN_1_2
+CLUTTER_EXPORT
 void                   clutter_flow_layout_set_orientation    (ClutterFlowLayout      *layout,
                                                               ClutterFlowOrientation  orientation);
-CLUTTER_AVAILABLE_IN_1_2
+CLUTTER_EXPORT
 ClutterFlowOrientation clutter_flow_layout_get_orientation    (ClutterFlowLayout      *layout);
-CLUTTER_AVAILABLE_IN_1_2
+CLUTTER_EXPORT
 void                   clutter_flow_layout_set_homogeneous    (ClutterFlowLayout      *layout,
                                                               gboolean                homogeneous);
-CLUTTER_AVAILABLE_IN_1_2
+CLUTTER_EXPORT
 gboolean               clutter_flow_layout_get_homogeneous    (ClutterFlowLayout      *layout);
-CLUTTER_AVAILABLE_IN_1_2
+CLUTTER_EXPORT
 void                   clutter_flow_layout_set_column_spacing (ClutterFlowLayout      *layout,
                                                               gfloat                  spacing);
-CLUTTER_AVAILABLE_IN_1_2
+CLUTTER_EXPORT
 gfloat                 clutter_flow_layout_get_column_spacing (ClutterFlowLayout      *layout);
-CLUTTER_AVAILABLE_IN_1_2
+CLUTTER_EXPORT
 void                   clutter_flow_layout_set_row_spacing    (ClutterFlowLayout      *layout,
                                                               gfloat                  spacing);
-CLUTTER_AVAILABLE_IN_1_2
+CLUTTER_EXPORT
 gfloat                 clutter_flow_layout_get_row_spacing    (ClutterFlowLayout      *layout);
-CLUTTER_AVAILABLE_IN_1_2
+CLUTTER_EXPORT
 void                   clutter_flow_layout_set_column_width   (ClutterFlowLayout      *layout,
                                                               gfloat                  min_width,
                                                               gfloat                  max_width);
-CLUTTER_AVAILABLE_IN_1_2
+CLUTTER_EXPORT
 void                   clutter_flow_layout_get_column_width   (ClutterFlowLayout      *layout,
                                                               gfloat                 *min_width,
                                                               gfloat                 *max_width);
-CLUTTER_AVAILABLE_IN_1_2
+CLUTTER_EXPORT
 void                   clutter_flow_layout_set_row_height     (ClutterFlowLayout      *layout,
                                                               gfloat                  min_height,
                                                               gfloat                  max_height);
-CLUTTER_AVAILABLE_IN_1_2
+CLUTTER_EXPORT
 void                   clutter_flow_layout_get_row_height     (ClutterFlowLayout      *layout,
                                                               gfloat                 *min_height,
                                                               gfloat                 *max_height);
-CLUTTER_AVAILABLE_IN_1_16
+CLUTTER_EXPORT
 void                   clutter_flow_layout_set_snap_to_grid   (ClutterFlowLayout      *layout,
                                                               gboolean                snap_to_grid);
-CLUTTER_AVAILABLE_IN_1_16
+CLUTTER_EXPORT
 gboolean               clutter_flow_layout_get_snap_to_grid   (ClutterFlowLayout      *layout);
 G_END_DECLS
--- a/clutter/clutter/clutter-gesture-action.c
+++ b/clutter/clutter/clutter-gesture-action.c
@@ -83,9 +83,7 @@
 * Since: 1.8
 */
 #ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
 #endif
 #include "clutter-gesture-action-private.h"
--- a/clutter/clutter/clutter-gesture-action.h
+++ b/clutter/clutter/clutter-gesture-action.h
@@ -101,75 +101,75 @@ struct _ClutterGestureActionClass
  void (* _clutter_gesture_action6) (void);
 };
-CLUTTER_AVAILABLE_IN_1_8
+CLUTTER_EXPORT
 GType clutter_gesture_action_get_type (void) G_GNUC_CONST;
-CLUTTER_AVAILABLE_IN_1_8
+CLUTTER_EXPORT
 ClutterAction *        clutter_gesture_action_new                      (void);
-CLUTTER_AVAILABLE_IN_1_8
+CLUTTER_EXPORT
 gint                   clutter_gesture_action_get_n_touch_points   (ClutterGestureAction *action);
-CLUTTER_AVAILABLE_IN_1_8
+CLUTTER_EXPORT
 void                   clutter_gesture_action_set_n_touch_points   (ClutterGestureAction *action,
                                                                    gint                  nb_points);
-CLUTTER_AVAILABLE_IN_1_8
+CLUTTER_EXPORT
 void                   clutter_gesture_action_get_press_coords     (ClutterGestureAction *action,
                                                                    guint                 point,
                                                                    gfloat               *press_x,
                                                                    gfloat               *press_y);
-CLUTTER_AVAILABLE_IN_1_8
+CLUTTER_EXPORT
 void                   clutter_gesture_action_get_motion_coords    (ClutterGestureAction *action,
                                                                    guint                 point,
                                                                    gfloat               *motion_x,
                                                                    gfloat               *motion_y);
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 gfloat                 clutter_gesture_action_get_motion_delta     (ClutterGestureAction *action,
                                                                    guint                 point,
                                                                    gfloat               *delta_x,
                                                                    gfloat               *delta_y);
-CLUTTER_AVAILABLE_IN_1_8
+CLUTTER_EXPORT
 void                   clutter_gesture_action_get_release_coords   (ClutterGestureAction *action,
                                                                    guint                 point,
                                                                    gfloat               *release_x,
                                                                    gfloat               *release_y);
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 gfloat                 clutter_gesture_action_get_velocity         (ClutterGestureAction *action,
                                                                    guint                 point,
                                                                    gfloat               *velocity_x,
                                                                    gfloat               *velocity_y);
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 guint                  clutter_gesture_action_get_n_current_points (ClutterGestureAction *action);
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 ClutterEventSequence * clutter_gesture_action_get_sequence         (ClutterGestureAction *action,
                                                                    guint                 point);
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 ClutterInputDevice *   clutter_gesture_action_get_device           (ClutterGestureAction *action,
                                                                    guint                 point);
-CLUTTER_AVAILABLE_IN_1_14
+CLUTTER_EXPORT
 const ClutterEvent *   clutter_gesture_action_get_last_event       (ClutterGestureAction *action,
                                                                    guint                 point);
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 void                   clutter_gesture_action_cancel               (ClutterGestureAction *action);
-CLUTTER_AVAILABLE_IN_1_18
+CLUTTER_EXPORT
 void                            clutter_gesture_action_set_threshold_trigger_edge       (ClutterGestureAction      *action,
                                                                                         ClutterGestureTriggerEdge  edge);
-CLUTTER_DEPRECATED_IN_1_20_FOR(clutter_gesture_action_get_threshold_trigger_edge)
+CLUTTER_DEPRECATED_FOR(clutter_gesture_action_get_threshold_trigger_edge)
 ClutterGestureTriggerEdge       clutter_gesture_action_get_threshold_trigger_egde       (ClutterGestureAction      *action);
-CLUTTER_AVAILABLE_IN_1_20
+CLUTTER_EXPORT
 ClutterGestureTriggerEdge       clutter_gesture_action_get_threshold_trigger_edge       (ClutterGestureAction      *action);
-CLUTTER_AVAILABLE_IN_1_18
+CLUTTER_EXPORT
 void                            clutter_gesture_action_set_threshold_trigger_distance   (ClutterGestureAction      *action,
                                                                                         float                      x,
                                                                                         float                      y);
-CLUTTER_AVAILABLE_IN_1_18
+CLUTTER_EXPORT
 void                            clutter_gesture_action_get_threshold_trigger_distance   (ClutterGestureAction *action,
                                                                                         float                *x,
                                                                                         float                *y);
--- a/clutter/clutter/clutter-grid-layout.c
+++ b/clutter/clutter/clutter-grid-layout.c
@@ -26,9 +26,7 @@
 *   Matthias Clasen
 */
 #ifdef HAVE_CONFIG_H
 #include "clutter-build-config.h"
 #endif
 #include <string.h>
 #include <math.h>
--- a/clutter/clutter/clutter-grid-layout.h
+++ b/clutter/clutter/clutter-grid-layout.h
@@ -80,13 +80,13 @@ struct _ClutterGridLayoutClass
  gpointer _padding[8];
 };
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 GType clutter_grid_layout_get_type (void) G_GNUC_CONST;
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 ClutterLayoutManager *  clutter_grid_layout_new                 (void);
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 void                clutter_grid_layout_attach                      (ClutterGridLayout *layout,
                                                                     ClutterActor      *child,
                                                                     gint               left,
@@ -94,7 +94,7 @@ void                clutter_grid_layout_attach                      (ClutterGrid
                                                                     gint               width,
                                                                     gint               height);
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 void                clutter_grid_layout_attach_next_to              (ClutterGridLayout   *layout,
                                                                     ClutterActor        *child,
                                                                     ClutterActor        *sibling,
@@ -102,58 +102,58 @@ void                clutter_grid_layout_attach_next_to              (ClutterGrid
                                                                     gint                 width,
                                                                     gint                 height);
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 ClutterActor *      clutter_grid_layout_get_child_at                (ClutterGridLayout *layout,
                                                                     gint               left,
                                                                     gint               top);
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 void                clutter_grid_layout_insert_row                  (ClutterGridLayout *layout,
                                                                     gint               position);
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 void                clutter_grid_layout_insert_column               (ClutterGridLayout *layout,
                                                                     gint               position);
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 void                clutter_grid_layout_insert_next_to              (ClutterGridLayout   *layout,
                                                                     ClutterActor        *sibling,
                                                                     ClutterGridPosition  side);
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 void                clutter_grid_layout_set_orientation             (ClutterGridLayout *layout,
                                                                     ClutterOrientation orientation);
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 ClutterOrientation  clutter_grid_layout_get_orientation             (ClutterGridLayout *layout);
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 void                clutter_grid_layout_set_column_spacing          (ClutterGridLayout *layout,
                                                                     guint              spacing);
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 guint               clutter_grid_layout_get_column_spacing          (ClutterGridLayout *layout);
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 void                clutter_grid_layout_set_row_spacing             (ClutterGridLayout *layout,
                                                                     guint              spacing);
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 guint               clutter_grid_layout_get_row_spacing             (ClutterGridLayout *layout);
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 void                clutter_grid_layout_set_column_homogeneous      (ClutterGridLayout *layout,
                                                                     gboolean           homogeneous);
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 gboolean            clutter_grid_layout_get_column_homogeneous      (ClutterGridLayout *layout);
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 void                clutter_grid_layout_set_row_homogeneous         (ClutterGridLayout *layout,
                                                                     gboolean           homogeneous);
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 gboolean            clutter_grid_layout_get_row_homogeneous         (ClutterGridLayout *layout);
 G_END_DECLS
--- a/Show More
+++ b/Show More