[mutter] clutter: Remove clutter specific version



commit 8c0e13ca7a90678af1d67cc6a723089db02aeb98
Author: Jonas Ådahl <jadahl gmail com>
Date:   Tue May 22 23:01:54 2018 +0200

    clutter: Remove clutter specific version
    
    Use the mutter version when something is still needed.

 clutter/.gitignore                                 |   1 -
 clutter/clutter/Makefile.am                        |   6 +-
 clutter/clutter/cally/cally-actor.h                |  12 +-
 clutter/clutter/cally/cally-clone.h                |   4 +-
 clutter/clutter/cally/cally-group.h                |   4 +-
 clutter/clutter/cally/cally-main.h                 |   4 +-
 clutter/clutter/cally/cally-rectangle.h            |   4 +-
 clutter/clutter/cally/cally-root.h                 |   4 +-
 clutter/clutter/cally/cally-stage.h                |   4 +-
 clutter/clutter/cally/cally-text.h                 |   4 +-
 clutter/clutter/cally/cally-texture.h              |   4 +-
 clutter/clutter/cally/cally-util.c                 |   2 +-
 clutter/clutter/cally/cally-util.h                 |   2 +-
 clutter/clutter/clutter-action.h                   |  18 +-
 clutter/clutter/clutter-actor-meta.h               |  12 +-
 clutter/clutter/clutter-actor.h                    | 378 ++++++++++-----------
 clutter/clutter/clutter-align-constraint.h         |  16 +-
 clutter/clutter/clutter-animatable.h               |  10 +-
 clutter/clutter/clutter-backend-private.h          |   4 +-
 clutter/clutter/clutter-backend.c                  |   1 -
 clutter/clutter/clutter-backend.h                  |  20 +-
 clutter/clutter/clutter-bin-layout.h               |   4 +-
 clutter/clutter/clutter-bind-constraint.h          |  16 +-
 clutter/clutter/clutter-binding-pool.h             |  26 +-
 clutter/clutter/clutter-blur-effect.h              |   4 +-
 clutter/clutter/clutter-box-layout.h               |  50 +--
 .../clutter/clutter-brightness-contrast-effect.h   |  16 +-
 clutter/clutter/clutter-cairo.h                    |   4 +-
 clutter/clutter/clutter-canvas.h                   |  10 +-
 clutter/clutter/clutter-child-meta.h               |   6 +-
 clutter/clutter/clutter-click-action.h             |  12 +-
 clutter/clutter/clutter-clone.h                    |   8 +-
 clutter/clutter/clutter-color.h                    |  50 +--
 clutter/clutter/clutter-colorize-effect.h          |   8 +-
 clutter/clutter/clutter-constraint.h               |  18 +-
 clutter/clutter/clutter-container.h                |  24 +-
 clutter/clutter/clutter-content.h                  |   6 +-
 clutter/clutter/clutter-deform-effect.h            |  12 +-
 clutter/clutter/clutter-desaturate-effect.h        |   8 +-
 clutter/clutter/clutter-device-manager.h           |  20 +-
 clutter/clutter/clutter-drag-action.h              |  24 +-
 clutter/clutter/clutter-drop-action.h              |   4 +-
 clutter/clutter/clutter-effect.h                   |  20 +-
 clutter/clutter/clutter-enum-types.h.in            |   2 +-
 clutter/clutter/clutter-event-translator.h         |   2 +-
 clutter/clutter/clutter-event.h                    | 134 ++++----
 clutter/clutter/clutter-feature.h                  |   4 +-
 clutter/clutter/clutter-fixed-layout.h             |   4 +-
 clutter/clutter/clutter-flow-layout.h              |  32 +-
 clutter/clutter/clutter-gesture-action.h           |  38 +--
 clutter/clutter/clutter-grid-layout.h              |  36 +-
 clutter/clutter/clutter-group.h                    |   2 +-
 clutter/clutter/clutter-image.h                    |  14 +-
 clutter/clutter/clutter-input-device-tool.h        |   8 +-
 clutter/clutter/clutter-input-device.h             |  80 ++---
 clutter/clutter/clutter-input-focus.h              |  20 +-
 clutter/clutter/clutter-input-method.h             |  20 +-
 clutter/clutter/clutter-interval.h                 |  38 +--
 clutter/clutter/clutter-keyframe-transition.h      |  20 +-
 clutter/clutter/clutter-layout-manager.h           |  32 +-
 clutter/clutter/clutter-layout-meta.h              |   4 +-
 clutter/clutter/clutter-macros.h                   | 271 +--------------
 clutter/clutter/clutter-main.c                     |  35 --
 clutter/clutter/clutter-main.h                     |  65 ++--
 clutter/clutter/clutter-mutter.h                   |   8 +-
 clutter/clutter/clutter-offscreen-effect.h         |  14 +-
 clutter/clutter/clutter-page-turn-effect.h         |  16 +-
 clutter/clutter/clutter-paint-node.h               |  26 +-
 clutter/clutter/clutter-paint-nodes.h              |  20 +-
 clutter/clutter/clutter-pan-action.h               |  30 +-
 clutter/clutter/clutter-path-constraint.h          |  12 +-
 clutter/clutter/clutter-path.h                     |  52 +--
 clutter/clutter/clutter-property-transition.h      |   8 +-
 clutter/clutter/clutter-rotate-action.h            |   4 +-
 clutter/clutter/clutter-script.h                   |  42 +--
 clutter/clutter/clutter-scriptable.h               |  10 +-
 clutter/clutter/clutter-scroll-actor.h             |  12 +-
 clutter/clutter/clutter-settings.h                 |   4 +-
 clutter/clutter/clutter-shader-effect.h            |  14 +-
 clutter/clutter/clutter-shader-types.h             |  18 +-
 clutter/clutter/clutter-snap-constraint.h          |  16 +-
 clutter/clutter/clutter-stage-manager.c            |   1 -
 clutter/clutter/clutter-stage-manager.h            |  10 +-
 clutter/clutter/clutter-stage-view.h               |  16 +-
 clutter/clutter/clutter-stage-window.h             |   2 +-
 clutter/clutter/clutter-stage.c                    |   1 -
 clutter/clutter/clutter-stage.h                    |  74 ++--
 clutter/clutter/clutter-swipe-action.h             |   4 +-
 clutter/clutter/clutter-tap-action.h               |   4 +-
 clutter/clutter/clutter-test-utils.h               |  16 +-
 clutter/clutter/clutter-text-buffer.h              |  26 +-
 clutter/clutter/clutter-text.h                     | 152 ++++-----
 clutter/clutter/clutter-texture.h                  |   4 +-
 clutter/clutter/clutter-timeline.h                 |  74 ++--
 clutter/clutter/clutter-transition-group.h         |  10 +-
 clutter/clutter/clutter-transition.h               |  22 +-
 clutter/clutter/clutter-types.h                    | 198 +++++------
 clutter/clutter/clutter-units.h                    |  36 +-
 clutter/clutter/clutter-version.h.in               | 347 -------------------
 clutter/clutter/clutter-virtual-input-device.h     |  24 +-
 clutter/clutter/clutter-zoom-action.h              |  12 +-
 clutter/clutter/clutter.h                          |   1 -
 clutter/clutter/cogl/clutter-stage-cogl.h          |   6 +-
 clutter/clutter/deprecated/clutter-actor.h         |  66 ++--
 clutter/clutter/deprecated/clutter-alpha.h         |  26 +-
 clutter/clutter/deprecated/clutter-animatable.h    |   2 +-
 clutter/clutter/deprecated/clutter-animation.h     |  60 ++--
 clutter/clutter/deprecated/clutter-animator.h      |  46 +--
 clutter/clutter/deprecated/clutter-backend.h       |  14 +-
 .../clutter/deprecated/clutter-behaviour-depth.h   |   8 +-
 .../clutter/deprecated/clutter-behaviour-ellipse.h |  36 +-
 .../clutter/deprecated/clutter-behaviour-opacity.h |   8 +-
 .../clutter/deprecated/clutter-behaviour-path.h    |  12 +-
 .../clutter/deprecated/clutter-behaviour-rotate.h  |  20 +-
 .../clutter/deprecated/clutter-behaviour-scale.h   |   8 +-
 clutter/clutter/deprecated/clutter-behaviour.h     |  22 +-
 clutter/clutter/deprecated/clutter-bin-layout.h    |   6 +-
 clutter/clutter/deprecated/clutter-box.h           |  22 +-
 clutter/clutter/deprecated/clutter-cairo-texture.h |  22 +-
 clutter/clutter/deprecated/clutter-container.h     |  24 +-
 clutter/clutter/deprecated/clutter-frame-source.h  |   4 +-
 clutter/clutter/deprecated/clutter-group.h         |   8 +-
 clutter/clutter/deprecated/clutter-input-device.h  |   2 +-
 clutter/clutter/deprecated/clutter-list-model.h    |   6 +-
 clutter/clutter/deprecated/clutter-main.h          |  36 +-
 clutter/clutter/deprecated/clutter-media.h         |  34 +-
 clutter/clutter/deprecated/clutter-model.h         |  82 ++---
 clutter/clutter/deprecated/clutter-rectangle.h     |  18 +-
 clutter/clutter/deprecated/clutter-score.h         |  30 +-
 clutter/clutter/deprecated/clutter-shader.h        |  42 +--
 clutter/clutter/deprecated/clutter-stage-manager.h |   2 +-
 clutter/clutter/deprecated/clutter-stage.h         |  20 +-
 clutter/clutter/deprecated/clutter-state.h         |  50 +--
 clutter/clutter/deprecated/clutter-table-layout.h  |  46 +--
 clutter/clutter/deprecated/clutter-texture.h       |  54 +--
 clutter/clutter/deprecated/clutter-timeline.h      |   6 +-
 clutter/clutter/deprecated/clutter-timeout-pool.h  |   6 +-
 clutter/clutter/deprecated/clutter-util.h          |   2 +-
 clutter/clutter/egl/clutter-backend-eglnative.h    |   2 +-
 clutter/clutter/egl/clutter-egl.h                  |   6 +-
 clutter/clutter/evdev/clutter-evdev.h              |  44 +--
 .../clutter/wayland/clutter-wayland-compositor.h   |   2 +-
 clutter/clutter/wayland/clutter-wayland-surface.h  |  14 +-
 clutter/clutter/x11/clutter-backend-x11.h          |   2 +-
 clutter/clutter/x11/clutter-stage-x11.h            |   2 +-
 clutter/clutter/x11/clutter-x11-texture-pixmap.h   |  18 +-
 clutter/clutter/x11/clutter-x11.h                  |  52 +--
 clutter/configure.ac                               |  76 +----
 148 files changed, 1706 insertions(+), 2433 deletions(-)
---
diff --git a/clutter/.gitignore b/clutter/.gitignore
index 362a24379..77be91036 100644
--- 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
diff --git a/clutter/clutter/Makefile.am b/clutter/clutter/Makefile.am
index 916b31d3f..cc6ab63ad 100644
--- a/clutter/clutter/Makefile.am
+++ b/clutter/clutter/Makefile.am
@@ -355,10 +355,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
 
@@ -585,7 +581,7 @@ 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)
diff --git a/clutter/clutter/cally/cally-actor.h b/clutter/clutter/cally/cally-actor.h
index c17c26ea6..f67bcafb2 100644
--- 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);
 
diff --git a/clutter/clutter/cally/cally-clone.h b/clutter/clutter/cally/cally-clone.h
index 3a3777035..24b0def86 100644
--- 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
diff --git a/clutter/clutter/cally/cally-group.h b/clutter/clutter/cally/cally-group.h
index 4efd25902..d97240a9d 100644
--- 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
diff --git a/clutter/clutter/cally/cally-main.h b/clutter/clutter/cally/cally-main.h
index 62931979b..07d668b03 100644
--- 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
diff --git a/clutter/clutter/cally/cally-rectangle.h b/clutter/clutter/cally/cally-rectangle.h
index 0a205c5e6..db45a482a 100644
--- 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
diff --git a/clutter/clutter/cally/cally-root.h b/clutter/clutter/cally/cally-root.h
index 10674942f..16bba36ef 100644
--- 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
diff --git a/clutter/clutter/cally/cally-stage.h b/clutter/clutter/cally/cally-stage.h
index c95d2ca13..e8f676de5 100644
--- 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
diff --git a/clutter/clutter/cally/cally-text.h b/clutter/clutter/cally/cally-text.h
index ce3c0cba0..070ac9139 100644
--- 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
diff --git a/clutter/clutter/cally/cally-texture.h b/clutter/clutter/cally/cally-texture.h
index dad576c14..909a53333 100644
--- 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
diff --git a/clutter/clutter/cally/cally-util.c b/clutter/clutter/cally/cally-util.c
index ec6e89ed2..ebb69f8ee 100644
--- a/clutter/clutter/cally/cally-util.c
+++ b/clutter/clutter/cally/cally-util.c
@@ -142,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
diff --git a/clutter/clutter/cally/cally-util.h b/clutter/clutter/cally/cally-util.h
index 76f36be7e..dcc5deb1d 100644
--- 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);
diff --git a/clutter/clutter/clutter-action.h b/clutter/clutter/clutter-action.h
index fe9f19fbe..8a7f14abc 100644
--- 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
diff --git a/clutter/clutter/clutter-actor-meta.h b/clutter/clutter/clutter-actor-meta.h
index e954f36d4..ecc9523a9 100644
--- 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
diff --git a/clutter/clutter/clutter-actor.h b/clutter/clutter/clutter-actor.h
index 0c5a08c8c..a9db639eb 100644
--- 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,
diff --git a/clutter/clutter/clutter-align-constraint.h b/clutter/clutter/clutter-align-constraint.h
index 212be8bf5..2a42d8920 100644
--- 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
diff --git a/clutter/clutter/clutter-animatable.h b/clutter/clutter/clutter-animatable.h
index 7d20c5a57..951fdd7ac 100644
--- 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,
diff --git a/clutter/clutter/clutter-backend-private.h b/clutter/clutter/clutter-backend-private.h
index 864d896a3..b2103d10e 100644
--- 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);
diff --git a/clutter/clutter/clutter-backend.c b/clutter/clutter/clutter-backend.c
index 987af56e2..4172ed363 100644
--- a/clutter/clutter/clutter-backend.c
+++ b/clutter/clutter/clutter-backend.c
@@ -51,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
diff --git a/clutter/clutter/clutter-backend.h b/clutter/clutter/clutter-backend.h
index 78b04e349..6517381be 100644
--- 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
diff --git a/clutter/clutter/clutter-bin-layout.h b/clutter/clutter/clutter-bin-layout.h
index f823b70f6..fa826d628 100644
--- 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);
 
diff --git a/clutter/clutter/clutter-bind-constraint.h b/clutter/clutter/clutter-bind-constraint.h
index 523fb18d3..16bf47899 100644
--- 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
diff --git a/clutter/clutter/clutter-binding-pool.h b/clutter/clutter/clutter-binding-pool.h
index 2830d2711..dcf771d24 100644
--- 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);
 
diff --git a/clutter/clutter/clutter-blur-effect.h b/clutter/clutter/clutter-blur-effect.h
index 4e1b83ed2..0739a75bd 100644
--- 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
diff --git a/clutter/clutter/clutter-box-layout.h b/clutter/clutter/clutter-box-layout.h
index a5c085c1f..fdced8f41 100644
--- 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
diff --git a/clutter/clutter/clutter-brightness-contrast-effect.h 
b/clutter/clutter/clutter-brightness-contrast-effect.h
index 0d9094a19..d474ed5b8 100644
--- 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,
diff --git a/clutter/clutter/clutter-cairo.h b/clutter/clutter/clutter-cairo.h
index 9b2ad05a2..5fba04d10 100644
--- 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);
 
diff --git a/clutter/clutter/clutter-canvas.h b/clutter/clutter/clutter-canvas.h
index ed62dd4ee..92ddd352c 100644
--- 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
diff --git a/clutter/clutter/clutter-child-meta.h b/clutter/clutter/clutter-child-meta.h
index 02d9e9ad5..1c473bd32 100644
--- 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
diff --git a/clutter/clutter/clutter-click-action.h b/clutter/clutter/clutter-click-action.h
index 942efd0a0..c5ffdb2b7 100644
--- 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
diff --git a/clutter/clutter/clutter-clone.h b/clutter/clutter/clutter-clone.h
index 6cc503cac..ce4e6f43f 100644
--- 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
diff --git a/clutter/clutter/clutter-color.h b/clutter/clutter/clutter-color.h
index 913ed69aa..cff493789 100644
--- 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
diff --git a/clutter/clutter/clutter-colorize-effect.h b/clutter/clutter/clutter-colorize-effect.h
index f8f8436c0..92e878735 100644
--- 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);
 
diff --git a/clutter/clutter/clutter-constraint.h b/clutter/clutter/clutter-constraint.h
index aba07f6f4..f2ecd506a 100644
--- 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
diff --git a/clutter/clutter/clutter-container.h b/clutter/clutter/clutter-container.h
index 0fc3cefca..8a0708ff2 100644
--- 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);
diff --git a/clutter/clutter/clutter-content.h b/clutter/clutter/clutter-content.h
index 84bfa0ec3..69836d5a1 100644
--- 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
diff --git a/clutter/clutter/clutter-deform-effect.h b/clutter/clutter/clutter-deform-effect.h
index 08d0ca964..bc0fa210d 100644
--- 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
diff --git a/clutter/clutter/clutter-desaturate-effect.h b/clutter/clutter/clutter-desaturate-effect.h
index 58f10a498..b832dbaca 100644
--- 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
diff --git a/clutter/clutter/clutter-device-manager.h b/clutter/clutter/clutter-device-manager.h
index aebfc4b5d..1cbf0307b 100644
--- 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);
 
diff --git a/clutter/clutter/clutter-drag-action.h b/clutter/clutter/clutter-drag-action.h
index a11d7381e..c0df62238 100644
--- 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);
 
diff --git a/clutter/clutter/clutter-drop-action.h b/clutter/clutter/clutter-drop-action.h
index 2d2b40d1e..d3b973d96 100644
--- 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
diff --git a/clutter/clutter/clutter-effect.h b/clutter/clutter/clutter-effect.h
index 6cfc2f228..d25a63e29 100644
--- 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
diff --git a/clutter/clutter/clutter-enum-types.h.in b/clutter/clutter/clutter-enum-types.h.in
index aea757ed0..2e5b6707e 100644
--- 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 ***/
diff --git a/clutter/clutter/clutter-event-translator.h b/clutter/clutter/clutter-event-translator.h
index e784fd996..4cea6f05c 100644
--- 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,
diff --git a/clutter/clutter/clutter-event.h b/clutter/clutter/clutter-event.h
index eacdb54e6..6c57745a5 100644
--- 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,
diff --git a/clutter/clutter/clutter-feature.h b/clutter/clutter/clutter-feature.h
index 1427e2271..5c1b12449 100644
--- 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
diff --git a/clutter/clutter/clutter-fixed-layout.h b/clutter/clutter/clutter-fixed-layout.h
index 01a2fd6ed..d67e4a8d7 100644
--- 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
diff --git a/clutter/clutter/clutter-flow-layout.h b/clutter/clutter/clutter-flow-layout.h
index d44857be6..0980bc3cb 100644
--- 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
diff --git a/clutter/clutter/clutter-gesture-action.h b/clutter/clutter/clutter-gesture-action.h
index 46d3c4505..e73bf52bb 100644
--- 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);
diff --git a/clutter/clutter/clutter-grid-layout.h b/clutter/clutter/clutter-grid-layout.h
index c04a5ba4f..88603265d 100644
--- 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
diff --git a/clutter/clutter/clutter-group.h b/clutter/clutter/clutter-group.h
index 40f71bc74..7f8e5f346 100644
--- a/clutter/clutter/clutter-group.h
+++ b/clutter/clutter/clutter-group.h
@@ -88,7 +88,7 @@ struct _ClutterGroupClass
   void (*_clutter_reserved6) (void);
 };
 
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 GType clutter_group_get_type (void) G_GNUC_CONST;
 
 G_END_DECLS
diff --git a/clutter/clutter/clutter-image.h b/clutter/clutter/clutter-image.h
index 5a4d06307..5b413e729 100644
--- a/clutter/clutter/clutter-image.h
+++ b/clutter/clutter/clutter-image.h
@@ -100,14 +100,14 @@ struct _ClutterImageClass
   gpointer _padding[16];
 };
 
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 GQuark clutter_image_error_quark (void);
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 GType clutter_image_get_type (void) G_GNUC_CONST;
 
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 ClutterContent *        clutter_image_new               (void);
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 gboolean                clutter_image_set_data          (ClutterImage                 *image,
                                                          const guint8                 *data,
                                                          CoglPixelFormat               pixel_format,
@@ -115,14 +115,14 @@ gboolean                clutter_image_set_data          (ClutterImage
                                                          guint                         height,
                                                          guint                         row_stride,
                                                          GError                      **error);
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 gboolean                clutter_image_set_area          (ClutterImage                 *image,
                                                          const guint8                 *data,
                                                          CoglPixelFormat               pixel_format,
                                                          const cairo_rectangle_int_t  *rect,
                                                          guint                         row_stride,
                                                          GError                      **error);
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 gboolean                clutter_image_set_bytes         (ClutterImage                 *image,
                                                          GBytes                       *data,
                                                          CoglPixelFormat               pixel_format,
@@ -131,7 +131,7 @@ gboolean                clutter_image_set_bytes         (ClutterImage
                                                          guint                         row_stride,
                                                          GError                      **error);
 
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 CoglTexture *           clutter_image_get_texture       (ClutterImage                 *image);
 
 G_END_DECLS
diff --git a/clutter/clutter/clutter-input-device-tool.h b/clutter/clutter/clutter-input-device-tool.h
index 0b7beef5b..36c8add83 100644
--- a/clutter/clutter/clutter-input-device-tool.h
+++ b/clutter/clutter/clutter-input-device-tool.h
@@ -52,16 +52,16 @@ struct _ClutterInputDeviceToolClass
   GObjectClass parent_class;
 };
 
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 GType                      clutter_input_device_tool_get_type (void) G_GNUC_CONST;
 
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 guint64                    clutter_input_device_tool_get_serial    (ClutterInputDeviceTool *tool);
 
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 ClutterInputDeviceToolType clutter_input_device_tool_get_tool_type (ClutterInputDeviceTool *tool);
 
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 guint64                    clutter_input_device_tool_get_id        (ClutterInputDeviceTool *tool);
 
 G_END_DECLS
diff --git a/clutter/clutter/clutter-input-device.h b/clutter/clutter/clutter-input-device.h
index 3961b5027..c121fe12c 100644
--- a/clutter/clutter/clutter-input-device.h
+++ b/clutter/clutter/clutter-input-device.h
@@ -47,128 +47,128 @@ G_BEGIN_DECLS
  */
 typedef struct _ClutterInputDeviceClass ClutterInputDeviceClass;
 
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 GType clutter_input_device_get_type (void) G_GNUC_CONST;
 
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 ClutterInputDeviceType  clutter_input_device_get_device_type    (ClutterInputDevice  *device);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 gint                    clutter_input_device_get_device_id      (ClutterInputDevice  *device);
 
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 gboolean                clutter_input_device_get_coords        (ClutterInputDevice   *device,
                                                                 ClutterEventSequence *sequence,
                                                                 ClutterPoint         *point);
-CLUTTER_AVAILABLE_IN_1_16
+CLUTTER_EXPORT
 ClutterModifierType     clutter_input_device_get_modifier_state (ClutterInputDevice  *device);
-CLUTTER_AVAILABLE_IN_1_2
+CLUTTER_EXPORT
 ClutterActor *          clutter_input_device_get_pointer_actor  (ClutterInputDevice  *device);
-CLUTTER_AVAILABLE_IN_1_2
+CLUTTER_EXPORT
 ClutterStage *          clutter_input_device_get_pointer_stage  (ClutterInputDevice  *device);
-CLUTTER_AVAILABLE_IN_1_2
+CLUTTER_EXPORT
 const gchar *           clutter_input_device_get_device_name    (ClutterInputDevice  *device);
-CLUTTER_AVAILABLE_IN_1_2
+CLUTTER_EXPORT
 ClutterInputMode        clutter_input_device_get_device_mode    (ClutterInputDevice  *device);
-CLUTTER_AVAILABLE_IN_1_2
+CLUTTER_EXPORT
 gboolean                clutter_input_device_get_has_cursor     (ClutterInputDevice  *device);
-CLUTTER_AVAILABLE_IN_1_2
+CLUTTER_EXPORT
 void                    clutter_input_device_set_enabled        (ClutterInputDevice  *device,
                                                                  gboolean             enabled);
-CLUTTER_AVAILABLE_IN_1_2
+CLUTTER_EXPORT
 gboolean                clutter_input_device_get_enabled        (ClutterInputDevice  *device);
 
-CLUTTER_AVAILABLE_IN_1_2
+CLUTTER_EXPORT
 guint                   clutter_input_device_get_n_axes         (ClutterInputDevice  *device);
-CLUTTER_AVAILABLE_IN_1_2
+CLUTTER_EXPORT
 ClutterInputAxis        clutter_input_device_get_axis           (ClutterInputDevice  *device,
                                                                  guint                index_);
-CLUTTER_AVAILABLE_IN_1_2
+CLUTTER_EXPORT
 gboolean                clutter_input_device_get_axis_value     (ClutterInputDevice  *device,
                                                                  gdouble             *axes,
                                                                  ClutterInputAxis     axis,
                                                                  gdouble             *value);
 
-CLUTTER_AVAILABLE_IN_1_2
+CLUTTER_EXPORT
 guint                   clutter_input_device_get_n_keys         (ClutterInputDevice  *device);
-CLUTTER_AVAILABLE_IN_1_2
+CLUTTER_EXPORT
 void                    clutter_input_device_set_key            (ClutterInputDevice  *device,
                                                                  guint                index_,
                                                                  guint                keyval,
                                                                  ClutterModifierType  modifiers);
-CLUTTER_AVAILABLE_IN_1_2
+CLUTTER_EXPORT
 gboolean                clutter_input_device_get_key            (ClutterInputDevice  *device,
                                                                  guint                index_,
                                                                  guint               *keyval,
                                                                  ClutterModifierType *modifiers);
 
-CLUTTER_AVAILABLE_IN_1_2
+CLUTTER_EXPORT
 ClutterInputDevice *    clutter_input_device_get_associated_device (ClutterInputDevice *device);
-CLUTTER_AVAILABLE_IN_1_2
+CLUTTER_EXPORT
 GList *                 clutter_input_device_get_slave_devices  (ClutterInputDevice  *device);
 
-CLUTTER_AVAILABLE_IN_1_2
+CLUTTER_EXPORT
 void                    clutter_input_device_update_from_event  (ClutterInputDevice  *device,
                                                                  ClutterEvent        *event,
                                                                  gboolean             update_stage);
 
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 void                    clutter_input_device_grab               (ClutterInputDevice  *device,
                                                                  ClutterActor        *actor);
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 void                    clutter_input_device_ungrab             (ClutterInputDevice  *device);
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 ClutterActor *          clutter_input_device_get_grabbed_actor  (ClutterInputDevice  *device);
 
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 void                    clutter_input_device_sequence_grab      (ClutterInputDevice   *device,
                                                                  ClutterEventSequence *sequence,
                                                                  ClutterActor         *actor);
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 void                    clutter_input_device_sequence_ungrab    (ClutterInputDevice   *device,
                                                                  ClutterEventSequence *sequence);
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 ClutterActor *          clutter_input_device_sequence_get_grabbed_actor (ClutterInputDevice   *device,
                                                                          ClutterEventSequence *sequence);
 
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 gboolean                clutter_input_device_keycode_to_evdev   (ClutterInputDevice *device,
                                                                  guint               hardware_keycode,
                                                                  guint              *evdev_keycode);
 
-CLUTTER_AVAILABLE_IN_1_22
+CLUTTER_EXPORT
 const gchar *           clutter_input_device_get_vendor_id      (ClutterInputDevice *device);
-CLUTTER_AVAILABLE_IN_1_22
+CLUTTER_EXPORT
 const gchar *           clutter_input_device_get_product_id     (ClutterInputDevice *device);
 
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 gint                    clutter_input_device_get_n_rings        (ClutterInputDevice *device);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 gint                    clutter_input_device_get_n_strips       (ClutterInputDevice *device);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 gint                    clutter_input_device_get_n_mode_groups  (ClutterInputDevice *device);
 
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 gint                    clutter_input_device_get_group_n_modes  (ClutterInputDevice *device,
                                                                  gint                group);
 
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 gboolean                clutter_input_device_is_mode_switch_button (ClutterInputDevice *device,
                                                                     guint               group,
                                                                    guint               button);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 gint                    clutter_input_device_get_mode_switch_button_group (ClutterInputDevice *device,
                                                                            guint               button);
 
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 const gchar *           clutter_input_device_get_device_node    (ClutterInputDevice *device);
 
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 ClutterInputDeviceMapping clutter_input_device_get_mapping_mode (ClutterInputDevice *device);
 
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void                      clutter_input_device_set_mapping_mode (ClutterInputDevice        *device,
                                                                  ClutterInputDeviceMapping  mapping);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 gboolean                  clutter_input_device_is_grouped       (ClutterInputDevice *device,
                                                                  ClutterInputDevice *other_device);
 
diff --git a/clutter/clutter/clutter-input-focus.h b/clutter/clutter/clutter-input-focus.h
index a31521fb0..619060382 100644
--- a/clutter/clutter/clutter-input-focus.h
+++ b/clutter/clutter/clutter-input-focus.h
@@ -26,7 +26,7 @@
 
 #define CLUTTER_TYPE_INPUT_FOCUS (clutter_input_focus_get_type ())
 
-CLUTTER_AVAILABLE_IN_MUTTER
+CLUTTER_EXPORT
 G_DECLARE_DERIVABLE_TYPE (ClutterInputFocus, clutter_input_focus,
                           CLUTTER, INPUT_FOCUS, GObject)
 
@@ -51,33 +51,33 @@ struct _ClutterInputFocusClass
                              guint              cursor);
 };
 
-CLUTTER_AVAILABLE_IN_MUTTER
+CLUTTER_EXPORT
 gboolean clutter_input_focus_is_focused (ClutterInputFocus *focus);
 
-CLUTTER_AVAILABLE_IN_MUTTER
+CLUTTER_EXPORT
 void clutter_input_focus_reset (ClutterInputFocus *focus);
-CLUTTER_AVAILABLE_IN_MUTTER
+CLUTTER_EXPORT
 void clutter_input_focus_set_cursor_location (ClutterInputFocus *focus,
                                               const ClutterRect *rect);
 
-CLUTTER_AVAILABLE_IN_MUTTER
+CLUTTER_EXPORT
 void clutter_input_focus_set_surrounding (ClutterInputFocus *focus,
                                           const gchar       *text,
                                           guint              cursor,
                                           guint              anchor);
-CLUTTER_AVAILABLE_IN_MUTTER
+CLUTTER_EXPORT
 void clutter_input_focus_set_content_hints (ClutterInputFocus            *focus,
                                             ClutterInputContentHintFlags  hint);
-CLUTTER_AVAILABLE_IN_MUTTER
+CLUTTER_EXPORT
 void clutter_input_focus_set_content_purpose (ClutterInputFocus          *focus,
                                               ClutterInputContentPurpose  purpose);
-CLUTTER_AVAILABLE_IN_MUTTER
+CLUTTER_EXPORT
 gboolean clutter_input_focus_filter_key_event (ClutterInputFocus     *focus,
                                                const ClutterKeyEvent *key);
-CLUTTER_AVAILABLE_IN_MUTTER
+CLUTTER_EXPORT
 void clutter_input_focus_set_can_show_preedit (ClutterInputFocus *focus,
                                                gboolean           can_show_preedit);
-CLUTTER_AVAILABLE_IN_MUTTER
+CLUTTER_EXPORT
 void clutter_input_focus_request_toggle_input_panel (ClutterInputFocus *focus);
 
 #endif /* __CLUTTER_INPUT_FOCUS_H__ */
diff --git a/clutter/clutter/clutter-input-method.h b/clutter/clutter/clutter-input-method.h
index 3aa549e24..be0dee7b6 100644
--- a/clutter/clutter/clutter-input-method.h
+++ b/clutter/clutter/clutter-input-method.h
@@ -26,7 +26,7 @@
 
 #define CLUTTER_TYPE_INPUT_METHOD (clutter_input_method_get_type ())
 
-CLUTTER_AVAILABLE_IN_MUTTER
+CLUTTER_EXPORT
 G_DECLARE_DERIVABLE_TYPE (ClutterInputMethod, clutter_input_method,
                           CLUTTER, INPUT_METHOD, GObject)
 
@@ -57,35 +57,35 @@ struct _ClutterInputMethodClass
                                  const ClutterEvent *key);
 };
 
-CLUTTER_AVAILABLE_IN_MUTTER
+CLUTTER_EXPORT
 void clutter_input_method_focus_in  (ClutterInputMethod *im,
                                      ClutterInputFocus  *focus);
-CLUTTER_AVAILABLE_IN_MUTTER
+CLUTTER_EXPORT
 void clutter_input_method_focus_out (ClutterInputMethod *im);
 
-CLUTTER_AVAILABLE_IN_MUTTER
+CLUTTER_EXPORT
 void clutter_input_method_commit (ClutterInputMethod *im,
                                   const gchar        *text);
-CLUTTER_AVAILABLE_IN_MUTTER
+CLUTTER_EXPORT
 void clutter_input_method_delete_surrounding (ClutterInputMethod *im,
                                               guint               offset,
                                               guint               len);
-CLUTTER_AVAILABLE_IN_MUTTER
+CLUTTER_EXPORT
 void clutter_input_method_request_surrounding (ClutterInputMethod *im);
 
-CLUTTER_AVAILABLE_IN_MUTTER
+CLUTTER_EXPORT
 void clutter_input_method_set_preedit_text (ClutterInputMethod *im,
                                             const gchar        *preedit,
                                             guint               cursor);
 
-CLUTTER_AVAILABLE_IN_MUTTER
+CLUTTER_EXPORT
 void clutter_input_method_notify_key_event (ClutterInputMethod *im,
                                             const ClutterEvent *event,
                                             gboolean            filtered);
-CLUTTER_AVAILABLE_IN_MUTTER
+CLUTTER_EXPORT
 void clutter_input_method_request_toggle_input_panel (ClutterInputMethod *im);
 
-CLUTTER_AVAILABLE_IN_MUTTER
+CLUTTER_EXPORT
 void clutter_input_method_forward_key (ClutterInputMethod *im,
                                        uint32_t            keyval,
                                        uint32_t            keycode,
diff --git a/clutter/clutter/clutter-interval.h b/clutter/clutter/clutter-interval.h
index f3d62cbcf..99b0cc099 100644
--- a/clutter/clutter/clutter-interval.h
+++ b/clutter/clutter/clutter-interval.h
@@ -92,66 +92,66 @@ struct _ClutterIntervalClass
   void (*_clutter_reserved6) (void);
 };
 
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 GType            clutter_interval_get_type           (void) G_GNUC_CONST;
 
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 ClutterInterval *clutter_interval_new                (GType            gtype,
                                                       ...);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 ClutterInterval *clutter_interval_new_with_values    (GType            gtype,
                                                       const GValue    *initial,
                                                       const GValue    *final);
 
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 ClutterInterval *clutter_interval_clone              (ClutterInterval *interval);
 
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 GType            clutter_interval_get_value_type     (ClutterInterval *interval);
 
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 void             clutter_interval_set_initial        (ClutterInterval *interval,
                                                       ...);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 void             clutter_interval_set_initial_value  (ClutterInterval *interval,
                                                       const GValue    *value);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 void             clutter_interval_get_initial_value  (ClutterInterval *interval,
                                                       GValue          *value);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 GValue *         clutter_interval_peek_initial_value (ClutterInterval *interval);
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 void             clutter_interval_set_final          (ClutterInterval *interval,
                                                       ...);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 void             clutter_interval_set_final_value    (ClutterInterval *interval,
                                                       const GValue    *value);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 void             clutter_interval_get_final_value    (ClutterInterval *interval,
                                                       GValue          *value);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 GValue *         clutter_interval_peek_final_value   (ClutterInterval *interval);
 
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 void             clutter_interval_set_interval       (ClutterInterval *interval,
                                                       ...);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 void             clutter_interval_get_interval       (ClutterInterval *interval,
                                                       ...);
 
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 gboolean         clutter_interval_validate           (ClutterInterval *interval,
                                                       GParamSpec      *pspec);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 gboolean         clutter_interval_compute_value      (ClutterInterval *interval,
                                                       gdouble          factor,
                                                       GValue          *value);
 
-CLUTTER_AVAILABLE_IN_1_4
+CLUTTER_EXPORT
 const GValue *   clutter_interval_compute            (ClutterInterval *interval,
                                                       gdouble          factor);
 
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 gboolean         clutter_interval_is_valid           (ClutterInterval *interval);
 
 G_END_DECLS
diff --git a/clutter/clutter/clutter-keyframe-transition.h b/clutter/clutter/clutter-keyframe-transition.h
index d0fe84e01..2b3746f71 100644
--- a/clutter/clutter/clutter-keyframe-transition.h
+++ b/clutter/clutter/clutter-keyframe-transition.h
@@ -75,46 +75,46 @@ struct _ClutterKeyframeTransitionClass
   gpointer _padding[8];
 };
 
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 GType clutter_keyframe_transition_get_type (void) G_GNUC_CONST;
 
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 ClutterTransition *     clutter_keyframe_transition_new                 (const char *property_name);
 
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 void                    clutter_keyframe_transition_set_key_frames      (ClutterKeyframeTransition  
*transition,
                                                                          guint                       
n_key_frames,
                                                                          const double               
*key_frames);
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 void                    clutter_keyframe_transition_set_values          (ClutterKeyframeTransition  
*transition,
                                                                          guint                       
n_values,
                                                                          const GValue               *values);
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 void                    clutter_keyframe_transition_set_modes           (ClutterKeyframeTransition  
*transition,
                                                                          guint                       n_modes,
                                                                          const ClutterAnimationMode *modes);
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 void                    clutter_keyframe_transition_set                 (ClutterKeyframeTransition  
*transition,
                                                                          GType                       gtype,
                                                                          guint                       
n_key_frames,
                                                                          ...);
 
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 void                    clutter_keyframe_transition_set_key_frame       (ClutterKeyframeTransition  
*transition,
                                                                          guint                       index_,
                                                                          double                      key,
                                                                          ClutterAnimationMode        mode,
                                                                          const GValue               *value);
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 void                    clutter_keyframe_transition_get_key_frame       (ClutterKeyframeTransition  
*transition,
                                                                          guint                       index_,
                                                                          double                     *key,
                                                                          ClutterAnimationMode       *mode,
                                                                          GValue                     *value);
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 guint                   clutter_keyframe_transition_get_n_key_frames    (ClutterKeyframeTransition  
*transition);
 
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 void                    clutter_keyframe_transition_clear               (ClutterKeyframeTransition  
*transition);
 
 G_END_DECLS
diff --git a/clutter/clutter/clutter-layout-manager.h b/clutter/clutter/clutter-layout-manager.h
index 8bb909991..352a2257c 100644
--- a/clutter/clutter/clutter-layout-manager.h
+++ b/clutter/clutter/clutter-layout-manager.h
@@ -149,77 +149,77 @@ struct _ClutterLayoutManagerClass
   void (* _clutter_padding_8) (void);
 };
 
-CLUTTER_AVAILABLE_IN_1_2
+CLUTTER_EXPORT
 GType clutter_layout_manager_get_type (void) G_GNUC_CONST;
 
-CLUTTER_AVAILABLE_IN_1_2
+CLUTTER_EXPORT
 void               clutter_layout_manager_get_preferred_width   (ClutterLayoutManager   *manager,
                                                                  ClutterContainer       *container,
                                                                  gfloat                  for_height,
                                                                  gfloat                 *min_width_p,
                                                                  gfloat                 *nat_width_p);
-CLUTTER_AVAILABLE_IN_1_2
+CLUTTER_EXPORT
 void               clutter_layout_manager_get_preferred_height  (ClutterLayoutManager   *manager,
                                                                  ClutterContainer       *container,
                                                                  gfloat                  for_width,
                                                                  gfloat                 *min_height_p,
                                                                  gfloat                 *nat_height_p);
-CLUTTER_AVAILABLE_IN_1_2
+CLUTTER_EXPORT
 void               clutter_layout_manager_allocate              (ClutterLayoutManager   *manager,
                                                                  ClutterContainer       *container,
                                                                  const ClutterActorBox  *allocation,
                                                                  ClutterAllocationFlags  flags);
 
-CLUTTER_AVAILABLE_IN_1_2
+CLUTTER_EXPORT
 void               clutter_layout_manager_set_container         (ClutterLayoutManager   *manager,
                                                                  ClutterContainer       *container);
-CLUTTER_AVAILABLE_IN_1_2
+CLUTTER_EXPORT
 void               clutter_layout_manager_layout_changed        (ClutterLayoutManager   *manager);
 
-CLUTTER_AVAILABLE_IN_1_2
+CLUTTER_EXPORT
 GParamSpec *       clutter_layout_manager_find_child_property   (ClutterLayoutManager   *manager,
                                                                  const gchar            *name);
-CLUTTER_AVAILABLE_IN_1_2
+CLUTTER_EXPORT
 GParamSpec **      clutter_layout_manager_list_child_properties (ClutterLayoutManager   *manager,
                                                                  guint                  *n_pspecs);
 
-CLUTTER_AVAILABLE_IN_1_2
+CLUTTER_EXPORT
 ClutterLayoutMeta *clutter_layout_manager_get_child_meta        (ClutterLayoutManager   *manager,
                                                                  ClutterContainer       *container,
                                                                  ClutterActor           *actor);
 
-CLUTTER_AVAILABLE_IN_1_2
+CLUTTER_EXPORT
 void               clutter_layout_manager_child_set             (ClutterLayoutManager   *manager,
                                                                  ClutterContainer       *container,
                                                                  ClutterActor           *actor,
                                                                  const gchar            *first_property,
                                                                  ...) G_GNUC_NULL_TERMINATED;
-CLUTTER_AVAILABLE_IN_1_2
+CLUTTER_EXPORT
 void               clutter_layout_manager_child_get             (ClutterLayoutManager   *manager,
                                                                  ClutterContainer       *container,
                                                                  ClutterActor           *actor,
                                                                  const gchar            *first_property,
                                                                  ...) G_GNUC_NULL_TERMINATED;
-CLUTTER_AVAILABLE_IN_1_2
+CLUTTER_EXPORT
 void               clutter_layout_manager_child_set_property    (ClutterLayoutManager   *manager,
                                                                  ClutterContainer       *container,
                                                                  ClutterActor           *actor,
                                                                  const gchar            *property_name,
                                                                  const GValue           *value);
-CLUTTER_AVAILABLE_IN_1_2
+CLUTTER_EXPORT
 void               clutter_layout_manager_child_get_property    (ClutterLayoutManager   *manager,
                                                                  ClutterContainer       *container,
                                                                  ClutterActor           *actor,
                                                                  const gchar            *property_name,
                                                                  GValue                 *value);
 
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 ClutterAlpha *     clutter_layout_manager_begin_animation       (ClutterLayoutManager   *manager,
                                                                  guint                   duration,
                                                                  gulong                  mode);
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 void               clutter_layout_manager_end_animation         (ClutterLayoutManager   *manager);
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 gdouble            clutter_layout_manager_get_animation_progress (ClutterLayoutManager   *manager);
 
 G_END_DECLS
diff --git a/clutter/clutter/clutter-layout-meta.h b/clutter/clutter/clutter-layout-meta.h
index 6de0b479d..a4f6abe92 100644
--- a/clutter/clutter/clutter-layout-meta.h
+++ b/clutter/clutter/clutter-layout-meta.h
@@ -92,10 +92,10 @@ struct _ClutterLayoutMetaClass
   void (*_clutter_padding4) (void);
 };
 
-CLUTTER_AVAILABLE_IN_1_2
+CLUTTER_EXPORT
 GType clutter_layout_meta_get_type (void) G_GNUC_CONST;
 
-CLUTTER_AVAILABLE_IN_1_2
+CLUTTER_EXPORT
 ClutterLayoutManager *clutter_layout_meta_get_manager (ClutterLayoutMeta *data);
 
 G_END_DECLS
diff --git a/clutter/clutter/clutter-macros.h b/clutter/clutter/clutter-macros.h
index 21cb3044e..705d8b906 100644
--- a/clutter/clutter/clutter-macros.h
+++ b/clutter/clutter/clutter-macros.h
@@ -26,8 +26,6 @@
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#include <clutter/clutter-version.h>
-
 /**
  * CLUTTER_FLAVOUR:
  *
@@ -115,281 +113,18 @@
 #ifdef CLUTTER_DISABLE_DEPRECATION_WARNINGS
 #define CLUTTER_DEPRECATED _CLUTTER_EXTERN
 #define CLUTTER_DEPRECATED_FOR(f) _CLUTTER_EXTERN
-#define CLUTTER_UNAVAILABLE(maj,min) _CLUTTER_EXTERN
 #define CLUTTER_DEPRECATED_MACRO
 #define CLUTTER_DEPRECATED_MACRO_FOR(f)
 #else
 #define CLUTTER_DEPRECATED G_DEPRECATED _CLUTTER_EXTERN
 #define CLUTTER_DEPRECATED_FOR(f) G_DEPRECATED_FOR(f) _CLUTTER_EXTERN
-#define CLUTTER_UNAVAILABLE(maj,min) G_UNAVAILABLE(maj,min) _CLUTTER_EXTERN
 #define CLUTTER_DEPRECATED_MACRO _CLUTTER_DEPRECATED_MACRO
 #define CLUTTER_DEPRECATED_MACRO_FOR(f) _CLUTTER_DEPRECATED_MACRO_FOR(f)
 #endif
 
-#define CLUTTER_AVAILABLE_IN_ALL _CLUTTER_EXTERN
-
-#define CLUTTER_AVAILABLE_IN_MUTTER _CLUTTER_EXTERN
-
-/**
- * CLUTTER_VERSION_MIN_REQUIRED:
- *
- * A macro that should be defined by the user prior to including the
- * clutter.h header.
- *
- * The definition should be one of the predefined Clutter version macros,
- * such as: %CLUTTER_VERSION_1_0, %CLUTTER_VERSION_1_2, ...
- *
- * This macro defines the lower bound for the Clutter API to be used.
- *
- * If a function has been deprecated in a newer version of Clutter, it
- * is possible to use this symbol to avoid the compiler warnings without
- * disabling warnings for every deprecated function.
- *
- * Since: 1.10
- */
-#ifndef CLUTTER_VERSION_MIN_REQUIRED
-# define CLUTTER_VERSION_MIN_REQUIRED   (CLUTTER_VERSION_CUR_STABLE)
-#endif
-
-/**
- * CLUTTER_VERSION_MAX_ALLOWED:
- *
- * A macro that should be define by the user prior to including the
- * clutter.h header.
- *
- * The definition should be one of the predefined Clutter version macros,
- * such as: %CLUTTER_VERSION_1_0, %CLUTTER_VERSION_1_2, ...
- *
- * This macro defines the upper bound for the Clutter API to be used.
- *
- * If a function has been introduced in a newer version of Clutter, it
- * is possible to use this symbol to get compiler warnings when trying
- * to use that function.
- *
- * Since: 1.10
- */
-#ifndef CLUTTER_VERSION_MAX_ALLOWED
-# if CLUTTER_VERSION_MIN_REQUIRED > CLUTTER_VERSION_PREV_STABLE
-#  define CLUTTER_VERSION_MAX_ALLOWED   CLUTTER_VERSION_MIN_REQUIRED
-# else
-#  define CLUTTER_VERSION_MAX_ALLOWED   CLUTTER_VERSION_CUR_STABLE
-# endif
-#endif
-
-/* sanity checks */
-#if CLUTTER_VERSION_MAX_ALLOWED < CLUTTER_VERSION_MIN_REQUIRED
-# error "CLUTTER_VERSION_MAX_ALLOWED must be >= CLUTTER_VERSION_MIN_REQUIRED"
-#endif
-#if CLUTTER_VERSION_MIN_REQUIRED < CLUTTER_VERSION_1_0
-# error "CLUTTER_VERSION_MIN_REQUIRED must be >= CLUTTER_VERSION_1_0"
-#endif
-
-/* XXX: Every new stable minor release should add a set of macros here */
-
-#if CLUTTER_VERSION_MIN_REQUIRED >= CLUTTER_VERSION_1_0
-# define CLUTTER_DEPRECATED_IN_1_0              CLUTTER_DEPRECATED
-# define CLUTTER_DEPRECATED_IN_1_0_FOR(f)       CLUTTER_DEPRECATED_FOR(f)
-#else
-# define CLUTTER_DEPRECATED_IN_1_0              _CLUTTER_EXTERN
-# define CLUTTER_DEPRECATED_IN_1_0_FOR(f)       _CLUTTER_EXTERN
-#endif
-
-#if CLUTTER_VERSION_MAX_ALLOWED < CLUTTER_VERSION_1_0
-# define CLUTTER_AVAILABLE_IN_1_0               CLUTTER_UNAVAILABLE(1, 0)
-#else
-# define CLUTTER_AVAILABLE_IN_1_0               _CLUTTER_EXTERN
-#endif
-
-#if CLUTTER_VERSION_MIN_REQUIRED >= CLUTTER_VERSION_1_2
-# define CLUTTER_DEPRECATED_IN_1_2              CLUTTER_DEPRECATED
-# define CLUTTER_DEPRECATED_IN_1_2_FOR(f)       CLUTTER_DEPRECATED_FOR(f)
-#else
-# define CLUTTER_DEPRECATED_IN_1_2              _CLUTTER_EXTERN
-# define CLUTTER_DEPRECATED_IN_1_2_FOR(f)       _CLUTTER_EXTERN
-#endif
-
-#if CLUTTER_VERSION_MAX_ALLOWED < CLUTTER_VERSION_1_2
-# define CLUTTER_AVAILABLE_IN_1_2               CLUTTER_UNAVAILABLE(1, 2)
-#else
-# define CLUTTER_AVAILABLE_IN_1_2               _CLUTTER_EXTERN
-#endif
-
-#if CLUTTER_VERSION_MIN_REQUIRED >= CLUTTER_VERSION_1_4
-# define CLUTTER_DEPRECATED_IN_1_4              CLUTTER_DEPRECATED
-# define CLUTTER_DEPRECATED_IN_1_4_FOR(f)       CLUTTER_DEPRECATED_FOR(f)
-#else
-# define CLUTTER_DEPRECATED_IN_1_4              _CLUTTER_EXTERN
-# define CLUTTER_DEPRECATED_IN_1_4_FOR(f)       _CLUTTER_EXTERN
-#endif
-
-#if CLUTTER_VERSION_MAX_ALLOWED < CLUTTER_VERSION_1_4
-# define CLUTTER_AVAILABLE_IN_1_4               CLUTTER_UNAVAILABLE(1, 4)
-#else
-# define CLUTTER_AVAILABLE_IN_1_4               _CLUTTER_EXTERN
-#endif
-
-#if CLUTTER_VERSION_MIN_REQUIRED >= CLUTTER_VERSION_1_6
-# define CLUTTER_DEPRECATED_IN_1_6              CLUTTER_DEPRECATED
-# define CLUTTER_DEPRECATED_IN_1_6_FOR(f)       CLUTTER_DEPRECATED_FOR(f)
-#else
-# define CLUTTER_DEPRECATED_IN_1_6              _CLUTTER_EXTERN
-# define CLUTTER_DEPRECATED_IN_1_6_FOR(f)       _CLUTTER_EXTERN
-#endif
-
-#if CLUTTER_VERSION_MAX_ALLOWED < CLUTTER_VERSION_1_6
-# define CLUTTER_AVAILABLE_IN_1_6               CLUTTER_UNAVAILABLE(1, 6)
-#else
-# define CLUTTER_AVAILABLE_IN_1_6               _CLUTTER_EXTERN
-#endif
-
-#if CLUTTER_VERSION_MIN_REQUIRED >= CLUTTER_VERSION_1_8
-# define CLUTTER_DEPRECATED_IN_1_8              CLUTTER_DEPRECATED
-# define CLUTTER_DEPRECATED_IN_1_8_FOR(f)       CLUTTER_DEPRECATED_FOR(f)
-#else
-# define CLUTTER_DEPRECATED_IN_1_8              _CLUTTER_EXTERN
-# define CLUTTER_DEPRECATED_IN_1_8_FOR(f)       _CLUTTER_EXTERN
-#endif
-
-#if CLUTTER_VERSION_MAX_ALLOWED < CLUTTER_VERSION_1_8
-# define CLUTTER_AVAILABLE_IN_1_8               CLUTTER_UNAVAILABLE(1, 8)
-#else
-# define CLUTTER_AVAILABLE_IN_1_8               _CLUTTER_EXTERN
-#endif
-
-#if CLUTTER_VERSION_MIN_REQUIRED >= CLUTTER_VERSION_1_10
-# define CLUTTER_DEPRECATED_IN_1_10             CLUTTER_DEPRECATED
-# define CLUTTER_DEPRECATED_IN_1_10_FOR(f)      CLUTTER_DEPRECATED_FOR(f)
-#else
-# define CLUTTER_DEPRECATED_IN_1_10             _CLUTTER_EXTERN
-# define CLUTTER_DEPRECATED_IN_1_10_FOR(f)      _CLUTTER_EXTERN
-#endif
-
-#if CLUTTER_VERSION_MAX_ALLOWED < CLUTTER_VERSION_1_10
-# define CLUTTER_AVAILABLE_IN_1_10              CLUTTER_UNAVAILABLE(1, 10)
-#else
-# define CLUTTER_AVAILABLE_IN_1_10              _CLUTTER_EXTERN
-#endif
-
-#if CLUTTER_VERSION_MIN_REQUIRED >= CLUTTER_VERSION_1_12
-# define CLUTTER_DEPRECATED_IN_1_12             CLUTTER_DEPRECATED
-# define CLUTTER_DEPRECATED_IN_1_12_FOR(f)      CLUTTER_DEPRECATED_FOR(f)
-#else
-# define CLUTTER_DEPRECATED_IN_1_12             _CLUTTER_EXTERN
-# define CLUTTER_DEPRECATED_IN_1_12_FOR(f)      _CLUTTER_EXTERN
-#endif
-
-#define CLUTTER_DEPRECATED_IN_MUTTER            CLUTTER_DEPRECATED
-
-#if CLUTTER_VERSION_MAX_ALLOWED < CLUTTER_VERSION_1_12
-# define CLUTTER_AVAILABLE_IN_1_12              CLUTTER_UNAVAILABLE(1, 12)
-#else
-# define CLUTTER_AVAILABLE_IN_1_12              _CLUTTER_EXTERN
-#endif
-
-#if CLUTTER_VERSION_MIN_REQUIRED >= CLUTTER_VERSION_1_14
-# define CLUTTER_DEPRECATED_IN_1_14             CLUTTER_DEPRECATED
-# define CLUTTER_DEPRECATED_IN_1_14_FOR(f)      CLUTTER_DEPRECATED_FOR(f)
-#else
-# define CLUTTER_DEPRECATED_IN_1_14             _CLUTTER_EXTERN
-# define CLUTTER_DEPRECATED_IN_1_14_FOR(f)      _CLUTTER_EXTERN
-#endif
-
-#if CLUTTER_VERSION_MAX_ALLOWED < CLUTTER_VERSION_1_14
-# define CLUTTER_AVAILABLE_IN_1_14              CLUTTER_UNAVAILABLE(1, 14)
-#else
-# define CLUTTER_AVAILABLE_IN_1_14              _CLUTTER_EXTERN
-#endif
-
-#if CLUTTER_VERSION_MIN_REQUIRED >= CLUTTER_VERSION_1_16
-# define CLUTTER_DEPRECATED_IN_1_16             CLUTTER_DEPRECATED
-# define CLUTTER_DEPRECATED_IN_1_16_FOR(f)      CLUTTER_DEPRECATED_FOR(f)
-#else
-# define CLUTTER_DEPRECATED_IN_1_16             _CLUTTER_EXTERN
-# define CLUTTER_DEPRECATED_IN_1_16_FOR(f)      _CLUTTER_EXTERN
-#endif
-
-#if CLUTTER_VERSION_MAX_ALLOWED < CLUTTER_VERSION_1_16
-# define CLUTTER_AVAILABLE_IN_1_16              CLUTTER_UNAVAILABLE(1, 16)
-#else
-# define CLUTTER_AVAILABLE_IN_1_16              _CLUTTER_EXTERN
-#endif
-
-#if CLUTTER_VERSION_MIN_REQUIRED >= CLUTTER_VERSION_1_18
-# define CLUTTER_DEPRECATED_IN_1_18             CLUTTER_DEPRECATED
-# define CLUTTER_DEPRECATED_IN_1_18_FOR(f)      CLUTTER_DEPRECATED_FOR(f)
-#else
-# define CLUTTER_DEPRECATED_IN_1_18             _CLUTTER_EXTERN
-# define CLUTTER_DEPRECATED_IN_1_18_FOR(f)      _CLUTTER_EXTERN
-#endif
-
-#if CLUTTER_VERSION_MAX_ALLOWED < CLUTTER_VERSION_1_18
-# define CLUTTER_AVAILABLE_IN_1_18              CLUTTER_UNAVAILABLE(1, 18)
-#else
-# define CLUTTER_AVAILABLE_IN_1_18              _CLUTTER_EXTERN
-#endif
-
-#if CLUTTER_VERSION_MIN_REQUIRED >= CLUTTER_VERSION_1_20
-# define CLUTTER_DEPRECATED_IN_1_20             CLUTTER_DEPRECATED
-# define CLUTTER_DEPRECATED_IN_1_20_FOR(f)      CLUTTER_DEPRECATED_FOR(f)
-#else
-# define CLUTTER_DEPRECATED_IN_1_20             _CLUTTER_EXTERN
-# define CLUTTER_DEPRECATED_IN_1_20_FOR(f)      _CLUTTER_EXTERN
-#endif
-
-#if CLUTTER_VERSION_MAX_ALLOWED < CLUTTER_VERSION_1_20
-# define CLUTTER_AVAILABLE_IN_1_20              CLUTTER_UNAVAILABLE(1, 20)
-#else
-# define CLUTTER_AVAILABLE_IN_1_20              _CLUTTER_EXTERN
-#endif
+#define CLUTTER_MACRO_DEPRECATED CLUTTER_DEPRECATED_MACRO
+#define CLUTTER_MACRO_DEPRECATED_FOR(f) CLUTTER_DEPRECATED_MACRO_FOR(f)
 
-#if CLUTTER_VERSION_MIN_REQUIRED >= CLUTTER_VERSION_1_22
-# define CLUTTER_DEPRECATED_IN_1_22             CLUTTER_DEPRECATED
-# define CLUTTER_DEPRECATED_IN_1_22_FOR(f)      CLUTTER_DEPRECATED_FOR(f)
-#else
-# define CLUTTER_DEPRECATED_IN_1_22             _CLUTTER_EXTERN
-# define CLUTTER_DEPRECATED_IN_1_22_FOR(f)      _CLUTTER_EXTERN
-#endif
-
-#if CLUTTER_VERSION_MAX_ALLOWED < CLUTTER_VERSION_1_22
-# define CLUTTER_AVAILABLE_IN_1_22              CLUTTER_UNAVAILABLE(1, 22)
-#else
-# define CLUTTER_AVAILABLE_IN_1_22              _CLUTTER_EXTERN
-#endif
-
-#if CLUTTER_VERSION_MIN_REQUIRED >= CLUTTER_VERSION_1_24
-# define CLUTTER_DEPRECATED_IN_1_24             CLUTTER_DEPRECATED
-# define CLUTTER_DEPRECATED_IN_1_24_FOR(f)      CLUTTER_DEPRECATED_FOR(f)
-# define CLUTTER_MACRO_DEPRECATED_IN_1_24       CLUTTER_DEPRECATED_MACRO
-# define CLUTTER_MACRO_DEPRECATED_IN_1_24_FOR(f) CLUTTER_DEPRECATED_MACRO_FOR(f)
-#else
-# define CLUTTER_DEPRECATED_IN_1_24             _CLUTTER_EXTERN
-# define CLUTTER_DEPRECATED_IN_1_24_FOR(f)      _CLUTTER_EXTERN
-# define CLUTTER_MACRO_DEPRECATED_IN_1_24
-# define CLUTTER_MACRO_DEPRECATED_IN_1_24_FOR(f)
-#endif
-
-#if CLUTTER_VERSION_MAX_ALLOWED < CLUTTER_VERSION_1_24
-# define CLUTTER_AVAILABLE_IN_1_24              CLUTTER_UNAVAILABLE(1, 24)
-#else
-# define CLUTTER_AVAILABLE_IN_1_24              _CLUTTER_EXTERN
-#endif
-
-#if CLUTTER_VERSION_MIN_REQUIRED >= CLUTTER_VERSION_1_26
-# define CLUTTER_DEPRECATED_IN_1_26             CLUTTER_DEPRECATED
-# define CLUTTER_DEPRECATED_IN_1_26_FOR(f)      CLUTTER_DEPRECATED_FOR(f)
-# define CLUTTER_MACRO_DEPRECATED_IN_1_26       CLUTTER_DEPRECATED_MACRO
-# define CLUTTER_MACRO_DEPRECATED_IN_1_26_FOR(f) CLUTTER_DEPRECATED_MACRO_FOR(f)
-#else
-# define CLUTTER_DEPRECATED_IN_1_26             _CLUTTER_EXTERN
-# define CLUTTER_DEPRECATED_IN_1_26_FOR(f)      _CLUTTER_EXTERN
-# define CLUTTER_MACRO_DEPRECATED_IN_1_26
-# define CLUTTER_MACRO_DEPRECATED_IN_1_26_FOR(f)
-#endif
-
-#if CLUTTER_VERSION_MAX_ALLOWED < CLUTTER_VERSION_1_26
-# define CLUTTER_AVAILABLE_IN_1_26              CLUTTER_UNAVAILABLE(1, 26)
-#else
-# define CLUTTER_AVAILABLE_IN_1_26              _CLUTTER_EXTERN
-#endif
+#define CLUTTER_EXPORT _CLUTTER_EXTERN
 
 #endif /* __CLUTTER_MACROS_H__ */
diff --git a/clutter/clutter/clutter-main.c b/clutter/clutter/clutter-main.c
index ca508ed56..25a9031f4 100644
--- a/clutter/clutter/clutter-main.c
+++ b/clutter/clutter/clutter-main.c
@@ -65,7 +65,6 @@
 #include "clutter-settings-private.h"
 #include "clutter-stage-manager.h"
 #include "clutter-stage-private.h"
-#include "clutter-version.h"   /* For flavour define */
 
 #ifdef CLUTTER_WINDOWING_X11
 #include "x11/clutter-backend-x11.h"
@@ -109,10 +108,6 @@ guint clutter_debug_flags       = 0;
 guint clutter_paint_debug_flags = 0;
 guint clutter_pick_debug_flags  = 0;
 
-const guint clutter_major_version = CLUTTER_MAJOR_VERSION;
-const guint clutter_minor_version = CLUTTER_MINOR_VERSION;
-const guint clutter_micro_version = CLUTTER_MICRO_VERSION;
-
 #ifdef CLUTTER_ENABLE_DEBUG
 static const GDebugKey clutter_debug_keys[] = {
   { "misc", CLUTTER_DEBUG_MISC },
@@ -3469,36 +3464,6 @@ _clutter_run_repaint_functions (ClutterRepaintFlags flags)
     context->repaint_funcs = g_list_reverse (reinvoke_list);
 }
 
-/**
- * clutter_check_version:
- * @major: major version, like 1 in 1.2.3
- * @minor: minor version, like 2 in 1.2.3
- * @micro: micro version, like 3 in 1.2.3
- *
- * Run-time version check, to check the version the Clutter library
- * that an application is currently linked against
- *
- * This is the run-time equivalent of the compile-time %CLUTTER_CHECK_VERSION
- * pre-processor macro
- *
- * Return value: %TRUE if the version of the Clutter library is
- *   greater than (@major, @minor, @micro), and %FALSE otherwise
- *
- * Since: 1.2
- */
-gboolean
-clutter_check_version (guint major,
-                       guint minor,
-                       guint micro)
-{
-  return (clutter_major_version > major ||
-          (clutter_major_version == major &&
-           clutter_minor_version > minor) ||
-          (clutter_major_version == major &&
-           clutter_minor_version == minor &&
-           clutter_micro_version >= micro));
-}
-
 /**
  * clutter_get_default_text_direction:
  *
diff --git a/clutter/clutter/clutter-main.h b/clutter/clutter/clutter-main.h
index 21bdb06c3..67065223f 100644
--- a/clutter/clutter/clutter-main.h
+++ b/clutter/clutter/clutter-main.h
@@ -61,7 +61,7 @@ typedef enum {
   CLUTTER_INIT_ERROR_INTERNAL = -3
 } ClutterInitError;
 
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 GQuark clutter_init_error_quark (void);
 
 /**
@@ -78,12 +78,12 @@ GQuark clutter_init_error_quark (void);
 #define CLUTTER_PRIORITY_REDRAW         (G_PRIORITY_HIGH_IDLE + 50)
 
 /* Initialisation */
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void                    clutter_base_init                       (void);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 ClutterInitError        clutter_init                            (int          *argc,
                                                                  char       ***argv) 
G_GNUC_WARN_UNUSED_RESULT;
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 ClutterInitError        clutter_init_with_args                  (int          *argc,
                                                                  char       ***argv,
                                                                  const char   *parameter_string,
@@ -91,91 +91,86 @@ ClutterInitError        clutter_init_with_args                  (int          *a
                                                                  const char   *translation_domain,
                                                                  GError      **error) 
G_GNUC_WARN_UNUSED_RESULT;
 
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 GOptionGroup *          clutter_get_option_group                (void);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 GOptionGroup *          clutter_get_option_group_without_init   (void);
 
 /* Mainloop */
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void                    clutter_main                            (void);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void                    clutter_main_quit                       (void);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 gint                    clutter_main_level                      (void);
 
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void                    clutter_do_event                        (ClutterEvent *event);
 
 /* Debug utility functions */
-CLUTTER_AVAILABLE_IN_1_4
+CLUTTER_EXPORT
 gboolean                clutter_get_accessibility_enabled       (void);
 
-CLUTTER_AVAILABLE_IN_1_14
+CLUTTER_EXPORT
 void                    clutter_disable_accessibility           (void);
 
 /* Threading functions */
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void                    clutter_threads_set_lock_functions      (GCallback enter_fn,
                                                                  GCallback leave_fn);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 guint                   clutter_threads_add_idle                (GSourceFunc    func,
                                                                  gpointer       data);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 guint                   clutter_threads_add_idle_full           (gint           priority,
                                                                  GSourceFunc    func,
                                                                  gpointer       data,
                                                                  GDestroyNotify notify);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 guint                   clutter_threads_add_timeout             (guint          interval,
                                                                  GSourceFunc    func,
                                                                  gpointer       data);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 guint                   clutter_threads_add_timeout_full        (gint           priority,
                                                                  guint          interval,
                                                                  GSourceFunc    func,
                                                                  gpointer       data,
                                                                  GDestroyNotify notify);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 guint                   clutter_threads_add_repaint_func        (GSourceFunc    func,
                                                                  gpointer       data,
                                                                  GDestroyNotify notify);
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 guint                   clutter_threads_add_repaint_func_full   (ClutterRepaintFlags flags,
                                                                  GSourceFunc    func,
                                                                  gpointer       data,
                                                                  GDestroyNotify notify);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 void                    clutter_threads_remove_repaint_func     (guint          handle_id);
 
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void                    clutter_grab_pointer                    (ClutterActor  *actor);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void                    clutter_ungrab_pointer                  (void);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 ClutterActor *          clutter_get_pointer_grab                (void);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void                    clutter_grab_keyboard                   (ClutterActor  *actor);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void                    clutter_ungrab_keyboard                 (void);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 ClutterActor *          clutter_get_keyboard_grab               (void);
 
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 PangoFontMap *          clutter_get_font_map                    (void);
 
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 ClutterTextDirection    clutter_get_default_text_direction      (void);
 
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 guint                   clutter_get_default_frame_rate          (void);
 
-CLUTTER_AVAILABLE_IN_1_2
-gboolean                clutter_check_version                   (guint major,
-                                                                 guint minor,
-                                                                 guint micro);
-
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 gboolean                clutter_check_windowing_backend         (const char *backend_type);
 
 
diff --git a/clutter/clutter/clutter-mutter.h b/clutter/clutter/clutter-mutter.h
index 034e5d0f2..458871dff 100644
--- a/clutter/clutter/clutter-mutter.h
+++ b/clutter/clutter/clutter-mutter.h
@@ -31,16 +31,16 @@
 #include "cogl/clutter-stage-cogl.h"
 #include "x11/clutter-stage-x11.h"
 
-CLUTTER_AVAILABLE_IN_MUTTER
+CLUTTER_EXPORT
 void clutter_set_custom_backend_func (ClutterBackend *(* func) (void));
 
-CLUTTER_AVAILABLE_IN_MUTTER
+CLUTTER_EXPORT
 gboolean        _clutter_get_sync_to_vblank     (void);
 
-CLUTTER_AVAILABLE_IN_MUTTER
+CLUTTER_EXPORT
 int64_t clutter_stage_get_frame_counter (ClutterStage *stage);
 
-CLUTTER_AVAILABLE_IN_MUTTER
+CLUTTER_EXPORT
 void clutter_stage_capture_into (ClutterStage          *stage,
                                  gboolean               paint,
                                  cairo_rectangle_int_t *rect,
diff --git a/clutter/clutter/clutter-offscreen-effect.h b/clutter/clutter/clutter-offscreen-effect.h
index 3c88f6788..07619441e 100644
--- a/clutter/clutter/clutter-offscreen-effect.h
+++ b/clutter/clutter/clutter-offscreen-effect.h
@@ -91,28 +91,28 @@ struct _ClutterOffscreenEffectClass
   void (* _clutter_offscreen7) (void);
 };
 
-CLUTTER_AVAILABLE_IN_1_4
+CLUTTER_EXPORT
 GType clutter_offscreen_effect_get_type (void) G_GNUC_CONST;
 
-CLUTTER_AVAILABLE_IN_1_4
+CLUTTER_EXPORT
 CoglMaterial *  clutter_offscreen_effect_get_target             (ClutterOffscreenEffect *effect);
 
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 CoglHandle      clutter_offscreen_effect_get_texture            (ClutterOffscreenEffect *effect);
 
-CLUTTER_AVAILABLE_IN_1_4
+CLUTTER_EXPORT
 void            clutter_offscreen_effect_paint_target           (ClutterOffscreenEffect *effect);
-CLUTTER_AVAILABLE_IN_1_4
+CLUTTER_EXPORT
 CoglHandle      clutter_offscreen_effect_create_texture         (ClutterOffscreenEffect *effect,
                                                                  gfloat                  width,
                                                                  gfloat                  height);
 
-CLUTTER_DEPRECATED_IN_1_14_FOR (clutter_offscreen_effect_get_target_rect)
+CLUTTER_DEPRECATED_FOR (clutter_offscreen_effect_get_target_rect)
 gboolean        clutter_offscreen_effect_get_target_size        (ClutterOffscreenEffect *effect,
                                                                  gfloat                 *width,
                                                                  gfloat                 *height);
 
-CLUTTER_AVAILABLE_IN_1_14
+CLUTTER_EXPORT
 gboolean        clutter_offscreen_effect_get_target_rect        (ClutterOffscreenEffect *effect,
                                                                  ClutterRect            *rect);
 
diff --git a/clutter/clutter/clutter-page-turn-effect.h b/clutter/clutter/clutter-page-turn-effect.h
index b3fb80434..dd036bac8 100644
--- a/clutter/clutter/clutter-page-turn-effect.h
+++ b/clutter/clutter/clutter-page-turn-effect.h
@@ -51,28 +51,28 @@ G_BEGIN_DECLS
 typedef struct _ClutterPageTurnEffect           ClutterPageTurnEffect;
 typedef struct _ClutterPageTurnEffectClass      ClutterPageTurnEffectClass;
 
-CLUTTER_AVAILABLE_IN_1_4
+CLUTTER_EXPORT
 GType clutter_page_turn_effect_get_type (void) G_GNUC_CONST;
 
-CLUTTER_AVAILABLE_IN_1_4
+CLUTTER_EXPORT
 ClutterEffect *clutter_page_turn_effect_new (gdouble period,
                                              gdouble angle,
                                              gfloat  radius);
 
-CLUTTER_AVAILABLE_IN_1_4
+CLUTTER_EXPORT
 void    clutter_page_turn_effect_set_period (ClutterPageTurnEffect *effect,
                                              gdouble                period);
-CLUTTER_AVAILABLE_IN_1_4
+CLUTTER_EXPORT
 gdouble clutter_page_turn_effect_get_period (ClutterPageTurnEffect *effect);
-CLUTTER_AVAILABLE_IN_1_4
+CLUTTER_EXPORT
 void    clutter_page_turn_effect_set_angle  (ClutterPageTurnEffect *effect,
                                              gdouble                angle);
-CLUTTER_AVAILABLE_IN_1_4
+CLUTTER_EXPORT
 gdouble clutter_page_turn_effect_get_angle  (ClutterPageTurnEffect *effect);
-CLUTTER_AVAILABLE_IN_1_4
+CLUTTER_EXPORT
 void    clutter_page_turn_effect_set_radius (ClutterPageTurnEffect *effect,
                                              gfloat                 radius);
-CLUTTER_AVAILABLE_IN_1_4
+CLUTTER_EXPORT
 gfloat  clutter_page_turn_effect_get_radius (ClutterPageTurnEffect *effect);
 
 G_END_DECLS
diff --git a/clutter/clutter/clutter-paint-node.h b/clutter/clutter/clutter-paint-node.h
index 5f3e962e4..779b15e35 100644
--- a/clutter/clutter/clutter-paint-node.h
+++ b/clutter/clutter/clutter-paint-node.h
@@ -41,25 +41,25 @@ G_BEGIN_DECLS
 typedef struct _ClutterPaintNodePrivate ClutterPaintNodePrivate;
 typedef struct _ClutterPaintNodeClass   ClutterPaintNodeClass;
 
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 GType clutter_paint_node_get_type (void) G_GNUC_CONST;
 
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 ClutterPaintNode *      clutter_paint_node_ref                          (ClutterPaintNode      *node);
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 void                    clutter_paint_node_unref                        (ClutterPaintNode      *node);
 
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 void                    clutter_paint_node_set_name                     (ClutterPaintNode      *node,
                                                                          const char            *name);
 
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 void                    clutter_paint_node_add_child                    (ClutterPaintNode      *node,
                                                                          ClutterPaintNode      *child);
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 void                    clutter_paint_node_add_rectangle                (ClutterPaintNode      *node,
                                                                          const ClutterActorBox *rect);
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 void                    clutter_paint_node_add_texture_rectangle        (ClutterPaintNode      *node,
                                                                          const ClutterActorBox *rect,
                                                                          float                  x_1,
@@ -67,10 +67,10 @@ void                    clutter_paint_node_add_texture_rectangle        (Clutter
                                                                          float                  x_2,
                                                                          float                  y_2);
 
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 void                    clutter_paint_node_add_path                     (ClutterPaintNode      *node,
                                                                          CoglPath              *path);
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 void                    clutter_paint_node_add_primitive                (ClutterPaintNode      *node,
                                                                          CoglPrimitive         *primitive);
 
@@ -85,15 +85,15 @@ void                    clutter_paint_node_add_primitive                (Clutter
  */
 #define CLUTTER_VALUE_HOLDS_PAINT_NODE(value)   (G_VALUE_HOLDS (value, CLUTTER_TYPE_PAINT_NODE))
 
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 void                    clutter_value_set_paint_node                    (GValue                *value,
                                                                          gpointer               node);
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 void                    clutter_value_take_paint_node                   (GValue                *value,
                                                                          gpointer               node);
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 gpointer                clutter_value_get_paint_node                    (const GValue          *value);
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 gpointer                clutter_value_dup_paint_node                    (const GValue          *value);
 
 G_END_DECLS
diff --git a/clutter/clutter/clutter-paint-nodes.h b/clutter/clutter/clutter-paint-nodes.h
index c86132c3d..381c7f8a7 100644
--- a/clutter/clutter/clutter-paint-nodes.h
+++ b/clutter/clutter/clutter-paint-nodes.h
@@ -49,10 +49,10 @@ G_BEGIN_DECLS
 typedef struct _ClutterColorNode                ClutterColorNode;
 typedef struct _ClutterColorNodeClass           ClutterColorNodeClass;
 
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 GType clutter_color_node_get_type (void) G_GNUC_CONST;
 
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 ClutterPaintNode *      clutter_color_node_new          (const ClutterColor    *color);
 
 #define CLUTTER_TYPE_TEXTURE_NODE               (clutter_texture_node_get_type ())
@@ -70,10 +70,10 @@ ClutterPaintNode *      clutter_color_node_new          (const ClutterColor    *
 typedef struct _ClutterTextureNode              ClutterTextureNode;
 typedef struct _ClutterTextureNodeClass         ClutterTextureNodeClass;
 
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 GType clutter_texture_node_get_type (void) G_GNUC_CONST;
 
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 ClutterPaintNode *      clutter_texture_node_new        (CoglTexture           *texture,
                                                          const ClutterColor    *color,
                                                          ClutterScalingFilter   min_filter,
@@ -94,10 +94,10 @@ ClutterPaintNode *      clutter_texture_node_new        (CoglTexture           *
 typedef struct _ClutterClipNode                 ClutterClipNode;
 typedef struct _ClutterClipNodeClass            ClutterClipNodeClass;
 
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 GType clutter_clip_node_get_type (void) G_GNUC_CONST;
 
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 ClutterPaintNode *      clutter_clip_node_new           (void);
 
 #define CLUTTER_TYPE_PIPELINE_NODE              (clutter_pipeline_node_get_type ())
@@ -115,10 +115,10 @@ ClutterPaintNode *      clutter_clip_node_new           (void);
 typedef struct _ClutterPipelineNode             ClutterPipelineNode;
 typedef struct _ClutterPipelineNodeClass        ClutterPipelineNodeClass;
 
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 GType clutter_pipeline_node_get_type (void) G_GNUC_CONST;
 
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 ClutterPaintNode *      clutter_pipeline_node_new       (CoglPipeline          *pipeline);
 
 #define CLUTTER_TYPE_TEXT_NODE                  (clutter_text_node_get_type ())
@@ -136,10 +136,10 @@ ClutterPaintNode *      clutter_pipeline_node_new       (CoglPipeline          *
 typedef struct _ClutterTextNode                 ClutterTextNode;
 typedef struct _ClutterTextNodeClass            ClutterTextNodeClass;
 
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 GType clutter_text_node_get_type (void) G_GNUC_CONST;
 
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 ClutterPaintNode *      clutter_text_node_new           (PangoLayout           *layout,
                                                          const ClutterColor    *color);
 
diff --git a/clutter/clutter/clutter-pan-action.h b/clutter/clutter/clutter-pan-action.h
index 866ec97ee..64115b69b 100644
--- a/clutter/clutter/clutter-pan-action.h
+++ b/clutter/clutter/clutter-pan-action.h
@@ -99,50 +99,50 @@ struct _ClutterPanActionClass
   void (* _clutter_pan_action6) (void);
 };
 
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 GType clutter_pan_action_get_type (void) G_GNUC_CONST;
 
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 ClutterAction * clutter_pan_action_new                      (void);
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 void            clutter_pan_action_set_pan_axis             (ClutterPanAction *self,
                                                              ClutterPanAxis    axis);
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 ClutterPanAxis clutter_pan_action_get_pan_axis              (ClutterPanAction *self);
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 void            clutter_pan_action_set_interpolate          (ClutterPanAction *self,
                                                              gboolean          should_interpolate);
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 gboolean        clutter_pan_action_get_interpolate          (ClutterPanAction *self);
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 void            clutter_pan_action_set_deceleration         (ClutterPanAction *self,
                                                              gdouble           rate);
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 gdouble         clutter_pan_action_get_deceleration         (ClutterPanAction *self);
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 void            clutter_pan_action_set_acceleration_factor  (ClutterPanAction *self,
                                                              gdouble           factor);
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 gdouble         clutter_pan_action_get_acceleration_factor  (ClutterPanAction *self);
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 void            clutter_pan_action_get_interpolated_coords  (ClutterPanAction *self,
                                                              gfloat           *interpolated_x,
                                                              gfloat           *interpolated_y);
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 gfloat          clutter_pan_action_get_interpolated_delta   (ClutterPanAction *self,
                                                              gfloat           *delta_x,
                                                              gfloat           *delta_y);
-CLUTTER_AVAILABLE_IN_1_14
+CLUTTER_EXPORT
 gfloat          clutter_pan_action_get_motion_delta         (ClutterPanAction *self,
                                                              guint             point,
                                                              gfloat           *delta_x,
                                                              gfloat           *delta_y);
-CLUTTER_AVAILABLE_IN_1_14
+CLUTTER_EXPORT
 void            clutter_pan_action_get_motion_coords        (ClutterPanAction *self,
                                                              guint             point,
                                                              gfloat           *motion_x,
                                                              gfloat           *motion_y);
-CLUTTER_AVAILABLE_IN_1_24
+CLUTTER_EXPORT
 gfloat          clutter_pan_action_get_constrained_motion_delta (ClutterPanAction *self,
                                                                  guint             point,
                                                                  gfloat           *delta_x,
diff --git a/clutter/clutter/clutter-path-constraint.h b/clutter/clutter/clutter-path-constraint.h
index f6d65ead3..cd66a0350 100644
--- a/clutter/clutter/clutter-path-constraint.h
+++ b/clutter/clutter/clutter-path-constraint.h
@@ -49,22 +49,22 @@ G_BEGIN_DECLS
 typedef struct _ClutterPathConstraint           ClutterPathConstraint;
 typedef struct _ClutterPathConstraintClass      ClutterPathConstraintClass;
 
-CLUTTER_AVAILABLE_IN_1_6
+CLUTTER_EXPORT
 GType clutter_path_constraint_get_type (void) G_GNUC_CONST;
 
-CLUTTER_AVAILABLE_IN_1_6
+CLUTTER_EXPORT
 ClutterConstraint *clutter_path_constraint_new        (ClutterPath           *path,
                                                        gfloat                 offset);
 
-CLUTTER_AVAILABLE_IN_1_6
+CLUTTER_EXPORT
 void               clutter_path_constraint_set_path   (ClutterPathConstraint *constraint,
                                                        ClutterPath           *path);
-CLUTTER_AVAILABLE_IN_1_6
+CLUTTER_EXPORT
 ClutterPath *      clutter_path_constraint_get_path   (ClutterPathConstraint *constraint);
-CLUTTER_AVAILABLE_IN_1_6
+CLUTTER_EXPORT
 void               clutter_path_constraint_set_offset (ClutterPathConstraint *constraint,
                                                        gfloat                 offset);
-CLUTTER_AVAILABLE_IN_1_6
+CLUTTER_EXPORT
 gfloat             clutter_path_constraint_get_offset (ClutterPathConstraint *constraint);
 
 G_END_DECLS
diff --git a/clutter/clutter/clutter-path.h b/clutter/clutter/clutter-path.h
index 38133a554..8ec4d93f5 100644
--- a/clutter/clutter/clutter-path.h
+++ b/clutter/clutter/clutter-path.h
@@ -86,30 +86,30 @@ struct _ClutterPathClass
   GInitiallyUnownedClass parent_class;
 };
 
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 GType clutter_path_get_type (void) G_GNUC_CONST;
 
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 ClutterPath *clutter_path_new                  (void);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 ClutterPath *clutter_path_new_with_description (const gchar           *desc);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 void         clutter_path_add_move_to          (ClutterPath           *path,
                                                 gint                   x,
                                                 gint                   y);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 void         clutter_path_add_rel_move_to      (ClutterPath           *path,
                                                 gint                   x,
                                                 gint                   y);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 void         clutter_path_add_line_to          (ClutterPath           *path,
                                                 gint                   x,
                                                 gint                   y);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 void         clutter_path_add_rel_line_to      (ClutterPath           *path,
                                                 gint                   x,
                                                 gint                   y);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 void         clutter_path_add_curve_to         (ClutterPath           *path,
                                                 gint                   x_1,
                                                 gint                   y_1,
@@ -117,7 +117,7 @@ void         clutter_path_add_curve_to         (ClutterPath           *path,
                                                 gint                   y_2,
                                                 gint                   x_3,
                                                 gint                   y_3);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 void         clutter_path_add_rel_curve_to     (ClutterPath           *path,
                                                 gint                   x_1,
                                                 gint                   y_1,
@@ -125,55 +125,55 @@ void         clutter_path_add_rel_curve_to     (ClutterPath           *path,
                                                 gint                   y_2,
                                                 gint                   x_3,
                                                 gint                   y_3);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 void         clutter_path_add_close            (ClutterPath           *path);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 gboolean     clutter_path_add_string           (ClutterPath           *path,
                                                 const gchar           *str);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 void         clutter_path_add_node             (ClutterPath           *path,
                                                 const ClutterPathNode *node);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 void         clutter_path_add_cairo_path       (ClutterPath           *path,
                                                 const cairo_path_t    *cpath);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 guint        clutter_path_get_n_nodes          (ClutterPath           *path);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 void         clutter_path_get_node             (ClutterPath           *path,
                                                 guint                  index_,
                                                 ClutterPathNode       *node);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 GSList *     clutter_path_get_nodes            (ClutterPath           *path);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 void         clutter_path_foreach              (ClutterPath           *path,
                                                 ClutterPathCallback    callback,
                                                 gpointer               user_data);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 void         clutter_path_insert_node          (ClutterPath           *path,
                                                 gint                   index_,
                                                 const ClutterPathNode *node);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 void         clutter_path_remove_node          (ClutterPath           *path,
                                                 guint                  index_);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 void         clutter_path_replace_node         (ClutterPath           *path,
                                                 guint                  index_,
                                                 const ClutterPathNode *node);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 gchar *      clutter_path_get_description      (ClutterPath           *path);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 gboolean     clutter_path_set_description      (ClutterPath           *path,
                                                 const gchar           *str);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 void         clutter_path_clear                (ClutterPath           *path);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 void         clutter_path_to_cairo_path        (ClutterPath           *path,
                                                 cairo_t               *cr);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 guint        clutter_path_get_position         (ClutterPath           *path,
                                                 gdouble                progress,
                                                 ClutterKnot           *position);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 guint        clutter_path_get_length           (ClutterPath           *path);
 
 G_END_DECLS
diff --git a/clutter/clutter/clutter-property-transition.h b/clutter/clutter/clutter-property-transition.h
index a53f03402..0a3766876 100644
--- a/clutter/clutter/clutter-property-transition.h
+++ b/clutter/clutter/clutter-property-transition.h
@@ -75,15 +75,15 @@ struct _ClutterPropertyTransitionClass
   gpointer _padding[8];
 };
 
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 GType clutter_property_transition_get_type (void) G_GNUC_CONST;
 
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 ClutterTransition *     clutter_property_transition_new                 (const char                
*property_name);
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 void                    clutter_property_transition_set_property_name   (ClutterPropertyTransition 
*transition,
                                                                          const char                
*property_name);
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 const char *            clutter_property_transition_get_property_name   (ClutterPropertyTransition 
*transition);
 
 G_END_DECLS
diff --git a/clutter/clutter/clutter-rotate-action.h b/clutter/clutter/clutter-rotate-action.h
index c73905482..faa240e6c 100644
--- a/clutter/clutter/clutter-rotate-action.h
+++ b/clutter/clutter/clutter-rotate-action.h
@@ -89,10 +89,10 @@ struct _ClutterRotateActionClass
   void (* _clutter_rotate_action7) (void);
 };
 
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 GType clutter_rotate_action_get_type (void) G_GNUC_CONST;
 
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 ClutterAction *clutter_rotate_action_new        (void);
 
 G_END_DECLS
diff --git a/clutter/clutter/clutter-script.h b/clutter/clutter/clutter-script.h
index 37f4a0537..5642e1034 100644
--- a/clutter/clutter/clutter-script.h
+++ b/clutter/clutter/clutter-script.h
@@ -93,7 +93,7 @@ typedef enum {
  * Since: 0.6
  */
 #define CLUTTER_SCRIPT_ERROR    (clutter_script_error_quark ())
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 GQuark clutter_script_error_quark (void);
 
 /**
@@ -144,75 +144,75 @@ struct _ClutterScriptClass
   void (*_clutter_reserved8) (void);
 };
 
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 GType clutter_script_get_type (void) G_GNUC_CONST;
 
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 ClutterScript * clutter_script_new                      (void);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 guint           clutter_script_load_from_file           (ClutterScript             *script,
                                                          const gchar               *filename,
                                                          GError                   **error);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 guint           clutter_script_load_from_data           (ClutterScript             *script,
                                                          const gchar               *data,
                                                          gssize                     length,
                                                          GError                   **error);
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 guint           clutter_script_load_from_resource       (ClutterScript             *script,
                                                          const gchar               *resource_path,
                                                          GError                   **error);
 
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 GObject *       clutter_script_get_object               (ClutterScript             *script,
                                                          const gchar               *name);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 gint            clutter_script_get_objects              (ClutterScript             *script,
                                                          const gchar               *first_name,
                                                          ...) G_GNUC_NULL_TERMINATED;
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 GList *         clutter_script_list_objects             (ClutterScript             *script);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void            clutter_script_unmerge_objects          (ClutterScript             *script,
                                                          guint                      merge_id);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void            clutter_script_ensure_objects           (ClutterScript             *script);
 
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 void            clutter_script_add_states               (ClutterScript             *script,
                                                          const gchar               *name,
                                                          ClutterState              *state);
 
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 ClutterState *  clutter_script_get_states               (ClutterScript             *script,
                                                          const gchar               *name);
 
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void            clutter_script_connect_signals          (ClutterScript             *script,
                                                          gpointer                   user_data);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void            clutter_script_connect_signals_full     (ClutterScript             *script,
                                                          ClutterScriptConnectFunc   func,
                                                          gpointer                   user_data);
 
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void            clutter_script_add_search_paths         (ClutterScript             *script,
                                                          const gchar * const        paths[],
                                                          gsize                      n_paths);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 gchar *         clutter_script_lookup_filename          (ClutterScript             *script,
                                                          const gchar               *filename) G_GNUC_MALLOC;
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 GType           clutter_script_get_type_from_name       (ClutterScript             *script,
                                                          const gchar               *type_name);
 
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 void            clutter_script_set_translation_domain   (ClutterScript             *script,
                                                          const gchar               *domain);
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 const gchar *   clutter_script_get_translation_domain   (ClutterScript             *script);
 
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 const gchar *   clutter_get_script_id                   (GObject                   *gobject);
 
 G_END_DECLS
diff --git a/clutter/clutter/clutter-scriptable.h b/clutter/clutter/clutter-scriptable.h
index 61beb2935..82d187b36 100644
--- a/clutter/clutter/clutter-scriptable.h
+++ b/clutter/clutter/clutter-scriptable.h
@@ -87,21 +87,21 @@ struct _ClutterScriptableIface
                                         const GValue      *value);
 };
 
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 GType                 clutter_scriptable_get_type            (void) G_GNUC_CONST;
 
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void                  clutter_scriptable_set_id              (ClutterScriptable *scriptable,
                                                               const gchar       *id_);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 const gchar *         clutter_scriptable_get_id              (ClutterScriptable *scriptable);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 gboolean              clutter_scriptable_parse_custom_node   (ClutterScriptable *scriptable,
                                                               ClutterScript     *script,
                                                               GValue            *value,
                                                               const gchar       *name,
                                                               JsonNode          *node);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void                  clutter_scriptable_set_custom_property (ClutterScriptable *scriptable,
                                                               ClutterScript     *script,
                                                               const gchar       *name,
diff --git a/clutter/clutter/clutter-scroll-actor.h b/clutter/clutter/clutter-scroll-actor.h
index be3cbc27b..f2eada11c 100644
--- a/clutter/clutter/clutter-scroll-actor.h
+++ b/clutter/clutter/clutter-scroll-actor.h
@@ -73,22 +73,22 @@ struct _ClutterScrollActorClass
   gpointer _padding[8];
 };
 
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 GType clutter_scroll_actor_get_type (void) G_GNUC_CONST;
 
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 ClutterActor *          clutter_scroll_actor_new                (void);
 
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 void                    clutter_scroll_actor_set_scroll_mode    (ClutterScrollActor *actor,
                                                                  ClutterScrollMode   mode);
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 ClutterScrollMode       clutter_scroll_actor_get_scroll_mode    (ClutterScrollActor *actor);
 
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 void                    clutter_scroll_actor_scroll_to_point    (ClutterScrollActor *actor,
                                                                  const ClutterPoint *point);
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 void                    clutter_scroll_actor_scroll_to_rect     (ClutterScrollActor *actor,
                                                                  const ClutterRect  *rect);
 
diff --git a/clutter/clutter/clutter-settings.h b/clutter/clutter/clutter-settings.h
index 7c9fe427d..bb3911e9d 100644
--- a/clutter/clutter/clutter-settings.h
+++ b/clutter/clutter/clutter-settings.h
@@ -16,10 +16,10 @@ G_BEGIN_DECLS
 typedef struct _ClutterSettings         ClutterSettings;
 typedef struct _ClutterSettingsClass    ClutterSettingsClass;
 
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 GType clutter_settings_get_type (void) G_GNUC_CONST;
 
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 ClutterSettings *clutter_settings_get_default (void);
 
 G_END_DECLS
diff --git a/clutter/clutter/clutter-shader-effect.h b/clutter/clutter/clutter-shader-effect.h
index fc9775e5a..7df050ee7 100644
--- a/clutter/clutter/clutter-shader-effect.h
+++ b/clutter/clutter/clutter-shader-effect.h
@@ -90,30 +90,30 @@ struct _ClutterShaderEffectClass
   void (*_clutter_shader5) (void);
 };
 
-CLUTTER_AVAILABLE_IN_1_4
+CLUTTER_EXPORT
 GType clutter_shader_effect_get_type (void) G_GNUC_CONST;
 
-CLUTTER_AVAILABLE_IN_1_4
+CLUTTER_EXPORT
 ClutterEffect * clutter_shader_effect_new               (ClutterShaderType    shader_type);
 
-CLUTTER_AVAILABLE_IN_1_4
+CLUTTER_EXPORT
 gboolean        clutter_shader_effect_set_shader_source (ClutterShaderEffect *effect,
                                                          const gchar         *source);
 
-CLUTTER_AVAILABLE_IN_1_4
+CLUTTER_EXPORT
 void            clutter_shader_effect_set_uniform       (ClutterShaderEffect *effect,
                                                          const gchar         *name,
                                                          GType                gtype,
                                                          gsize                n_values,
                                                          ...);
-CLUTTER_AVAILABLE_IN_1_4
+CLUTTER_EXPORT
 void            clutter_shader_effect_set_uniform_value (ClutterShaderEffect *effect,
                                                          const gchar         *name,
                                                          const GValue        *value);
 
-CLUTTER_AVAILABLE_IN_1_4
+CLUTTER_EXPORT
 CoglHandle      clutter_shader_effect_get_shader        (ClutterShaderEffect *effect);
-CLUTTER_AVAILABLE_IN_1_4
+CLUTTER_EXPORT
 CoglHandle      clutter_shader_effect_get_program       (ClutterShaderEffect *effect);
 
 G_END_DECLS
diff --git a/clutter/clutter/clutter-shader-types.h b/clutter/clutter/clutter-shader-types.h
index f144b6c20..629cf515a 100644
--- a/clutter/clutter/clutter-shader-types.h
+++ b/clutter/clutter/clutter-shader-types.h
@@ -70,32 +70,32 @@ typedef struct _ClutterShaderMatrix   ClutterShaderMatrix;
  */
 #define CLUTTER_VALUE_HOLDS_SHADER_MATRIX(x) (G_VALUE_HOLDS ((x), CLUTTER_TYPE_SHADER_MATRIX))
 
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 GType clutter_shader_float_get_type  (void) G_GNUC_CONST;
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 GType clutter_shader_int_get_type    (void) G_GNUC_CONST;
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 GType clutter_shader_matrix_get_type (void) G_GNUC_CONST;
 
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 void            clutter_value_set_shader_float  (GValue       *value,
                                                  gint          size,
                                                  const gfloat *floats);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 void            clutter_value_set_shader_int    (GValue       *value,
                                                  gint          size,
                                                  const gint   *ints);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 void            clutter_value_set_shader_matrix (GValue       *value,
                                                  gint          size,
                                                  const gfloat *matrix);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 const gfloat *  clutter_value_get_shader_float  (const GValue *value,
                                                  gsize        *length);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 const gint   *  clutter_value_get_shader_int    (const GValue *value,
                                                  gsize        *length);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 const gfloat *  clutter_value_get_shader_matrix (const GValue *value,
                                                  gsize        *length);
 
diff --git a/clutter/clutter/clutter-snap-constraint.h b/clutter/clutter/clutter-snap-constraint.h
index 5a788dcf8..4ee46d03d 100644
--- a/clutter/clutter/clutter-snap-constraint.h
+++ b/clutter/clutter/clutter-snap-constraint.h
@@ -48,32 +48,32 @@ G_BEGIN_DECLS
 typedef struct _ClutterSnapConstraint           ClutterSnapConstraint;
 typedef struct _ClutterSnapConstraintClass      ClutterSnapConstraintClass;
 
-CLUTTER_AVAILABLE_IN_1_6
+CLUTTER_EXPORT
 GType clutter_snap_constraint_get_type (void) G_GNUC_CONST;
 
-CLUTTER_AVAILABLE_IN_1_6
+CLUTTER_EXPORT
 ClutterConstraint *     clutter_snap_constraint_new             (ClutterActor          *source,
                                                                  ClutterSnapEdge        from_edge,
                                                                  ClutterSnapEdge        to_edge,
                                                                  gfloat                 offset);
 
-CLUTTER_AVAILABLE_IN_1_6
+CLUTTER_EXPORT
 void                    clutter_snap_constraint_set_source      (ClutterSnapConstraint *constraint,
                                                                  ClutterActor          *source);
-CLUTTER_AVAILABLE_IN_1_6
+CLUTTER_EXPORT
 ClutterActor *          clutter_snap_constraint_get_source      (ClutterSnapConstraint *constraint);
-CLUTTER_AVAILABLE_IN_1_6
+CLUTTER_EXPORT
 void                    clutter_snap_constraint_set_edges       (ClutterSnapConstraint *constraint,
                                                                  ClutterSnapEdge        from_edge,
                                                                  ClutterSnapEdge        to_edge);
-CLUTTER_AVAILABLE_IN_1_6
+CLUTTER_EXPORT
 void                    clutter_snap_constraint_get_edges       (ClutterSnapConstraint *constraint,
                                                                  ClutterSnapEdge       *from_edge,
                                                                  ClutterSnapEdge       *to_edge);
-CLUTTER_AVAILABLE_IN_1_6
+CLUTTER_EXPORT
 void                    clutter_snap_constraint_set_offset      (ClutterSnapConstraint *constraint,
                                                                  gfloat                 offset);
-CLUTTER_AVAILABLE_IN_1_6
+CLUTTER_EXPORT
 gfloat                  clutter_snap_constraint_get_offset      (ClutterSnapConstraint *constraint);
 
 G_END_DECLS
diff --git a/clutter/clutter/clutter-stage-manager.c b/clutter/clutter/clutter-stage-manager.c
index 702f770dd..7955a895f 100644
--- a/clutter/clutter/clutter-stage-manager.c
+++ b/clutter/clutter/clutter-stage-manager.c
@@ -43,7 +43,6 @@
 #include "clutter-marshal.h"
 #include "clutter-debug.h"
 #include "clutter-private.h"
-#include "clutter-version.h"  
 
 #include "deprecated/clutter-stage-manager.h"
 
diff --git a/clutter/clutter/clutter-stage-manager.h b/clutter/clutter/clutter-stage-manager.h
index fa3badddf..27da12e2e 100644
--- a/clutter/clutter/clutter-stage-manager.h
+++ b/clutter/clutter/clutter-stage-manager.h
@@ -69,16 +69,16 @@ struct _ClutterStageManagerClass
                           ClutterStage        *stage);
 };
 
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 GType clutter_stage_manager_get_type (void) G_GNUC_CONST;
 
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 ClutterStageManager *clutter_stage_manager_get_default       (void);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 ClutterStage *       clutter_stage_manager_get_default_stage (ClutterStageManager *stage_manager);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 GSList *             clutter_stage_manager_list_stages       (ClutterStageManager *stage_manager);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 const GSList *       clutter_stage_manager_peek_stages       (ClutterStageManager *stage_manager);
 
 G_END_DECLS
diff --git a/clutter/clutter/clutter-stage-view.h b/clutter/clutter/clutter-stage-view.h
index a737090c7..126498625 100644
--- a/clutter/clutter/clutter-stage-view.h
+++ b/clutter/clutter/clutter-stage-view.h
@@ -25,7 +25,7 @@
 #include "clutter-macros.h"
 
 #define CLUTTER_TYPE_STAGE_VIEW (clutter_stage_view_get_type ())
-CLUTTER_AVAILABLE_IN_MUTTER
+CLUTTER_EXPORT
 G_DECLARE_DERIVABLE_TYPE (ClutterStageView, clutter_stage_view,
                           CLUTTER, STAGE_VIEW,
                           GObject)
@@ -41,18 +41,18 @@ struct _ClutterStageViewClass
                                                 CoglMatrix       *matrix);
 };
 
-CLUTTER_AVAILABLE_IN_MUTTER
+CLUTTER_EXPORT
 void clutter_stage_view_get_layout (ClutterStageView      *view,
                                     cairo_rectangle_int_t *rect);
 
-CLUTTER_AVAILABLE_IN_MUTTER
+CLUTTER_EXPORT
 CoglFramebuffer *clutter_stage_view_get_framebuffer (ClutterStageView *view);
-CLUTTER_AVAILABLE_IN_MUTTER
+CLUTTER_EXPORT
 CoglFramebuffer *clutter_stage_view_get_onscreen (ClutterStageView *view);
-CLUTTER_AVAILABLE_IN_MUTTER
+CLUTTER_EXPORT
 void             clutter_stage_view_invalidate_offscreen_blit_pipeline (ClutterStageView *view);
 
-CLUTTER_AVAILABLE_IN_MUTTER
+CLUTTER_EXPORT
 void             clutter_stage_view_transform_to_onscreen (ClutterStageView *view,
                                                            gfloat           *x,
                                                            gfloat           *y);
@@ -60,7 +60,7 @@ void             clutter_stage_view_transform_to_onscreen (ClutterStageView *vie
 void clutter_stage_view_blit_offscreen (ClutterStageView            *view,
                                        const cairo_rectangle_int_t *clip);
 
-CLUTTER_AVAILABLE_IN_MUTTER
+CLUTTER_EXPORT
 float clutter_stage_view_get_scale (ClutterStageView *view);
 
 gboolean clutter_stage_view_is_dirty_viewport (ClutterStageView *view);
@@ -73,7 +73,7 @@ gboolean clutter_stage_view_is_dirty_projection (ClutterStageView *view);
 void clutter_stage_view_set_dirty_projection (ClutterStageView *view,
                                               gboolean          dirty);
 
-CLUTTER_AVAILABLE_IN_MUTTER
+CLUTTER_EXPORT
 void clutter_stage_view_get_offscreen_transformation_matrix (ClutterStageView *view,
                                                              CoglMatrix       *matrix);
 
diff --git a/clutter/clutter/clutter-stage-window.h b/clutter/clutter/clutter-stage-window.h
index 40a35ba15..50a54108f 100644
--- a/clutter/clutter/clutter-stage-window.h
+++ b/clutter/clutter/clutter-stage-window.h
@@ -88,7 +88,7 @@ struct _ClutterStageWindowIface
   void              (* finish_frame)            (ClutterStageWindow *stage_window);
 };
 
-CLUTTER_AVAILABLE_IN_MUTTER
+CLUTTER_EXPORT
 GType _clutter_stage_window_get_type (void) G_GNUC_CONST;
 
 ClutterActor *    _clutter_stage_window_get_wrapper        (ClutterStageWindow *window);
diff --git a/clutter/clutter/clutter-stage.c b/clutter/clutter/clutter-stage.c
index 6f4f8e6cc..f8d9e5222 100644
--- a/clutter/clutter/clutter-stage.c
+++ b/clutter/clutter/clutter-stage.c
@@ -72,7 +72,6 @@
 #include "clutter-private.h"
 #include "clutter-stage-manager-private.h"
 #include "clutter-stage-private.h"
-#include "clutter-version.h"   /* For flavour */
 #include "clutter-private.h"
 
 #include "cogl/cogl.h"
diff --git a/clutter/clutter/clutter-stage.h b/clutter/clutter/clutter-stage.h
index e8fbda84c..643f8d7b3 100644
--- a/clutter/clutter/clutter-stage.h
+++ b/clutter/clutter/clutter-stage.h
@@ -151,114 +151,114 @@ typedef struct _ClutterCapture
   cairo_rectangle_int_t rect;
 } ClutterCapture;
 
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 GType clutter_perspective_get_type (void) G_GNUC_CONST;
-CLUTTER_DEPRECATED_IN_1_10
+CLUTTER_DEPRECATED
 GType clutter_fog_get_type (void) G_GNUC_CONST;
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 GType clutter_stage_get_type (void) G_GNUC_CONST;
 
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 ClutterActor *  clutter_stage_new                               (void);
 
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void            clutter_stage_set_perspective                   (ClutterStage          *stage,
                                                                 ClutterPerspective    *perspective);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void            clutter_stage_get_perspective                   (ClutterStage          *stage,
                                                                 ClutterPerspective    *perspective);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void            clutter_stage_set_fullscreen                    (ClutterStage          *stage,
                                                                  gboolean               fullscreen);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 gboolean        clutter_stage_get_fullscreen                    (ClutterStage          *stage);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void            clutter_stage_show_cursor                       (ClutterStage          *stage);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void            clutter_stage_hide_cursor                       (ClutterStage          *stage);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void            clutter_stage_set_title                         (ClutterStage          *stage,
                                                                  const gchar           *title);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 const gchar *   clutter_stage_get_title                         (ClutterStage          *stage);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void            clutter_stage_set_user_resizable                (ClutterStage          *stage,
                                                                 gboolean               resizable);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 gboolean        clutter_stage_get_user_resizable                (ClutterStage          *stage);
 
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void            clutter_stage_set_minimum_size                  (ClutterStage          *stage,
                                                                  guint                  width,
                                                                  guint                  height);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void            clutter_stage_get_minimum_size                  (ClutterStage          *stage,
                                                                  guint                 *width,
                                                                  guint                 *height);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void            clutter_stage_set_no_clear_hint                 (ClutterStage          *stage,
                                                                  gboolean               no_clear);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 gboolean        clutter_stage_get_no_clear_hint                 (ClutterStage          *stage);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void            clutter_stage_set_use_alpha                     (ClutterStage          *stage,
                                                                  gboolean               use_alpha);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 gboolean        clutter_stage_get_use_alpha                     (ClutterStage          *stage);
 
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void            clutter_stage_set_key_focus                     (ClutterStage          *stage,
                                                                  ClutterActor          *actor);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 ClutterActor *  clutter_stage_get_key_focus                     (ClutterStage          *stage);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void            clutter_stage_set_throttle_motion_events        (ClutterStage          *stage,
                                                                  gboolean               throttle);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 gboolean        clutter_stage_get_throttle_motion_events        (ClutterStage          *stage);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void            clutter_stage_set_motion_events_enabled         (ClutterStage          *stage,
                                                                  gboolean               enabled);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 gboolean        clutter_stage_get_motion_events_enabled         (ClutterStage          *stage);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void            clutter_stage_set_accept_focus                  (ClutterStage          *stage,
                                                                  gboolean               accept_focus);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 gboolean        clutter_stage_get_accept_focus                  (ClutterStage          *stage);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 gboolean        clutter_stage_event                             (ClutterStage          *stage,
                                                                  ClutterEvent          *event);
 
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 ClutterActor *  clutter_stage_get_actor_at_pos                  (ClutterStage          *stage,
                                                                  ClutterPickMode        pick_mode,
                                                                  gint                   x,
                                                                  gint                   y);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 guchar *        clutter_stage_read_pixels                       (ClutterStage          *stage,
                                                                  gint                   x,
                                                                  gint                   y,
                                                                  gint                   width,
                                                                  gint                   height);
 
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void            clutter_stage_get_redraw_clip_bounds            (ClutterStage          *stage,
                                                                  cairo_rectangle_int_t *clip);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void            clutter_stage_ensure_viewport                   (ClutterStage          *stage);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void            clutter_stage_ensure_redraw                     (ClutterStage          *stage);
 
 #ifdef CLUTTER_ENABLE_EXPERIMENTAL_API
-CLUTTER_AVAILABLE_IN_1_14
+CLUTTER_EXPORT
 void            clutter_stage_set_sync_delay                    (ClutterStage          *stage,
                                                                  gint                   sync_delay);
-CLUTTER_AVAILABLE_IN_1_14
+CLUTTER_EXPORT
 void            clutter_stage_skip_sync_delay                   (ClutterStage          *stage);
 #endif
 
-CLUTTER_AVAILABLE_IN_MUTTER
+CLUTTER_EXPORT
 gboolean clutter_stage_capture (ClutterStage          *stage,
                                 gboolean               paint,
                                 cairo_rectangle_int_t *rect,
diff --git a/clutter/clutter/clutter-swipe-action.h b/clutter/clutter/clutter-swipe-action.h
index 9c18e94ad..1bf50c6bf 100644
--- a/clutter/clutter/clutter-swipe-action.h
+++ b/clutter/clutter/clutter-swipe-action.h
@@ -98,10 +98,10 @@ struct _ClutterSwipeActionClass
   void (* _clutter_swipe_action6) (void);
 };
 
-CLUTTER_AVAILABLE_IN_1_8
+CLUTTER_EXPORT
 GType clutter_swipe_action_get_type (void) G_GNUC_CONST;
 
-CLUTTER_AVAILABLE_IN_1_8
+CLUTTER_EXPORT
 ClutterAction * clutter_swipe_action_new        (void);
 
 G_END_DECLS
diff --git a/clutter/clutter/clutter-tap-action.h b/clutter/clutter/clutter-tap-action.h
index ade9c42ec..97fd604f3 100644
--- a/clutter/clutter/clutter-tap-action.h
+++ b/clutter/clutter/clutter-tap-action.h
@@ -92,10 +92,10 @@ struct _ClutterTapActionClass
   void (* _clutter_tap_action6) (void);
 };
 
-CLUTTER_AVAILABLE_IN_1_14
+CLUTTER_EXPORT
 GType clutter_tap_action_get_type (void) G_GNUC_CONST;
 
-CLUTTER_AVAILABLE_IN_1_14
+CLUTTER_EXPORT
 ClutterAction * clutter_tap_action_new   (void);
 G_END_DECLS
 
diff --git a/clutter/clutter/clutter-test-utils.h b/clutter/clutter/clutter-test-utils.h
index 81dad9737..6078533c2 100644
--- a/clutter/clutter/clutter-test-utils.h
+++ b/clutter/clutter/clutter-test-utils.h
@@ -88,26 +88,26 @@ main (int argc, char *argv[]) \
   return clutter_test_run (); \
 }
 
-CLUTTER_AVAILABLE_IN_1_18
+CLUTTER_EXPORT
 void            clutter_test_init               (int            *argc,
                                                  char         ***argv);
-CLUTTER_AVAILABLE_IN_1_18
+CLUTTER_EXPORT
 int             clutter_test_run                (void);
 
-CLUTTER_AVAILABLE_IN_1_18
+CLUTTER_EXPORT
 void            clutter_test_add                (const char     *test_path,
                                                  GTestFunc       test_func);
-CLUTTER_AVAILABLE_IN_1_18
+CLUTTER_EXPORT
 void            clutter_test_add_data           (const char     *test_path,
                                                  GTestDataFunc   test_func,
                                                  gpointer        test_data);
-CLUTTER_AVAILABLE_IN_1_18
+CLUTTER_EXPORT
 void            clutter_test_add_data_full      (const char     *test_path,
                                                  GTestDataFunc   test_func,
                                                  gpointer        test_data,
                                                  GDestroyNotify  test_notify);
 
-CLUTTER_AVAILABLE_IN_1_18
+CLUTTER_EXPORT
 ClutterActor *  clutter_test_get_stage          (void);
 
 #define clutter_test_assert_actor_at_point(stage,point,actor) \
@@ -148,12 +148,12 @@ G_STMT_START { \
   } \
 } G_STMT_END
 
-CLUTTER_AVAILABLE_IN_1_18
+CLUTTER_EXPORT
 gboolean        clutter_test_check_actor_at_point       (ClutterActor       *stage,
                                                          const ClutterPoint *point,
                                                          ClutterActor       *actor,
                                                          ClutterActor      **result);
-CLUTTER_AVAILABLE_IN_1_18
+CLUTTER_EXPORT
 gboolean        clutter_test_check_color_at_point       (ClutterActor       *stage,
                                                          const ClutterPoint *point,
                                                          const ClutterColor *color,
diff --git a/clutter/clutter/clutter-text-buffer.h b/clutter/clutter/clutter-text-buffer.h
index 468b06070..344e4cbdc 100644
--- a/clutter/clutter/clutter-text-buffer.h
+++ b/clutter/clutter/clutter-text-buffer.h
@@ -123,46 +123,46 @@ struct _ClutterTextBufferClass
   void (*_clutter_reserved8) (void);
 };
 
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 GType               clutter_text_buffer_get_type            (void) G_GNUC_CONST;
 
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 ClutterTextBuffer*  clutter_text_buffer_new                 (void);
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 ClutterTextBuffer*  clutter_text_buffer_new_with_text       (const gchar       *text,
                                                              gssize             text_len);
 
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 gsize               clutter_text_buffer_get_bytes           (ClutterTextBuffer *buffer);
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 guint               clutter_text_buffer_get_length          (ClutterTextBuffer *buffer);
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 const gchar*        clutter_text_buffer_get_text            (ClutterTextBuffer *buffer);
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 void                clutter_text_buffer_set_text            (ClutterTextBuffer *buffer,
                                                              const gchar       *chars,
                                                              gint               n_chars);
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 void                clutter_text_buffer_set_max_length      (ClutterTextBuffer *buffer,
                                                              gint               max_length);
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 gint                clutter_text_buffer_get_max_length      (ClutterTextBuffer  *buffer);
 
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 guint               clutter_text_buffer_insert_text         (ClutterTextBuffer *buffer,
                                                              guint              position,
                                                              const gchar       *chars,
                                                              gint               n_chars);
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 guint               clutter_text_buffer_delete_text         (ClutterTextBuffer *buffer,
                                                              guint              position,
                                                              gint               n_chars);
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 void                clutter_text_buffer_emit_inserted_text  (ClutterTextBuffer *buffer,
                                                              guint              position,
                                                              const gchar       *chars,
                                                              guint              n_chars);
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 void                clutter_text_buffer_emit_deleted_text   (ClutterTextBuffer *buffer,
                                                              guint              position,
                                                              guint              n_chars);
diff --git a/clutter/clutter/clutter-text.h b/clutter/clutter/clutter-text.h
index 1b17fbe03..aa65ba2e6 100644
--- a/clutter/clutter/clutter-text.h
+++ b/clutter/clutter/clutter-text.h
@@ -96,224 +96,224 @@ struct _ClutterTextClass
   void (* _clutter_reserved7) (void);
 };
 
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 GType clutter_text_get_type (void) G_GNUC_CONST;
 
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 ClutterActor *        clutter_text_new                  (void);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 ClutterActor *        clutter_text_new_full             (const gchar          *font_name,
                                                          const gchar          *text,
                                                          const ClutterColor   *color);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 ClutterActor *        clutter_text_new_with_text        (const gchar          *font_name,
                                                          const gchar          *text);
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 ClutterActor *        clutter_text_new_with_buffer      (ClutterTextBuffer    *buffer);
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 ClutterTextBuffer *   clutter_text_get_buffer           (ClutterText          *self);
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 void                  clutter_text_set_buffer           (ClutterText          *self,
                                                          ClutterTextBuffer    *buffer);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 const gchar *         clutter_text_get_text             (ClutterText          *self);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 void                  clutter_text_set_text             (ClutterText          *self,
                                                          const gchar          *text);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 void                  clutter_text_set_markup           (ClutterText          *self,
                                                          const gchar          *markup);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 void                  clutter_text_set_color            (ClutterText          *self,
                                                          const ClutterColor   *color);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 void                  clutter_text_get_color            (ClutterText          *self,
                                                          ClutterColor         *color);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 void                  clutter_text_set_font_name        (ClutterText          *self,
                                                          const gchar          *font_name);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 const gchar *         clutter_text_get_font_name        (ClutterText          *self);
-CLUTTER_AVAILABLE_IN_1_2
+CLUTTER_EXPORT
 void                  clutter_text_set_font_description (ClutterText          *self,
                                                          PangoFontDescription *font_desc);
-CLUTTER_AVAILABLE_IN_1_2
+CLUTTER_EXPORT
 PangoFontDescription *clutter_text_get_font_description (ClutterText          *self);
 
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 void                  clutter_text_set_ellipsize        (ClutterText          *self,
                                                          PangoEllipsizeMode    mode);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 PangoEllipsizeMode    clutter_text_get_ellipsize        (ClutterText          *self);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 void                  clutter_text_set_line_wrap        (ClutterText          *self,
                                                          gboolean              line_wrap);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 gboolean              clutter_text_get_line_wrap        (ClutterText          *self);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 void                  clutter_text_set_line_wrap_mode   (ClutterText          *self,
                                                          PangoWrapMode         wrap_mode);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 PangoWrapMode         clutter_text_get_line_wrap_mode   (ClutterText          *self);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 PangoLayout *         clutter_text_get_layout           (ClutterText          *self);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 void                  clutter_text_set_attributes       (ClutterText          *self,
                                                          PangoAttrList        *attrs);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 PangoAttrList *       clutter_text_get_attributes       (ClutterText          *self);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 void                  clutter_text_set_use_markup       (ClutterText          *self,
                                                          gboolean              setting);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 gboolean              clutter_text_get_use_markup       (ClutterText          *self);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 void                  clutter_text_set_line_alignment   (ClutterText          *self,
                                                          PangoAlignment        alignment);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 PangoAlignment        clutter_text_get_line_alignment   (ClutterText          *self);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 void                  clutter_text_set_justify          (ClutterText          *self,
                                                          gboolean              justify);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 gboolean              clutter_text_get_justify          (ClutterText          *self);
 
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 void                  clutter_text_insert_unichar       (ClutterText          *self,
                                                          gunichar              wc);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 void                  clutter_text_delete_chars         (ClutterText          *self,
                                                          guint                 n_chars);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 void                  clutter_text_insert_text          (ClutterText          *self,
                                                          const gchar          *text,
                                                          gssize                position);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 void                  clutter_text_delete_text          (ClutterText          *self,
                                                          gssize                start_pos,
                                                          gssize                end_pos);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 gchar *               clutter_text_get_chars            (ClutterText          *self,
                                                          gssize                start_pos,
                                                          gssize                end_pos);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 void                  clutter_text_set_editable         (ClutterText          *self,
                                                          gboolean              editable);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 gboolean              clutter_text_get_editable         (ClutterText          *self);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 void                  clutter_text_set_activatable      (ClutterText          *self,
                                                          gboolean              activatable);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 gboolean              clutter_text_get_activatable      (ClutterText          *self);
 
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 gint                  clutter_text_get_cursor_position  (ClutterText          *self);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 void                  clutter_text_set_cursor_position  (ClutterText          *self,
                                                          gint                  position);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 void                  clutter_text_set_cursor_visible   (ClutterText          *self,
                                                          gboolean              cursor_visible);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 gboolean              clutter_text_get_cursor_visible   (ClutterText          *self);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 void                  clutter_text_set_cursor_color     (ClutterText          *self,
                                                          const ClutterColor   *color);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 void                  clutter_text_get_cursor_color     (ClutterText          *self,
                                                          ClutterColor         *color);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 void                  clutter_text_set_cursor_size      (ClutterText          *self,
                                                          gint                  size);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 guint                 clutter_text_get_cursor_size      (ClutterText          *self);
-CLUTTER_AVAILABLE_IN_1_16
+CLUTTER_EXPORT
 void                  clutter_text_get_cursor_rect      (ClutterText          *self,
                                                          ClutterRect          *rect);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 void                  clutter_text_set_selectable       (ClutterText          *self,
                                                          gboolean              selectable);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 gboolean              clutter_text_get_selectable       (ClutterText          *self);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 void                  clutter_text_set_selection_bound  (ClutterText          *self,
                                                          gint                  selection_bound);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 gint                  clutter_text_get_selection_bound  (ClutterText          *self);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 void                  clutter_text_set_selection        (ClutterText          *self,
                                                          gssize                start_pos,
                                                          gssize                end_pos);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 gchar *               clutter_text_get_selection        (ClutterText          *self);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 void                  clutter_text_set_selection_color  (ClutterText          *self,
                                                          const ClutterColor   *color);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 void                  clutter_text_get_selection_color  (ClutterText          *self,
                                                          ClutterColor         *color);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 gboolean              clutter_text_delete_selection     (ClutterText          *self);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 void                  clutter_text_set_password_char    (ClutterText          *self,
                                                          gunichar              wc);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 gunichar              clutter_text_get_password_char    (ClutterText          *self);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 void                  clutter_text_set_max_length       (ClutterText          *self,
                                                          gint                  max);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 gint                  clutter_text_get_max_length       (ClutterText          *self);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 void                  clutter_text_set_single_line_mode (ClutterText          *self,
                                                          gboolean              single_line);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 gboolean              clutter_text_get_single_line_mode (ClutterText          *self);
 
-CLUTTER_AVAILABLE_IN_1_8
+CLUTTER_EXPORT
 void                  clutter_text_set_selected_text_color  (ClutterText          *self,
                                                              const ClutterColor   *color);
-CLUTTER_AVAILABLE_IN_1_8
+CLUTTER_EXPORT
 void                  clutter_text_get_selected_text_color  (ClutterText          *self,
                                                              ClutterColor         *color);
 
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 gboolean              clutter_text_activate             (ClutterText          *self);
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 gint                  clutter_text_coords_to_position   (ClutterText          *self,
                                                          gfloat                x,
                                                          gfloat                y);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 gboolean              clutter_text_position_to_coords   (ClutterText          *self,
                                                          gint                  position,
                                                          gfloat               *x,
                                                          gfloat               *y,
                                                          gfloat               *line_height);
 
-CLUTTER_AVAILABLE_IN_1_2
+CLUTTER_EXPORT
 void                  clutter_text_set_preedit_string   (ClutterText          *self,
                                                          const gchar          *preedit_str,
                                                          PangoAttrList        *preedit_attrs,
                                                          guint                 cursor_pos);
 
-CLUTTER_AVAILABLE_IN_1_8
+CLUTTER_EXPORT
 void                  clutter_text_get_layout_offsets   (ClutterText           *self,
                                                          gint                  *x,
                                                          gint                  *y);
 
-CLUTTER_AVAILABLE_IN_MUTTER
+CLUTTER_EXPORT
 void                  clutter_text_set_input_hints (ClutterText                  *self,
                                                     ClutterInputContentHintFlags  hints);
-CLUTTER_AVAILABLE_IN_MUTTER
+CLUTTER_EXPORT
 void                  clutter_text_set_input_purpose (ClutterText                *self,
                                                       ClutterInputContentPurpose  purpose);
-CLUTTER_AVAILABLE_IN_MUTTER
+CLUTTER_EXPORT
 ClutterInputContentHintFlags clutter_text_get_input_hints (ClutterText *self);
-CLUTTER_AVAILABLE_IN_MUTTER
+CLUTTER_EXPORT
 ClutterInputContentPurpose clutter_text_get_input_purpose (ClutterText *self);
 
-CLUTTER_AVAILABLE_IN_MUTTER
+CLUTTER_EXPORT
 gboolean              clutter_text_has_preedit (ClutterText *self);
 
 G_END_DECLS
diff --git a/clutter/clutter/clutter-texture.h b/clutter/clutter/clutter-texture.h
index f890969da..15f0759c9 100644
--- a/clutter/clutter/clutter-texture.h
+++ b/clutter/clutter/clutter-texture.h
@@ -67,7 +67,7 @@ typedef enum {
  * Since: 0.4
  */
 #define CLUTTER_TEXTURE_ERROR   (clutter_texture_error_quark ())
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 GQuark clutter_texture_error_quark (void);
 
 typedef struct _ClutterTexture        ClutterTexture;
@@ -122,7 +122,7 @@ struct _ClutterTextureClass
   void (*_clutter_texture5) (void);
 };
 
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 GType clutter_texture_get_type (void) G_GNUC_CONST;
 
 G_END_DECLS
diff --git a/clutter/clutter/clutter-timeline.h b/clutter/clutter/clutter-timeline.h
index 267dc63d8..036f555f0 100644
--- a/clutter/clutter/clutter-timeline.h
+++ b/clutter/clutter/clutter-timeline.h
@@ -115,110 +115,110 @@ struct _ClutterTimelineClass
   void (*_clutter_timeline_4) (void);
 };
 
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 GType clutter_timeline_get_type (void) G_GNUC_CONST;
 
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 ClutterTimeline *               clutter_timeline_new                            (guint                     
msecs);
 
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 guint                           clutter_timeline_get_duration                   (ClutterTimeline          
*timeline);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void                            clutter_timeline_set_duration                   (ClutterTimeline          
*timeline,
                                                                                  guint                     
msecs);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 ClutterTimelineDirection        clutter_timeline_get_direction                  (ClutterTimeline          
*timeline);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void                            clutter_timeline_set_direction                  (ClutterTimeline          
*timeline,
                                                                                  ClutterTimelineDirection  
direction);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void                            clutter_timeline_start                          (ClutterTimeline          
*timeline);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void                            clutter_timeline_pause                          (ClutterTimeline          
*timeline);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void                            clutter_timeline_stop                           (ClutterTimeline          
*timeline);
-CLUTTER_AVAILABLE_IN_1_6
+CLUTTER_EXPORT
 void                            clutter_timeline_set_auto_reverse               (ClutterTimeline          
*timeline,
                                                                                  gboolean                  
reverse);
-CLUTTER_AVAILABLE_IN_1_6
+CLUTTER_EXPORT
 gboolean                        clutter_timeline_get_auto_reverse               (ClutterTimeline          
*timeline);
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 void                            clutter_timeline_set_repeat_count               (ClutterTimeline          
*timeline,
                                                                                  gint                      
count);
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 gint                            clutter_timeline_get_repeat_count               (ClutterTimeline          
*timeline);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void                            clutter_timeline_rewind                         (ClutterTimeline          
*timeline);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void                            clutter_timeline_skip                           (ClutterTimeline          
*timeline,
                                                                                  guint                     
msecs);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void                            clutter_timeline_advance                        (ClutterTimeline          
*timeline,
                                                                                  guint                     
msecs);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 guint                           clutter_timeline_get_elapsed_time               (ClutterTimeline          
*timeline);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 gdouble                         clutter_timeline_get_progress                   (ClutterTimeline          
*timeline);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 gboolean                        clutter_timeline_is_playing                     (ClutterTimeline          
*timeline);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void                            clutter_timeline_set_delay                      (ClutterTimeline          
*timeline,
                                                                                  guint                     
msecs);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 guint                           clutter_timeline_get_delay                      (ClutterTimeline          
*timeline);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 guint                           clutter_timeline_get_delta                      (ClutterTimeline          
*timeline);
-CLUTTER_AVAILABLE_IN_1_14
+CLUTTER_EXPORT
 void                            clutter_timeline_add_marker                     (ClutterTimeline          
*timeline,
                                                                                  const gchar              
*marker_name,
                                                                                  gdouble                   
progress);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void                            clutter_timeline_add_marker_at_time             (ClutterTimeline          
*timeline,
                                                                                  const gchar              
*marker_name,
                                                                                  guint                     
msecs);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void                            clutter_timeline_remove_marker                  (ClutterTimeline          
*timeline,
                                                                                  const gchar              
*marker_name);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 gchar **                        clutter_timeline_list_markers                   (ClutterTimeline          
*timeline,
                                                                                  gint                      
msecs,
                                                                                  gsize                    
*n_markers) G_GNUC_MALLOC;
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 gboolean                        clutter_timeline_has_marker                     (ClutterTimeline          
*timeline,
                                                                                  const gchar              
*marker_name);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void                            clutter_timeline_advance_to_marker              (ClutterTimeline          
*timeline,
                                                                                  const gchar              
*marker_name);
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 void                            clutter_timeline_set_progress_func              (ClutterTimeline          
*timeline,
                                                                                  ClutterTimelineProgressFunc 
func,
                                                                                  gpointer                  
data,
                                                                                  GDestroyNotify            
notify);
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 void                            clutter_timeline_set_progress_mode              (ClutterTimeline          
*timeline,
                                                                                  ClutterAnimationMode      
mode);
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 ClutterAnimationMode            clutter_timeline_get_progress_mode              (ClutterTimeline          
*timeline);
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 void                            clutter_timeline_set_step_progress              (ClutterTimeline          
*timeline,
                                                                                  gint                      
n_steps,
                                                                                  ClutterStepMode           
step_mode);
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 gboolean                        clutter_timeline_get_step_progress              (ClutterTimeline          
*timeline,
                                                                                  gint                     
*n_steps,
                                                                                  ClutterStepMode          
*step_mode);
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 void                            clutter_timeline_set_cubic_bezier_progress      (ClutterTimeline          
*timeline,
                                                                                  const ClutterPoint       
*c_1,
                                                                                  const ClutterPoint       
*c_2);
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 gboolean                        clutter_timeline_get_cubic_bezier_progress      (ClutterTimeline          
*timeline,
                                                                                  ClutterPoint             
*c_1,
                                                                                  ClutterPoint             
*c_2);
 
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 gint64                          clutter_timeline_get_duration_hint              (ClutterTimeline          
*timeline);
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 gint                            clutter_timeline_get_current_repeat             (ClutterTimeline          
*timeline);
 
 G_END_DECLS
diff --git a/clutter/clutter/clutter-transition-group.h b/clutter/clutter/clutter-transition-group.h
index b2a9ce107..a98b7715c 100644
--- a/clutter/clutter/clutter-transition-group.h
+++ b/clutter/clutter/clutter-transition-group.h
@@ -75,19 +75,19 @@ struct _ClutterTransitionGroupClass
   gpointer _padding[8];
 };
 
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 GType clutter_transition_group_get_type (void) G_GNUC_CONST;
 
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 ClutterTransition *     clutter_transition_group_new            (void);
 
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 void                    clutter_transition_group_add_transition         (ClutterTransitionGroup *group,
                                                                          ClutterTransition      *transition);
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 void                    clutter_transition_group_remove_transition      (ClutterTransitionGroup *group,
                                                                          ClutterTransition      *transition);
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 void                    clutter_transition_group_remove_all             (ClutterTransitionGroup *group);
 
 G_END_DECLS
diff --git a/clutter/clutter/clutter-transition.h b/clutter/clutter/clutter-transition.h
index 7ea9bfa01..6f8e4dc1a 100644
--- a/clutter/clutter/clutter-transition.h
+++ b/clutter/clutter/clutter-transition.h
@@ -93,38 +93,38 @@ struct _ClutterTransitionClass
   gpointer _padding[8];
 };
 
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 GType clutter_transition_get_type (void) G_GNUC_CONST;
 
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 void                    clutter_transition_set_interval                 (ClutterTransition *transition,
                                                                          ClutterInterval   *interval);
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 ClutterInterval *       clutter_transition_get_interval                 (ClutterTransition *transition);
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 void                    clutter_transition_set_from_value               (ClutterTransition *transition,
                                                                          const GValue      *value);
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 void                    clutter_transition_set_to_value                 (ClutterTransition *transition,
                                                                          const GValue      *value);
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 void                    clutter_transition_set_from                     (ClutterTransition *transition,
                                                                          GType              value_type,
                                                                          ...);
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 void                    clutter_transition_set_to                       (ClutterTransition *transition,
                                                                          GType              value_type,
                                                                          ...);
 
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 void                    clutter_transition_set_animatable               (ClutterTransition *transition,
                                                                          ClutterAnimatable *animatable);
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 ClutterAnimatable *     clutter_transition_get_animatable               (ClutterTransition *transition);
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 void                    clutter_transition_set_remove_on_complete       (ClutterTransition *transition,
                                                                          gboolean           remove_complete);
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 gboolean                clutter_transition_get_remove_on_complete       (ClutterTransition *transition);
 
 G_END_DECLS
diff --git a/clutter/clutter/clutter-types.h b/clutter/clutter/clutter-types.h
index d7f3dfb9c..12544565b 100644
--- a/clutter/clutter/clutter-types.h
+++ b/clutter/clutter/clutter-types.h
@@ -178,25 +178,25 @@ struct _ClutterPoint
  */
 #define CLUTTER_POINT_INIT_ZERO         CLUTTER_POINT_INIT (0.f, 0.f)
 
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 GType clutter_point_get_type (void) G_GNUC_CONST;
 
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 const ClutterPoint *    clutter_point_zero      (void);
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 ClutterPoint *          clutter_point_alloc     (void);
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 ClutterPoint *          clutter_point_init      (ClutterPoint       *point,
                                                  float               x,
                                                  float               y);
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 ClutterPoint *          clutter_point_copy      (const ClutterPoint *point);
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 void                    clutter_point_free      (ClutterPoint       *point);
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 gboolean                clutter_point_equals    (const ClutterPoint *a,
                                                  const ClutterPoint *b);
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 float                   clutter_point_distance  (const ClutterPoint *a,
                                                  const ClutterPoint *b,
                                                  float              *x_distance,
@@ -242,20 +242,20 @@ struct _ClutterSize
  */
 #define CLUTTER_SIZE_INIT_ZERO          CLUTTER_SIZE_INIT (0.f, 0.f)
 
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 GType clutter_size_get_type (void) G_GNUC_CONST;
 
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 ClutterSize *   clutter_size_alloc      (void);
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 ClutterSize *   clutter_size_init       (ClutterSize       *size,
                                          float              width,
                                          float              height);
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 ClutterSize *   clutter_size_copy       (const ClutterSize *size);
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 void            clutter_size_free       (ClutterSize       *size);
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 gboolean        clutter_size_equals     (const ClutterSize *a,
                                          const ClutterSize *b);
 
@@ -313,63 +313,63 @@ struct _ClutterRect
  */
 #define CLUTTER_RECT_INIT_ZERO                  CLUTTER_RECT_INIT (0.f, 0.f, 0.f, 0.f)
 
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 GType clutter_rect_get_type (void) G_GNUC_CONST;
 
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 const ClutterRect *     clutter_rect_zero               (void);
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 ClutterRect *           clutter_rect_alloc              (void);
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 ClutterRect *           clutter_rect_init               (ClutterRect       *rect,
                                                          float              x,
                                                          float              y,
                                                          float              width,
                                                          float              height);
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 ClutterRect *           clutter_rect_copy               (const ClutterRect *rect);
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 void                    clutter_rect_free               (ClutterRect       *rect);
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 gboolean                clutter_rect_equals             (ClutterRect       *a,
                                                          ClutterRect       *b);
 
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 ClutterRect *           clutter_rect_normalize          (ClutterRect       *rect);
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 void                    clutter_rect_get_center         (ClutterRect       *rect,
                                                          ClutterPoint      *center);
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 gboolean                clutter_rect_contains_point     (ClutterRect       *rect,
                                                          ClutterPoint      *point);
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 gboolean                clutter_rect_contains_rect      (ClutterRect       *a,
                                                          ClutterRect       *b);
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 void                    clutter_rect_union              (ClutterRect       *a,
                                                          ClutterRect       *b,
                                                          ClutterRect       *res);
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 gboolean                clutter_rect_intersection       (ClutterRect       *a,
                                                          ClutterRect       *b,
                                                          ClutterRect       *res);
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 void                    clutter_rect_offset             (ClutterRect       *rect,
                                                          float              d_x,
                                                          float              d_y);
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 void                    clutter_rect_inset              (ClutterRect       *rect,
                                                          float              d_x,
                                                          float              d_y);
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 void                    clutter_rect_clamp_to_pixel     (ClutterRect       *rect);
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 float                   clutter_rect_get_x              (ClutterRect       *rect);
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 float                   clutter_rect_get_y              (ClutterRect       *rect);
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 float                   clutter_rect_get_width          (ClutterRect       *rect);
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 float                   clutter_rect_get_height         (ClutterRect       *rect);
 
 /**
@@ -414,24 +414,24 @@ struct _ClutterVertex
  */
 #define CLUTTER_VERTEX_INIT_ZERO        CLUTTER_VERTEX_INIT (0.f, 0.f, 0.f)
 
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 GType          clutter_vertex_get_type (void) G_GNUC_CONST;
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 ClutterVertex *clutter_vertex_new      (gfloat               x,
                                         gfloat               y,
                                         gfloat               z);
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 ClutterVertex *clutter_vertex_alloc    (void);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 ClutterVertex *clutter_vertex_init     (ClutterVertex       *vertex,
                                         gfloat               x,
                                         gfloat               y,
                                         gfloat               z);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 ClutterVertex *clutter_vertex_copy     (const ClutterVertex *vertex);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void           clutter_vertex_free     (ClutterVertex       *vertex);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 gboolean       clutter_vertex_equal    (const ClutterVertex *vertex_a,
                                         const ClutterVertex *vertex_b);
 
@@ -487,76 +487,76 @@ struct _ClutterActorBox
  */
 #define CLUTTER_ACTOR_BOX_INIT_ZERO                     CLUTTER_ACTOR_BOX_INIT (0.f, 0.f, 0.f, 0.f)
 
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 GType            clutter_actor_box_get_type      (void) G_GNUC_CONST;
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 ClutterActorBox *clutter_actor_box_new           (gfloat                 x_1,
                                                   gfloat                 y_1,
                                                   gfloat                 x_2,
                                                   gfloat                 y_2);
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 ClutterActorBox *clutter_actor_box_alloc         (void);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 ClutterActorBox *clutter_actor_box_init          (ClutterActorBox       *box,
                                                   gfloat                 x_1,
                                                   gfloat                 y_1,
                                                   gfloat                 x_2,
                                                   gfloat                 y_2);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void             clutter_actor_box_init_rect     (ClutterActorBox       *box,
                                                   gfloat                 x,
                                                   gfloat                 y,
                                                   gfloat                 width,
                                                   gfloat                 height);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 ClutterActorBox *clutter_actor_box_copy          (const ClutterActorBox *box);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void             clutter_actor_box_free          (ClutterActorBox       *box);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 gboolean         clutter_actor_box_equal         (const ClutterActorBox *box_a,
                                                   const ClutterActorBox *box_b);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 gfloat           clutter_actor_box_get_x         (const ClutterActorBox *box);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 gfloat           clutter_actor_box_get_y         (const ClutterActorBox *box);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 gfloat           clutter_actor_box_get_width     (const ClutterActorBox *box);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 gfloat           clutter_actor_box_get_height    (const ClutterActorBox *box);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void             clutter_actor_box_get_origin    (const ClutterActorBox *box,
                                                   gfloat                *x,
                                                   gfloat                *y);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void             clutter_actor_box_get_size      (const ClutterActorBox *box,
                                                   gfloat                *width,
                                                   gfloat                *height);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 gfloat           clutter_actor_box_get_area      (const ClutterActorBox *box);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 gboolean         clutter_actor_box_contains      (const ClutterActorBox *box,
                                                   gfloat                 x,
                                                   gfloat                 y);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void             clutter_actor_box_from_vertices (ClutterActorBox       *box,
                                                   const ClutterVertex    verts[]);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void             clutter_actor_box_interpolate   (const ClutterActorBox *initial,
                                                   const ClutterActorBox *final,
                                                   gdouble                progress,
                                                   ClutterActorBox       *result);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void             clutter_actor_box_clamp_to_pixel (ClutterActorBox       *box);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void             clutter_actor_box_union          (const ClutterActorBox *a,
                                                    const ClutterActorBox *b,
                                                    ClutterActorBox       *result);
 
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void             clutter_actor_box_set_origin     (ClutterActorBox       *box,
                                                    gfloat                 x,
                                                    gfloat                 y);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void             clutter_actor_box_set_size       (ClutterActorBox       *box,
                                                    gfloat                 width,
                                                    gfloat                 height);
@@ -585,14 +585,14 @@ struct _ClutterGeometry
   guint  height;
 };
 
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 GType clutter_geometry_get_type (void) G_GNUC_CONST;
 
-CLUTTER_DEPRECATED_IN_1_16
+CLUTTER_DEPRECATED
 void      clutter_geometry_union      (const ClutterGeometry *geometry_a,
                                        const ClutterGeometry *geometry_b,
                                        ClutterGeometry       *result);
-CLUTTER_DEPRECATED_IN_1_16
+CLUTTER_DEPRECATED
 gboolean  clutter_geometry_intersects (const ClutterGeometry *geometry0,
                                        const ClutterGeometry *geometry1);
 
@@ -611,13 +611,13 @@ struct _ClutterKnot
   gint y;
 };
 
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 GType        clutter_knot_get_type (void) G_GNUC_CONST;
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 ClutterKnot *clutter_knot_copy     (const ClutterKnot *knot);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void         clutter_knot_free     (ClutterKnot       *knot);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 gboolean     clutter_knot_equal    (const ClutterKnot *knot_a,
                                     const ClutterKnot *knot_b);
 
@@ -642,14 +642,14 @@ struct _ClutterPathNode
   ClutterKnot points[3];
 };
 
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 GType clutter_path_node_get_type (void) G_GNUC_CONST;
 
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 ClutterPathNode *clutter_path_node_copy  (const ClutterPathNode *node);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 void             clutter_path_node_free  (ClutterPathNode       *node);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 gboolean         clutter_path_node_equal (const ClutterPathNode *node_a,
                                           const ClutterPathNode *node_b);
 
@@ -657,43 +657,43 @@ gboolean         clutter_path_node_equal (const ClutterPathNode *node_a,
  * ClutterPaintVolume
  */
 
-CLUTTER_AVAILABLE_IN_1_2
+CLUTTER_EXPORT
 GType clutter_paint_volume_get_type (void) G_GNUC_CONST;
 
-CLUTTER_AVAILABLE_IN_1_2
+CLUTTER_EXPORT
 ClutterPaintVolume *clutter_paint_volume_copy                (const ClutterPaintVolume *pv);
-CLUTTER_AVAILABLE_IN_1_2
+CLUTTER_EXPORT
 void                clutter_paint_volume_free                (ClutterPaintVolume       *pv);
 
-CLUTTER_AVAILABLE_IN_1_2
+CLUTTER_EXPORT
 void                clutter_paint_volume_set_origin          (ClutterPaintVolume       *pv,
                                                               const ClutterVertex      *origin);
-CLUTTER_AVAILABLE_IN_1_2
+CLUTTER_EXPORT
 void                clutter_paint_volume_get_origin          (const ClutterPaintVolume *pv,
                                                               ClutterVertex            *vertex);
-CLUTTER_AVAILABLE_IN_1_2
+CLUTTER_EXPORT
 void                clutter_paint_volume_set_width           (ClutterPaintVolume       *pv,
                                                               gfloat                    width);
-CLUTTER_AVAILABLE_IN_1_2
+CLUTTER_EXPORT
 gfloat              clutter_paint_volume_get_width           (const ClutterPaintVolume *pv);
-CLUTTER_AVAILABLE_IN_1_2
+CLUTTER_EXPORT
 void                clutter_paint_volume_set_height          (ClutterPaintVolume       *pv,
                                                               gfloat                    height);
-CLUTTER_AVAILABLE_IN_1_2
+CLUTTER_EXPORT
 gfloat              clutter_paint_volume_get_height          (const ClutterPaintVolume *pv);
-CLUTTER_AVAILABLE_IN_1_2
+CLUTTER_EXPORT
 void                clutter_paint_volume_set_depth           (ClutterPaintVolume       *pv,
                                                               gfloat                    depth);
-CLUTTER_AVAILABLE_IN_1_2
+CLUTTER_EXPORT
 gfloat              clutter_paint_volume_get_depth           (const ClutterPaintVolume *pv);
-CLUTTER_AVAILABLE_IN_1_2
+CLUTTER_EXPORT
 void                clutter_paint_volume_union               (ClutterPaintVolume       *pv,
                                                               const ClutterPaintVolume *another_pv);
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 void                clutter_paint_volume_union_box           (ClutterPaintVolume       *pv,
                                                               const ClutterActorBox    *box);
 
-CLUTTER_AVAILABLE_IN_1_2
+CLUTTER_EXPORT
 gboolean            clutter_paint_volume_set_from_allocation (ClutterPaintVolume       *pv,
                                                               ClutterActor             *actor);
 
@@ -716,14 +716,14 @@ struct _ClutterMargin
   float bottom;
 };
 
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 GType clutter_margin_get_type (void) G_GNUC_CONST;
 
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 ClutterMargin * clutter_margin_new      (void) G_GNUC_MALLOC;
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 ClutterMargin * clutter_margin_copy     (const ClutterMargin *margin_);
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 void            clutter_margin_free     (ClutterMargin       *margin_);
 
 /**
@@ -754,24 +754,24 @@ typedef gboolean (* ClutterProgressFunc) (const GValue *a,
                                           gdouble       progress,
                                           GValue       *retval);
 
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 void clutter_interval_register_progress_func (GType               value_type,
                                               ClutterProgressFunc func);
 
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 GType clutter_matrix_get_type (void) G_GNUC_CONST;
 
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 ClutterMatrix * clutter_matrix_alloc            (void);
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 ClutterMatrix * clutter_matrix_init_identity    (ClutterMatrix       *matrix);
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 ClutterMatrix * clutter_matrix_init_from_array  (ClutterMatrix       *matrix,
                                                  const float          values[16]);
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 ClutterMatrix * clutter_matrix_init_from_matrix (ClutterMatrix       *a,
                                                  const ClutterMatrix *b);
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 void            clutter_matrix_free             (ClutterMatrix       *matrix);
 
 G_END_DECLS
diff --git a/clutter/clutter/clutter-units.h b/clutter/clutter/clutter-units.h
index 549be9f8f..900f90d2b 100644
--- a/clutter/clutter/clutter-units.h
+++ b/clutter/clutter/clutter-units.h
@@ -70,45 +70,45 @@ struct _ClutterUnits
   gint64 __padding_2;
 };
 
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 GType           clutter_units_get_type         (void) G_GNUC_CONST;
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 ClutterUnitType clutter_units_get_unit_type    (const ClutterUnits *units);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 gfloat          clutter_units_get_unit_value   (const ClutterUnits *units);
 
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 ClutterUnits *  clutter_units_copy             (const ClutterUnits *units);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 void            clutter_units_free             (ClutterUnits       *units);
 
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 void            clutter_units_from_pixels      (ClutterUnits       *units,
                                                 gint                px);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 void            clutter_units_from_em          (ClutterUnits       *units,
                                                 gfloat              em);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 void            clutter_units_from_em_for_font (ClutterUnits       *units,
                                                 const gchar        *font_name,
                                                 gfloat              em);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 void            clutter_units_from_mm          (ClutterUnits       *units,
                                                 gfloat              mm);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 void            clutter_units_from_cm          (ClutterUnits       *units,
                                                 gfloat              cm);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 void            clutter_units_from_pt          (ClutterUnits       *units,
                                                 gfloat              pt);
 
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 gfloat          clutter_units_to_pixels        (ClutterUnits       *units);
 
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 gboolean        clutter_units_from_string      (ClutterUnits       *units,
                                                 const gchar        *str);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 gchar *         clutter_units_to_string        (const ClutterUnits *units);
 
 /* shorthands for the constructors */
@@ -160,10 +160,10 @@ struct _ClutterParamSpecUnits
   gfloat maximum;
 };
 
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 GType clutter_param_units_get_type (void) G_GNUC_CONST;
 
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 GParamSpec *            clutter_param_spec_units (const gchar        *name,
                                                   const gchar        *nick,
                                                   const gchar        *blurb,
@@ -173,10 +173,10 @@ GParamSpec *            clutter_param_spec_units (const gchar        *name,
                                                   gfloat              default_value,
                                                   GParamFlags         flags);
 
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 void                    clutter_value_set_units  (GValue             *value,
                                                   const ClutterUnits *units);
-CLUTTER_AVAILABLE_IN_1_0
+CLUTTER_EXPORT
 const ClutterUnits *    clutter_value_get_units  (const GValue       *value);
 
 G_END_DECLS
diff --git a/clutter/clutter/clutter-virtual-input-device.h b/clutter/clutter/clutter-virtual-input-device.h
index 11b747a7f..3e25dbeac 100644
--- a/clutter/clutter/clutter-virtual-input-device.h
+++ b/clutter/clutter/clutter-virtual-input-device.h
@@ -31,7 +31,7 @@
 
 #define CLUTTER_TYPE_VIRTUAL_INPUT_DEVICE (clutter_virtual_input_device_get_type ())
 
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 G_DECLARE_DERIVABLE_TYPE (ClutterVirtualInputDevice,
                           clutter_virtual_input_device,
                           CLUTTER, VIRTUAL_INPUT_DEVICE,
@@ -106,43 +106,43 @@ struct _ClutterVirtualInputDeviceClass
                            int                        slot);
 };
 
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void clutter_virtual_input_device_notify_relative_motion (ClutterVirtualInputDevice *virtual_device,
                                                           uint64_t                   time_us,
                                                           double                     dx,
                                                           double                     dy);
 
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void clutter_virtual_input_device_notify_absolute_motion (ClutterVirtualInputDevice *virtual_device,
                                                           uint64_t                   time_us,
                                                           double                     x,
                                                           double                     y);
 
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void clutter_virtual_input_device_notify_button (ClutterVirtualInputDevice *virtual_device,
                                                  uint64_t                   time_us,
                                                  uint32_t                   button,
                                                  ClutterButtonState         button_state);
 
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void clutter_virtual_input_device_notify_key (ClutterVirtualInputDevice *virtual_device,
                                               uint64_t                   time_us,
                                               uint32_t                   key,
                                               ClutterKeyState            key_state);
 
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void clutter_virtual_input_device_notify_keyval (ClutterVirtualInputDevice *virtual_device,
                                                  uint64_t                   time_us,
                                                  uint32_t                   keyval,
                                                  ClutterKeyState            key_state);
 
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void clutter_virtual_input_device_notify_discrete_scroll (ClutterVirtualInputDevice *virtual_device,
                                                           uint64_t                   time_us,
                                                           ClutterScrollDirection     direction,
                                                           ClutterScrollSource        scroll_source);
 
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void clutter_virtual_input_device_notify_scroll_continuous (ClutterVirtualInputDevice *virtual_device,
                                                             uint64_t                   time_us,
                                                             double                     dx,
@@ -150,26 +150,26 @@ void clutter_virtual_input_device_notify_scroll_continuous (ClutterVirtualInputD
                                                             ClutterScrollSource        scroll_source,
                                                             ClutterScrollFinishFlags   finish_flags);
 
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void clutter_virtual_input_device_notify_touch_down (ClutterVirtualInputDevice *virtual_device,
                                                      uint64_t                   time_us,
                                                      int                        slot,
                                                      double                     x,
                                                      double                     y);
 
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void clutter_virtual_input_device_notify_touch_motion (ClutterVirtualInputDevice *virtual_device,
                                                        uint64_t                   time_us,
                                                        int                        slot,
                                                        double                     x,
                                                        double                     y);
 
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void clutter_virtual_input_device_notify_touch_up (ClutterVirtualInputDevice *virtual_device,
                                                    uint64_t                   time_us,
                                                    int                        slot);
 
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 ClutterDeviceManager * clutter_virtual_input_device_get_manager (ClutterVirtualInputDevice *virtual_device);
 
 int clutter_virtual_input_device_get_device_type (ClutterVirtualInputDevice *virtual_device);
diff --git a/clutter/clutter/clutter-zoom-action.h b/clutter/clutter/clutter-zoom-action.h
index 496b36ea9..2a4601684 100644
--- a/clutter/clutter/clutter-zoom-action.h
+++ b/clutter/clutter/clutter-zoom-action.h
@@ -90,22 +90,22 @@ struct _ClutterZoomActionClass
   void (* _clutter_zoom_action5) (void);
 };
 
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 GType clutter_zoom_action_get_type (void) G_GNUC_CONST;
 
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 ClutterAction * clutter_zoom_action_new                         (void);
 
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 void            clutter_zoom_action_set_zoom_axis               (ClutterZoomAction *action,
                                                                  ClutterZoomAxis    axis);
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 ClutterZoomAxis clutter_zoom_action_get_zoom_axis               (ClutterZoomAction *action);
 
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 void            clutter_zoom_action_get_focal_point             (ClutterZoomAction *action,
                                                                  ClutterPoint      *point);
-CLUTTER_AVAILABLE_IN_1_12
+CLUTTER_EXPORT
 void            clutter_zoom_action_get_transformed_focal_point (ClutterZoomAction *action,
                                                                  ClutterPoint      *point);
 
diff --git a/clutter/clutter/clutter.h b/clutter/clutter/clutter.h
index 721e30e7e..cd6b53798 100644
--- a/clutter/clutter/clutter.h
+++ b/clutter/clutter/clutter.h
@@ -108,7 +108,6 @@
 #include "clutter-transition-group.h"
 #include "clutter-transition.h"
 #include "clutter-units.h"
-#include "clutter-version.h"
 #include "clutter-virtual-input-device.h"
 #include "clutter-zoom-action.h"
 
diff --git a/clutter/clutter/cogl/clutter-stage-cogl.h b/clutter/clutter/cogl/clutter-stage-cogl.h
index 6122f2b1e..17958cd24 100644
--- a/clutter/clutter/cogl/clutter-stage-cogl.h
+++ b/clutter/clutter/cogl/clutter-stage-cogl.h
@@ -28,7 +28,7 @@ typedef struct _ClutterStageCoglClass    ClutterStageCoglClass;
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterStageCogl, g_object_unref)
 
 #define CLUTTER_TYPE_STAGE_VIEW_COGL (clutter_stage_view_cogl_get_type ())
-CLUTTER_AVAILABLE_IN_MUTTER
+CLUTTER_EXPORT
 G_DECLARE_DERIVABLE_TYPE (ClutterStageViewCogl, clutter_stage_view_cogl,
                           CLUTTER, STAGE_VIEW_COGL,
                           ClutterStageView)
@@ -73,10 +73,10 @@ struct _ClutterStageCoglClass
   GObjectClass parent_class;
 };
 
-CLUTTER_AVAILABLE_IN_MUTTER
+CLUTTER_EXPORT
 GType _clutter_stage_cogl_get_type (void) G_GNUC_CONST;
 
-CLUTTER_AVAILABLE_IN_MUTTER
+CLUTTER_EXPORT
 void _clutter_stage_cogl_presented (ClutterStageCogl *stage_cogl,
                                     CoglFrameEvent    frame_event,
                                     ClutterFrameInfo *frame_info);
diff --git a/clutter/clutter/deprecated/clutter-actor.h b/clutter/clutter/deprecated/clutter-actor.h
index 9302e9423..6f12ddf4e 100644
--- a/clutter/clutter/deprecated/clutter-actor.h
+++ b/clutter/clutter/deprecated/clutter-actor.h
@@ -33,126 +33,126 @@
 
 G_BEGIN_DECLS
 
-CLUTTER_DEPRECATED_IN_1_10
+CLUTTER_DEPRECATED
 void            clutter_actor_set_geometry                      (ClutterActor          *self,
                                                                  const ClutterGeometry *geometry);
 
-CLUTTER_DEPRECATED_IN_1_10_FOR(clutter_actor_get_allocation_geometry)
+CLUTTER_DEPRECATED_FOR(clutter_actor_get_allocation_geometry)
 void            clutter_actor_get_geometry                      (ClutterActor          *self,
                                                                  ClutterGeometry       *geometry);
-CLUTTER_DEPRECATED_IN_1_8
+CLUTTER_DEPRECATED
 guint32         clutter_actor_get_gid                           (ClutterActor          *self);
 
-CLUTTER_DEPRECATED_IN_1_8
+CLUTTER_DEPRECATED
 ClutterActor *  clutter_get_actor_by_gid                        (guint32                id_);
 
-CLUTTER_DEPRECATED_IN_1_10_FOR(clutter_actor_remove_child() and clutter_actor_add_child())
+CLUTTER_DEPRECATED_FOR(clutter_actor_remove_child() and clutter_actor_add_child())
 void            clutter_actor_reparent                          (ClutterActor          *self,
                                                                  ClutterActor          *new_parent);
 
-CLUTTER_DEPRECATED_IN_1_10_FOR(clutter_actor_add_child)
+CLUTTER_DEPRECATED_FOR(clutter_actor_add_child)
 void            clutter_actor_set_parent                        (ClutterActor          *self,
                                                                  ClutterActor          *parent);
 
-CLUTTER_DEPRECATED_IN_1_10_FOR(clutter_actor_remove_child)
+CLUTTER_DEPRECATED_FOR(clutter_actor_remove_child)
 void            clutter_actor_unparent                          (ClutterActor          *self);
 
-CLUTTER_DEPRECATED_IN_1_10_FOR(clutter_actor_set_child_above_sibling)
+CLUTTER_DEPRECATED_FOR(clutter_actor_set_child_above_sibling)
 void            clutter_actor_raise                             (ClutterActor          *self,
                                                                  ClutterActor          *below);
 
-CLUTTER_DEPRECATED_IN_1_10_FOR(clutter_actor_set_child_below_sibling)
+CLUTTER_DEPRECATED_FOR(clutter_actor_set_child_below_sibling)
 void            clutter_actor_lower                             (ClutterActor          *self,
                                                                  ClutterActor          *above);
 
-CLUTTER_DEPRECATED_IN_1_10_FOR(clutter_actor_set_child_above_sibling() with NULL sibling)
+CLUTTER_DEPRECATED_FOR(clutter_actor_set_child_above_sibling() with NULL sibling)
 void            clutter_actor_raise_top                         (ClutterActor          *self);
 
-CLUTTER_DEPRECATED_IN_1_10_FOR(clutter_actor_set_child_below_sibling() with NULL sibling)
+CLUTTER_DEPRECATED_FOR(clutter_actor_set_child_below_sibling() with NULL sibling)
 void            clutter_actor_lower_bottom                      (ClutterActor          *self);
 
-CLUTTER_DEPRECATED_IN_1_10
+CLUTTER_DEPRECATED
 void            clutter_actor_push_internal                     (ClutterActor          *self);
 
-CLUTTER_DEPRECATED_IN_1_10
+CLUTTER_DEPRECATED
 void            clutter_actor_pop_internal                      (ClutterActor          *self);
 
-CLUTTER_DEPRECATED_IN_1_10
+CLUTTER_DEPRECATED
 void            clutter_actor_show_all                          (ClutterActor          *self);
 
-CLUTTER_DEPRECATED_IN_1_10
+CLUTTER_DEPRECATED
 void            clutter_actor_hide_all                          (ClutterActor          *self);
 
-CLUTTER_DEPRECATED_IN_1_12_FOR(clutter_actor_set_z_position)
+CLUTTER_DEPRECATED_FOR(clutter_actor_set_z_position)
 void            clutter_actor_set_depth                         (ClutterActor          *self,
                                                                  gfloat                 depth);
 
-CLUTTER_DEPRECATED_IN_1_12_FOR(clutter_actor_get_z_position)
+CLUTTER_DEPRECATED_FOR(clutter_actor_get_z_position)
 gfloat          clutter_actor_get_depth                         (ClutterActor          *self);
 
-CLUTTER_DEPRECATED_IN_1_12_FOR(clutter_actor_set_rotation_angle)
+CLUTTER_DEPRECATED_FOR(clutter_actor_set_rotation_angle)
 void            clutter_actor_set_rotation                      (ClutterActor          *self,
                                                                  ClutterRotateAxis      axis,
                                                                  gdouble                angle,
                                                                  gfloat                 x,
                                                                  gfloat                 y,
                                                                  gfloat                 z);
-CLUTTER_DEPRECATED_IN_1_12_FOR(clutter_actor_set_rotation_angle and clutter_actor_set_pivot_point)
+CLUTTER_DEPRECATED_FOR(clutter_actor_set_rotation_angle and clutter_actor_set_pivot_point)
 void            clutter_actor_set_z_rotation_from_gravity       (ClutterActor          *self,
                                                                  gdouble                angle,
                                                                  ClutterGravity         gravity);
-CLUTTER_DEPRECATED_IN_1_12_FOR(clutter_actor_get_rotation_angle)
+CLUTTER_DEPRECATED_FOR(clutter_actor_get_rotation_angle)
 gdouble         clutter_actor_get_rotation                      (ClutterActor          *self,
                                                                  ClutterRotateAxis      axis,
                                                                  gfloat                *x,
                                                                  gfloat                *y,
                                                                  gfloat                *z);
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 ClutterGravity  clutter_actor_get_z_rotation_gravity            (ClutterActor          *self);
 
-CLUTTER_DEPRECATED_IN_1_12_FOR(clutter_actor_set_scale and clutter_actor_set_pivot_point)
+CLUTTER_DEPRECATED_FOR(clutter_actor_set_scale and clutter_actor_set_pivot_point)
 void            clutter_actor_set_scale_full                    (ClutterActor          *self,
                                                                  gdouble                scale_x,
                                                                  gdouble                scale_y,
                                                                  gfloat                 center_x,
                                                                  gfloat                 center_y);
-CLUTTER_DEPRECATED_IN_1_12_FOR(clutter_actor_set_scale and clutter_actor_set_pivot_point)
+CLUTTER_DEPRECATED_FOR(clutter_actor_set_scale and clutter_actor_set_pivot_point)
 void            clutter_actor_set_scale_with_gravity            (ClutterActor          *self,
                                                                  gdouble                scale_x,
                                                                  gdouble                scale_y,
                                                                  ClutterGravity         gravity);
-CLUTTER_DEPRECATED_IN_1_12_FOR(clutter_actor_get_pivot_point)
+CLUTTER_DEPRECATED_FOR(clutter_actor_get_pivot_point)
 void            clutter_actor_get_scale_center                  (ClutterActor          *self,
                                                                  gfloat                *center_x,
                                                                  gfloat                *center_y);
-CLUTTER_DEPRECATED_IN_1_12_FOR(clutter_actor_get_pivot_point)
+CLUTTER_DEPRECATED_FOR(clutter_actor_get_pivot_point)
 ClutterGravity  clutter_actor_get_scale_gravity                 (ClutterActor          *self);
 
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 void            clutter_actor_set_anchor_point                  (ClutterActor          *self,
                                                                  gfloat                 anchor_x,
                                                                  gfloat                 anchor_y);
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 void            clutter_actor_move_anchor_point                 (ClutterActor          *self,
                                                                  gfloat                 anchor_x,
                                                                  gfloat                 anchor_y);
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 void            clutter_actor_get_anchor_point                  (ClutterActor          *self,
                                                                  gfloat                *anchor_x,
                                                                  gfloat                *anchor_y);
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 ClutterGravity  clutter_actor_get_anchor_point_gravity          (ClutterActor          *self);
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 void            clutter_actor_set_anchor_point_from_gravity     (ClutterActor          *self,
                                                                  ClutterGravity         gravity);
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 void            clutter_actor_move_anchor_point_from_gravity    (ClutterActor          *self,
                                                                  ClutterGravity         gravity);
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 void            clutter_actor_get_transformation_matrix         (ClutterActor          *self,
                                                                  ClutterMatrix         *matrix);
 
-CLUTTER_DEPRECATED_IN_1_12_FOR (clutter_actor_get_allocation_box)
+CLUTTER_DEPRECATED_FOR (clutter_actor_get_allocation_box)
 void            clutter_actor_get_allocation_geometry           (ClutterActor          *self,
                                                                  ClutterGeometry       *geom);
 
diff --git a/clutter/clutter/deprecated/clutter-alpha.h b/clutter/clutter/deprecated/clutter-alpha.h
index 8a0dff661..6ee9376c4 100644
--- a/clutter/clutter/deprecated/clutter-alpha.h
+++ b/clutter/clutter/deprecated/clutter-alpha.h
@@ -104,45 +104,45 @@ struct _ClutterAlphaClass
   void (*_clutter_alpha_5) (void);
 }; 
 
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 GType clutter_alpha_get_type (void) G_GNUC_CONST;
 
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 ClutterAlpha *   clutter_alpha_new              (void);
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 ClutterAlpha *   clutter_alpha_new_full         (ClutterTimeline  *timeline,
                                                  gulong            mode);
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 ClutterAlpha *   clutter_alpha_new_with_func    (ClutterTimeline  *timeline,
                                                  ClutterAlphaFunc  func,
                                                  gpointer          data,
                                                  GDestroyNotify    destroy);
 
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 gdouble          clutter_alpha_get_alpha        (ClutterAlpha     *alpha);
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 void             clutter_alpha_set_func         (ClutterAlpha     *alpha,
                                                  ClutterAlphaFunc  func,
                                                  gpointer          data,
                                                  GDestroyNotify    destroy);
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 void             clutter_alpha_set_closure      (ClutterAlpha     *alpha,
                                                  GClosure         *closure);
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 void             clutter_alpha_set_timeline     (ClutterAlpha     *alpha,
                                                  ClutterTimeline  *timeline);
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 ClutterTimeline *clutter_alpha_get_timeline     (ClutterAlpha     *alpha);
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 void             clutter_alpha_set_mode         (ClutterAlpha     *alpha,
                                                  gulong            mode);
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 gulong           clutter_alpha_get_mode         (ClutterAlpha     *alpha);
 
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 gulong           clutter_alpha_register_func    (ClutterAlphaFunc  func,
                                                  gpointer          data);
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 gulong           clutter_alpha_register_closure (GClosure         *closure);
 
 G_END_DECLS
diff --git a/clutter/clutter/deprecated/clutter-animatable.h b/clutter/clutter/deprecated/clutter-animatable.h
index df40e288e..78ba7415c 100644
--- a/clutter/clutter/deprecated/clutter-animatable.h
+++ b/clutter/clutter/deprecated/clutter-animatable.h
@@ -33,7 +33,7 @@
 
 G_BEGIN_DECLS
 
-CLUTTER_DEPRECATED_IN_1_8_FOR(clutter_animatable_interpolate_value)
+CLUTTER_DEPRECATED_FOR(clutter_animatable_interpolate_value)
 gboolean        clutter_animatable_animate_property     (ClutterAnimatable *animatable,
                                                          ClutterAnimation  *animation,
                                                          const gchar       *property_name,
diff --git a/clutter/clutter/deprecated/clutter-animation.h b/clutter/clutter/deprecated/clutter-animation.h
index 3b2310bb4..ae0059535 100644
--- a/clutter/clutter/deprecated/clutter-animation.h
+++ b/clutter/clutter/deprecated/clutter-animation.h
@@ -94,115 +94,115 @@ struct _ClutterAnimationClass
   void (*_clutter_reserved8) (void);
 };
 
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 GType clutter_animation_get_type (void) G_GNUC_CONST;
 
-CLUTTER_DEPRECATED_IN_1_12_FOR(clutter_property_transition_new)
+CLUTTER_DEPRECATED_FOR(clutter_property_transition_new)
 ClutterAnimation *      clutter_animation_new                   (void);
 
-CLUTTER_DEPRECATED_IN_1_12_FOR(clutter_transition_set_animatable)
+CLUTTER_DEPRECATED_FOR(clutter_transition_set_animatable)
 void                    clutter_animation_set_object            (ClutterAnimation     *animation,
                                                                  GObject              *object);
-CLUTTER_DEPRECATED_IN_1_12_FOR(clutter_transition_get_animatable)
+CLUTTER_DEPRECATED_FOR(clutter_transition_get_animatable)
 GObject *               clutter_animation_get_object            (ClutterAnimation     *animation);
-CLUTTER_DEPRECATED_IN_1_12_FOR(clutter_timeline_set_progress_mode)
+CLUTTER_DEPRECATED_FOR(clutter_timeline_set_progress_mode)
 void                    clutter_animation_set_mode              (ClutterAnimation     *animation,
                                                                  gulong                mode);
-CLUTTER_DEPRECATED_IN_1_12_FOR(clutter_timeline_get_progress_mode)
+CLUTTER_DEPRECATED_FOR(clutter_timeline_get_progress_mode)
 gulong                  clutter_animation_get_mode              (ClutterAnimation     *animation);
-CLUTTER_DEPRECATED_IN_1_12_FOR(clutter_timeline_set_duration)
+CLUTTER_DEPRECATED_FOR(clutter_timeline_set_duration)
 void                    clutter_animation_set_duration          (ClutterAnimation     *animation,
                                                                  guint                 msecs);
-CLUTTER_DEPRECATED_IN_1_12_FOR(clutter_timeline_get_duration)
+CLUTTER_DEPRECATED_FOR(clutter_timeline_get_duration)
 guint                   clutter_animation_get_duration          (ClutterAnimation     *animation);
-CLUTTER_DEPRECATED_IN_1_12_FOR(clutter_timeline_set_repeat_count)
+CLUTTER_DEPRECATED_FOR(clutter_timeline_set_repeat_count)
 void                    clutter_animation_set_loop              (ClutterAnimation     *animation,
                                                                  gboolean              loop);
-CLUTTER_DEPRECATED_IN_1_12_FOR(clutter_timeline_get_repeat_count)
+CLUTTER_DEPRECATED_FOR(clutter_timeline_get_repeat_count)
 gboolean                clutter_animation_get_loop              (ClutterAnimation     *animation);
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 void                    clutter_animation_set_timeline          (ClutterAnimation     *animation,
                                                                  ClutterTimeline      *timeline);
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 ClutterTimeline *       clutter_animation_get_timeline          (ClutterAnimation     *animation);
-CLUTTER_DEPRECATED_IN_1_10_FOR(clutter_animation_set_timeline)
+CLUTTER_DEPRECATED_FOR(clutter_animation_set_timeline)
 void                    clutter_animation_set_alpha             (ClutterAnimation     *animation,
                                                                  ClutterAlpha         *alpha);
-CLUTTER_DEPRECATED_IN_1_10_FOR(clutter_animation_get_timeline)
+CLUTTER_DEPRECATED_FOR(clutter_animation_get_timeline)
 ClutterAlpha *          clutter_animation_get_alpha             (ClutterAnimation     *animation);
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 ClutterAnimation *      clutter_animation_bind                  (ClutterAnimation     *animation,
                                                                  const gchar          *property_name,
                                                                  const GValue         *final);
-CLUTTER_DEPRECATED_IN_1_12_FOR(clutter_transition_set_interval)
+CLUTTER_DEPRECATED_FOR(clutter_transition_set_interval)
 ClutterAnimation *      clutter_animation_bind_interval         (ClutterAnimation     *animation,
                                                                  const gchar          *property_name,
                                                                  ClutterInterval      *interval);
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 gboolean                clutter_animation_has_property          (ClutterAnimation     *animation,
                                                                  const gchar          *property_name);
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 ClutterAnimation *      clutter_animation_update                (ClutterAnimation     *animation,
                                                                  const gchar          *property_name,
                                                                  const GValue         *final);
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 void                    clutter_animation_update_interval       (ClutterAnimation     *animation,
                                                                  const gchar          *property_name,
                                                                  ClutterInterval      *interval);
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 void                    clutter_animation_unbind_property       (ClutterAnimation     *animation,
                                                                  const gchar          *property_name);
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 ClutterInterval     *   clutter_animation_get_interval          (ClutterAnimation     *animation,
                                                                  const gchar          *property_name);
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 void                    clutter_animation_completed             (ClutterAnimation     *animation);
 
 /*
  * ClutterActor API
  */
 
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 ClutterAnimation *      clutter_actor_animate                   (ClutterActor         *actor,
                                                                  gulong                mode,
                                                                  guint                 duration,
                                                                  const gchar          *first_property_name,
                                                                  ...) G_GNUC_NULL_TERMINATED;
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 ClutterAnimation *      clutter_actor_animate_with_timeline     (ClutterActor         *actor,
                                                                  gulong                mode,
                                                                  ClutterTimeline      *timeline,
                                                                  const gchar          *first_property_name,
                                                                  ...) G_GNUC_NULL_TERMINATED;
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 ClutterAnimation *      clutter_actor_animatev                  (ClutterActor         *actor,
                                                                  gulong                mode,
                                                                  guint                 duration,
                                                                  gint                  n_properties,
                                                                  const gchar * const   properties[],
                                                                  const GValue         *values);
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 ClutterAnimation *      clutter_actor_animate_with_timelinev    (ClutterActor         *actor,
                                                                  gulong                mode,
                                                                  ClutterTimeline      *timeline,
                                                                  gint                  n_properties,
                                                                  const gchar * const   properties[],
                                                                  const GValue         *values);
-CLUTTER_DEPRECATED_IN_1_10_FOR(clutter_actor_animate_with_timeline)
+CLUTTER_DEPRECATED_FOR(clutter_actor_animate_with_timeline)
 ClutterAnimation *      clutter_actor_animate_with_alpha        (ClutterActor         *actor,
                                                                  ClutterAlpha         *alpha,
                                                                  const gchar          *first_property_name,
                                                                  ...) G_GNUC_NULL_TERMINATED;
-CLUTTER_DEPRECATED_IN_1_10_FOR(clutter_actor_animate_with_timelinev)
+CLUTTER_DEPRECATED_FOR(clutter_actor_animate_with_timelinev)
 ClutterAnimation *      clutter_actor_animate_with_alphav       (ClutterActor         *actor,
                                                                  ClutterAlpha         *alpha,
                                                                  gint                  n_properties,
                                                                  const gchar * const   properties[],
                                                                  const GValue         *values);
 
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 ClutterAnimation *      clutter_actor_get_animation             (ClutterActor         *actor);
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 void                    clutter_actor_detach_animation          (ClutterActor         *actor);
 
 G_END_DECLS
diff --git a/clutter/clutter/deprecated/clutter-animator.h b/clutter/clutter/deprecated/clutter-animator.h
index a72e27a4c..af738f4b3 100644
--- a/clutter/clutter/deprecated/clutter-animator.h
+++ b/clutter/clutter/deprecated/clutter-animator.h
@@ -95,91 +95,91 @@ struct _ClutterAnimatorClass
   gpointer _padding_dummy[16];
 };
 
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 GType                clutter_animator_get_type                   (void) G_GNUC_CONST;
 
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 ClutterAnimator *    clutter_animator_new                        (void);
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 ClutterAnimator *    clutter_animator_set_key                    (ClutterAnimator      *animator,
                                                                   GObject              *object,
                                                                   const gchar          *property_name,
                                                                   guint                 mode,
                                                                   gdouble               progress,
                                                                   const GValue         *value);
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 void                 clutter_animator_set                        (ClutterAnimator      *animator,
                                                                   gpointer              first_object,
                                                                   const gchar          *first_property_name,
                                                                   guint                 first_mode,
                                                                   gdouble               first_progress,
                                                                   ...) G_GNUC_NULL_TERMINATED;
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 GList              * clutter_animator_get_keys                   (ClutterAnimator      *animator,
                                                                   GObject              *object,
                                                                   const gchar          *property_name,
                                                                   gdouble               progress);
 
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 void                 clutter_animator_remove_key                 (ClutterAnimator      *animator,
                                                                   GObject              *object, 
                                                                   const gchar          *property_name,
                                                                   gdouble               progress);
 
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 ClutterTimeline *    clutter_animator_start                      (ClutterAnimator      *animator);
 
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 gboolean             clutter_animator_compute_value              (ClutterAnimator      *animator,
                                                                   GObject              *object,
                                                                   const gchar          *property_name,
                                                                   gdouble               progress,
                                                                   GValue               *value);
 
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 ClutterTimeline *    clutter_animator_get_timeline               (ClutterAnimator      *animator);
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 void                 clutter_animator_set_timeline               (ClutterAnimator      *animator,
                                                                   ClutterTimeline      *timeline);
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 guint                clutter_animator_get_duration               (ClutterAnimator      *animator);
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 void                 clutter_animator_set_duration               (ClutterAnimator      *animator,
                                                                   guint                 duration);
 
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 gboolean             clutter_animator_property_get_ease_in       (ClutterAnimator      *animator,
                                                                   GObject              *object,
                                                                   const gchar          *property_name);
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 void                 clutter_animator_property_set_ease_in       (ClutterAnimator      *animator,
                                                                   GObject              *object,
                                                                   const gchar          *property_name,
                                                                   gboolean              ease_in);
 
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 ClutterInterpolation clutter_animator_property_get_interpolation (ClutterAnimator      *animator,
                                                                   GObject              *object,
                                                                   const gchar          *property_name);
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 void                 clutter_animator_property_set_interpolation (ClutterAnimator      *animator,
                                                                   GObject              *object,
                                                                   const gchar          *property_name,
                                                                   ClutterInterpolation  interpolation);
 
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 GType           clutter_animator_key_get_type           (void) G_GNUC_CONST;
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 GObject *       clutter_animator_key_get_object         (const ClutterAnimatorKey *key);
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 const gchar *   clutter_animator_key_get_property_name  (const ClutterAnimatorKey *key);
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 GType           clutter_animator_key_get_property_type  (const ClutterAnimatorKey *key);
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 gulong          clutter_animator_key_get_mode           (const ClutterAnimatorKey *key);
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 gdouble         clutter_animator_key_get_progress       (const ClutterAnimatorKey *key);
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 gboolean        clutter_animator_key_get_value          (const ClutterAnimatorKey *key,
                                                          GValue                   *value);
 
diff --git a/clutter/clutter/deprecated/clutter-backend.h b/clutter/clutter/deprecated/clutter-backend.h
index 3fe027449..25a666278 100644
--- a/clutter/clutter/deprecated/clutter-backend.h
+++ b/clutter/clutter/deprecated/clutter-backend.h
@@ -33,29 +33,29 @@
 
 G_BEGIN_DECLS
 
-CLUTTER_DEPRECATED_IN_1_4_FOR(ClutterSettings:font_dpi)
+CLUTTER_DEPRECATED_FOR(ClutterSettings:font_dpi)
 void            clutter_backend_set_resolution                  (ClutterBackend *backend,
                                                                  gdouble         dpi);
 
-CLUTTER_DEPRECATED_IN_1_4_FOR(ClutterSettings:double_click_time)
+CLUTTER_DEPRECATED_FOR(ClutterSettings:double_click_time)
 void            clutter_backend_set_double_click_time           (ClutterBackend *backend,
                                                                  guint           msec);
 
-CLUTTER_DEPRECATED_IN_1_4_FOR(ClutterSettings:double_click_time)
+CLUTTER_DEPRECATED_FOR(ClutterSettings:double_click_time)
 guint           clutter_backend_get_double_click_time           (ClutterBackend *backend);
 
-CLUTTER_DEPRECATED_IN_1_4_FOR(ClutterSettings:double_click_distance)
+CLUTTER_DEPRECATED_FOR(ClutterSettings:double_click_distance)
 void            clutter_backend_set_double_click_distance       (ClutterBackend *backend,
                                                                  guint           distance);
 
-CLUTTER_DEPRECATED_IN_1_4_FOR(ClutterSettings:double_click_distance)
+CLUTTER_DEPRECATED_FOR(ClutterSettings:double_click_distance)
 guint           clutter_backend_get_double_click_distance       (ClutterBackend *backend);
 
-CLUTTER_DEPRECATED_IN_1_4_FOR(ClutterSettings:font_name)
+CLUTTER_DEPRECATED_FOR(ClutterSettings:font_name)
 void            clutter_backend_set_font_name                   (ClutterBackend *backend,
                                                                  const gchar    *font_name);
 
-CLUTTER_DEPRECATED_IN_1_4_FOR(ClutterSettings:font_name)
+CLUTTER_DEPRECATED_FOR(ClutterSettings:font_name)
 const gchar *   clutter_backend_get_font_name                   (ClutterBackend *backend);
 
 
diff --git a/clutter/clutter/deprecated/clutter-behaviour-depth.h 
b/clutter/clutter/deprecated/clutter-behaviour-depth.h
index b3b8ae1c2..417989a03 100644
--- a/clutter/clutter/deprecated/clutter-behaviour-depth.h
+++ b/clutter/clutter/deprecated/clutter-behaviour-depth.h
@@ -79,19 +79,19 @@ struct _ClutterBehaviourDepthClass
   ClutterBehaviourClass parent_class;
 };
 
-CLUTTER_DEPRECATED_IN_1_6
+CLUTTER_DEPRECATED
 GType             clutter_behaviour_depth_get_type (void) G_GNUC_CONST;
 
-CLUTTER_DEPRECATED_IN_1_6_FOR(clutter_actor_animate and ClutterActor:depth)
+CLUTTER_DEPRECATED_FOR(clutter_actor_animate and ClutterActor:depth)
 ClutterBehaviour *clutter_behaviour_depth_new      (ClutterAlpha *alpha,
                                                     gint          depth_start,
                                                     gint          depth_end);
 
-CLUTTER_DEPRECATED_IN_1_6
+CLUTTER_DEPRECATED
 void clutter_behaviour_depth_set_bounds (ClutterBehaviourDepth *behaviour,
                                          gint                   depth_start,
                                          gint                   depth_end);
-CLUTTER_DEPRECATED_IN_1_6
+CLUTTER_DEPRECATED
 void clutter_behaviour_depth_get_bounds (ClutterBehaviourDepth *behaviour,
                                          gint                  *depth_start,
                                          gint                  *depth_end);
diff --git a/clutter/clutter/deprecated/clutter-behaviour-ellipse.h 
b/clutter/clutter/deprecated/clutter-behaviour-ellipse.h
index bd9983f35..39676eddb 100644
--- a/clutter/clutter/deprecated/clutter-behaviour-ellipse.h
+++ b/clutter/clutter/deprecated/clutter-behaviour-ellipse.h
@@ -90,10 +90,10 @@ struct _ClutterBehaviourEllipseClass
   ClutterBehaviourClass   parent_class;
 };
 
-CLUTTER_DEPRECATED_IN_1_8
+CLUTTER_DEPRECATED
 GType clutter_behaviour_ellipse_get_type (void) G_GNUC_CONST;
 
-CLUTTER_DEPRECATED_IN_1_8_FOR(clutter_actor_animate)
+CLUTTER_DEPRECATED_FOR(clutter_actor_animate)
 ClutterBehaviour *     clutter_behaviour_ellipse_new             (ClutterAlpha            *alpha,
                                                                  gint                     x,
                                                                  gint                     y,
@@ -103,54 +103,54 @@ ClutterBehaviour *     clutter_behaviour_ellipse_new             (ClutterAlpha
                                                                  gdouble                  start,
                                                                  gdouble                  end);
 
-CLUTTER_DEPRECATED_IN_1_8
+CLUTTER_DEPRECATED
 void                   clutter_behaviour_ellipse_set_center      (ClutterBehaviourEllipse *self,
                                                                  gint                     x,
                                                                  gint                     y);
-CLUTTER_DEPRECATED_IN_1_8
+CLUTTER_DEPRECATED
 void                   clutter_behaviour_ellipse_get_center      (ClutterBehaviourEllipse *self,
                                                                  gint                    *x,
                                                                  gint                    *y);
-CLUTTER_DEPRECATED_IN_1_6
+CLUTTER_DEPRECATED
 void                   clutter_behaviour_ellipse_set_width       (ClutterBehaviourEllipse *self,
                                                                  gint                     width);
-CLUTTER_DEPRECATED_IN_1_6
+CLUTTER_DEPRECATED
 gint                   clutter_behaviour_ellipse_get_width       (ClutterBehaviourEllipse *self);
-CLUTTER_DEPRECATED_IN_1_6
+CLUTTER_DEPRECATED
 void                   clutter_behaviour_ellipse_set_height      (ClutterBehaviourEllipse *self,
                                                                  gint                     height);
-CLUTTER_DEPRECATED_IN_1_6
+CLUTTER_DEPRECATED
 gint                   clutter_behaviour_ellipse_get_height      (ClutterBehaviourEllipse *self);
-CLUTTER_DEPRECATED_IN_1_6
+CLUTTER_DEPRECATED
 void                   clutter_behaviour_ellipse_set_angle_start (ClutterBehaviourEllipse *self,
                                                                  gdouble                  angle_start);
-CLUTTER_DEPRECATED_IN_1_6
+CLUTTER_DEPRECATED
 gdouble                clutter_behaviour_ellipse_get_angle_start (ClutterBehaviourEllipse *self);
-CLUTTER_DEPRECATED_IN_1_6
+CLUTTER_DEPRECATED
 void                   clutter_behaviour_ellipse_set_angle_end   (ClutterBehaviourEllipse *self,
                                                                  gdouble                  angle_end);
-CLUTTER_DEPRECATED_IN_1_6
+CLUTTER_DEPRECATED
 gdouble                clutter_behaviour_ellipse_get_angle_end   (ClutterBehaviourEllipse *self);
-CLUTTER_DEPRECATED_IN_1_6
+CLUTTER_DEPRECATED
 void                   clutter_behaviour_ellipse_set_angle_tilt  (ClutterBehaviourEllipse *self,
                                                                  ClutterRotateAxis        axis,
                                                                  gdouble                  angle_tilt);
-CLUTTER_DEPRECATED_IN_1_6
+CLUTTER_DEPRECATED
 gdouble                clutter_behaviour_ellipse_get_angle_tilt  (ClutterBehaviourEllipse *self,
                                                                  ClutterRotateAxis        axis);
-CLUTTER_DEPRECATED_IN_1_6
+CLUTTER_DEPRECATED
 void                   clutter_behaviour_ellipse_set_tilt        (ClutterBehaviourEllipse *self,
                                                                  gdouble                  angle_tilt_x,
                                                                  gdouble                  angle_tilt_y,
                                                                  gdouble                  angle_tilt_z);
-CLUTTER_DEPRECATED_IN_1_6
+CLUTTER_DEPRECATED
 void                   clutter_behaviour_ellipse_get_tilt        (ClutterBehaviourEllipse *self,
                                                                  gdouble                 *angle_tilt_x,
                                                                  gdouble                 *angle_tilt_y,
                                                                  gdouble                 *angle_tilt_z);
-CLUTTER_DEPRECATED_IN_1_6
+CLUTTER_DEPRECATED
 ClutterRotateDirection clutter_behaviour_ellipse_get_direction   (ClutterBehaviourEllipse *self);
-CLUTTER_DEPRECATED_IN_1_6
+CLUTTER_DEPRECATED
 void                   clutter_behaviour_ellipse_set_direction   (ClutterBehaviourEllipse *self,
                                                                  ClutterRotateDirection   direction);
 
diff --git a/clutter/clutter/deprecated/clutter-behaviour-opacity.h 
b/clutter/clutter/deprecated/clutter-behaviour-opacity.h
index a8beef1fc..2f562ee64 100644
--- a/clutter/clutter/deprecated/clutter-behaviour-opacity.h
+++ b/clutter/clutter/deprecated/clutter-behaviour-opacity.h
@@ -93,19 +93,19 @@ struct _ClutterBehaviourOpacityClass
   ClutterBehaviourClass   parent_class;
 };
 
-CLUTTER_DEPRECATED_IN_1_6
+CLUTTER_DEPRECATED
 GType clutter_behaviour_opacity_get_type (void) G_GNUC_CONST;
 
-CLUTTER_DEPRECATED_IN_1_6_FOR(clutter_actor_animate and ClutterActor:opacity)
+CLUTTER_DEPRECATED_FOR(clutter_actor_animate and ClutterActor:opacity)
 ClutterBehaviour *clutter_behaviour_opacity_new (ClutterAlpha *alpha,
                                                  guint8        opacity_start,
                                                  guint8        opacity_end);
 
-CLUTTER_DEPRECATED_IN_1_6
+CLUTTER_DEPRECATED
 void clutter_behaviour_opacity_set_bounds (ClutterBehaviourOpacity *behaviour,
                                            guint8                   opacity_start,
                                            guint8                   opacity_end);
-CLUTTER_DEPRECATED_IN_1_6
+CLUTTER_DEPRECATED
 void clutter_behaviour_opacity_get_bounds (ClutterBehaviourOpacity *behaviour,
                                            guint8                  *opacity_start,
                                            guint8                  *opacity_end);
diff --git a/clutter/clutter/deprecated/clutter-behaviour-path.h 
b/clutter/clutter/deprecated/clutter-behaviour-path.h
index f78ebcbff..f1e4c9986 100644
--- a/clutter/clutter/deprecated/clutter-behaviour-path.h
+++ b/clutter/clutter/deprecated/clutter-behaviour-path.h
@@ -106,28 +106,28 @@ struct _ClutterBehaviourPathClass
   void (*_clutter_path_4) (void);
 };
 
-CLUTTER_DEPRECATED_IN_1_6
+CLUTTER_DEPRECATED
 GType clutter_behaviour_path_get_type (void) G_GNUC_CONST;
 
-CLUTTER_DEPRECATED_IN_1_6_FOR(clutter_actor_animate)
+CLUTTER_DEPRECATED_FOR(clutter_actor_animate)
 ClutterBehaviour *clutter_behaviour_path_new          (ClutterAlpha         *alpha,
                                                        ClutterPath          *path);
 
-CLUTTER_DEPRECATED_IN_1_6_FOR(clutter_actor_animate)
+CLUTTER_DEPRECATED_FOR(clutter_actor_animate)
 ClutterBehaviour *clutter_behaviour_path_new_with_description
                                                       (ClutterAlpha         *alpha,
                                                        const gchar          *desc);
 
-CLUTTER_DEPRECATED_IN_1_6_FOR(clutter_actor_animate)
+CLUTTER_DEPRECATED_FOR(clutter_actor_animate)
 ClutterBehaviour *clutter_behaviour_path_new_with_knots
                                                       (ClutterAlpha         *alpha,
                                                        const ClutterKnot    *knots,
                                                        guint                 n_knots);
 
-CLUTTER_DEPRECATED_IN_1_6
+CLUTTER_DEPRECATED
 void              clutter_behaviour_path_set_path     (ClutterBehaviourPath *pathb,
                                                        ClutterPath          *path);
-CLUTTER_DEPRECATED_IN_1_6
+CLUTTER_DEPRECATED
 ClutterPath *     clutter_behaviour_path_get_path     (ClutterBehaviourPath *pathb);
 
 G_END_DECLS
diff --git a/clutter/clutter/deprecated/clutter-behaviour-rotate.h 
b/clutter/clutter/deprecated/clutter-behaviour-rotate.h
index 55f58b322..e51c93434 100644
--- a/clutter/clutter/deprecated/clutter-behaviour-rotate.h
+++ b/clutter/clutter/deprecated/clutter-behaviour-rotate.h
@@ -76,40 +76,40 @@ struct _ClutterBehaviourRotateClass
   ClutterBehaviourClass parent_class;
 };
 
-CLUTTER_DEPRECATED_IN_1_6
+CLUTTER_DEPRECATED
 GType clutter_behaviour_rotate_get_type (void) G_GNUC_CONST;
 
-CLUTTER_DEPRECATED_IN_1_6_FOR(clutter_actor_animate)
+CLUTTER_DEPRECATED_FOR(clutter_actor_animate)
 ClutterBehaviour *     clutter_behaviour_rotate_new           (ClutterAlpha           *alpha,
                                                                ClutterRotateAxis       axis,
                                                                ClutterRotateDirection  direction,
                                                                gdouble                 angle_start,
                                                                gdouble                 angle_end);
-CLUTTER_DEPRECATED_IN_1_6
+CLUTTER_DEPRECATED
 void                   clutter_behaviour_rotate_get_center    (ClutterBehaviourRotate *rotate,
                                                               gint                   *x,
                                                               gint                   *y,
                                                               gint                   *z);
-CLUTTER_DEPRECATED_IN_1_6
+CLUTTER_DEPRECATED
 void                   clutter_behaviour_rotate_set_center    (ClutterBehaviourRotate *rotate,
                                                               gint                    x,
                                                               gint                    y,
                                                               gint                    z);
-CLUTTER_DEPRECATED_IN_1_6
+CLUTTER_DEPRECATED
 ClutterRotateAxis      clutter_behaviour_rotate_get_axis      (ClutterBehaviourRotate *rotate);
-CLUTTER_DEPRECATED_IN_1_6
+CLUTTER_DEPRECATED
 void                   clutter_behaviour_rotate_set_axis      (ClutterBehaviourRotate *rotate,
                                                                ClutterRotateAxis       axis);
-CLUTTER_DEPRECATED_IN_1_6
+CLUTTER_DEPRECATED
 ClutterRotateDirection clutter_behaviour_rotate_get_direction (ClutterBehaviourRotate *rotate);
-CLUTTER_DEPRECATED_IN_1_6
+CLUTTER_DEPRECATED
 void                   clutter_behaviour_rotate_set_direction (ClutterBehaviourRotate *rotate,
                                                                ClutterRotateDirection  direction);
-CLUTTER_DEPRECATED_IN_1_6
+CLUTTER_DEPRECATED
 void                   clutter_behaviour_rotate_get_bounds    (ClutterBehaviourRotate *rotate,
                                                                gdouble                *angle_start,
                                                                gdouble                *angle_end);
-CLUTTER_DEPRECATED_IN_1_6
+CLUTTER_DEPRECATED
 void                   clutter_behaviour_rotate_set_bounds    (ClutterBehaviourRotate *rotate,
                                                                gdouble                 angle_start,
                                                                gdouble                 angle_end);
diff --git a/clutter/clutter/deprecated/clutter-behaviour-scale.h 
b/clutter/clutter/deprecated/clutter-behaviour-scale.h
index e3f779740..3bf308870 100644
--- a/clutter/clutter/deprecated/clutter-behaviour-scale.h
+++ b/clutter/clutter/deprecated/clutter-behaviour-scale.h
@@ -79,23 +79,23 @@ struct _ClutterBehaviourScaleClass
   ClutterBehaviourClass parent_class;
 };
 
-CLUTTER_DEPRECATED_IN_1_6
+CLUTTER_DEPRECATED
 GType clutter_behaviour_scale_get_type (void) G_GNUC_CONST;
 
-CLUTTER_DEPRECATED_IN_1_6_FOR(clutter_actor_animate with ClutterActor:scale-x and ClutterActor:scale-y)
+CLUTTER_DEPRECATED_FOR(clutter_actor_animate with ClutterActor:scale-x and ClutterActor:scale-y)
 ClutterBehaviour *clutter_behaviour_scale_new        (ClutterAlpha          *alpha,
                                                       gdouble                x_scale_start,
                                                       gdouble                y_scale_start,
                                                       gdouble                x_scale_end,
                                                       gdouble                y_scale_end);
 
-CLUTTER_DEPRECATED_IN_1_6
+CLUTTER_DEPRECATED
 void              clutter_behaviour_scale_set_bounds (ClutterBehaviourScale *scale,
                                                       gdouble                x_scale_start,
                                                       gdouble                y_scale_start,
                                                       gdouble                x_scale_end,
                                                       gdouble                y_scale_end);
-CLUTTER_DEPRECATED_IN_1_6
+CLUTTER_DEPRECATED
 void              clutter_behaviour_scale_get_bounds (ClutterBehaviourScale *scale,
                                                       gdouble               *x_scale_start,
                                                       gdouble               *y_scale_start,
diff --git a/clutter/clutter/deprecated/clutter-behaviour.h b/clutter/clutter/deprecated/clutter-behaviour.h
index 295d1cfdb..061e3364d 100644
--- a/clutter/clutter/deprecated/clutter-behaviour.h
+++ b/clutter/clutter/deprecated/clutter-behaviour.h
@@ -134,34 +134,34 @@ struct _ClutterBehaviourClass
   void (*_clutter_behaviour6) (void);
 };
 
-CLUTTER_DEPRECATED_IN_1_6
+CLUTTER_DEPRECATED
 GType clutter_behaviour_get_type (void) G_GNUC_CONST;
 
-CLUTTER_DEPRECATED_IN_1_6
+CLUTTER_DEPRECATED
 void          clutter_behaviour_apply          (ClutterBehaviour            *behave,
                                                 ClutterActor                *actor);
-CLUTTER_DEPRECATED_IN_1_6
+CLUTTER_DEPRECATED
 void          clutter_behaviour_remove         (ClutterBehaviour            *behave,
                                                 ClutterActor                *actor);
-CLUTTER_DEPRECATED_IN_1_6
+CLUTTER_DEPRECATED
 void          clutter_behaviour_remove_all     (ClutterBehaviour            *behave);
-CLUTTER_DEPRECATED_IN_1_6
+CLUTTER_DEPRECATED
 void          clutter_behaviour_actors_foreach (ClutterBehaviour            *behave,
                                                 ClutterBehaviourForeachFunc  func,
                                                 gpointer                     data);
-CLUTTER_DEPRECATED_IN_1_6
+CLUTTER_DEPRECATED
 gint          clutter_behaviour_get_n_actors   (ClutterBehaviour            *behave);
-CLUTTER_DEPRECATED_IN_1_6
+CLUTTER_DEPRECATED
 ClutterActor *clutter_behaviour_get_nth_actor  (ClutterBehaviour            *behave,
                                                gint                         index_);
-CLUTTER_DEPRECATED_IN_1_6
+CLUTTER_DEPRECATED
 GSList *      clutter_behaviour_get_actors     (ClutterBehaviour            *behave);
-CLUTTER_DEPRECATED_IN_1_6
+CLUTTER_DEPRECATED
 ClutterAlpha *clutter_behaviour_get_alpha      (ClutterBehaviour            *behave);
-CLUTTER_DEPRECATED_IN_1_6
+CLUTTER_DEPRECATED
 void          clutter_behaviour_set_alpha      (ClutterBehaviour            *behave,
                                                 ClutterAlpha                *alpha);
-CLUTTER_DEPRECATED_IN_1_6
+CLUTTER_DEPRECATED
 gboolean      clutter_behaviour_is_applied     (ClutterBehaviour            *behave,
                                                ClutterActor                *actor);
 
diff --git a/clutter/clutter/deprecated/clutter-bin-layout.h b/clutter/clutter/deprecated/clutter-bin-layout.h
index 2d56d1f8b..a2213ff96 100644
--- a/clutter/clutter/deprecated/clutter-bin-layout.h
+++ b/clutter/clutter/deprecated/clutter-bin-layout.h
@@ -33,19 +33,19 @@
 
 G_BEGIN_DECLS
 
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 void            clutter_bin_layout_set_alignment        (ClutterBinLayout    *self,
                                                          ClutterActor        *child,
                                                          ClutterBinAlignment  x_align,
                                                          ClutterBinAlignment  y_align);
 
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 void            clutter_bin_layout_get_alignment        (ClutterBinLayout    *self,
                                                          ClutterActor        *child,
                                                          ClutterBinAlignment *x_align,
                                                          ClutterBinAlignment *y_align);
 
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 void            clutter_bin_layout_add                  (ClutterBinLayout    *self,
                                                          ClutterActor        *child,
                                                          ClutterBinAlignment  x_align,
diff --git a/clutter/clutter/deprecated/clutter-box.h b/clutter/clutter/deprecated/clutter-box.h
index 0293aac1f..6b6d821fc 100644
--- a/clutter/clutter/deprecated/clutter-box.h
+++ b/clutter/clutter/deprecated/clutter-box.h
@@ -83,55 +83,55 @@ struct _ClutterBoxClass
   void (*clutter_padding_6) (void);
 };
 
-CLUTTER_DEPRECATED_IN_1_10
+CLUTTER_DEPRECATED
 GType clutter_box_get_type (void) G_GNUC_CONST;
 
-CLUTTER_DEPRECATED_IN_1_10_FOR(clutter_actor_new)
+CLUTTER_DEPRECATED_FOR(clutter_actor_new)
 ClutterActor *        clutter_box_new                (ClutterLayoutManager *manager);
 
-CLUTTER_DEPRECATED_IN_1_10_FOR(clutter_actor_set_layout_manager)
+CLUTTER_DEPRECATED_FOR(clutter_actor_set_layout_manager)
 void                  clutter_box_set_layout_manager (ClutterBox           *box,
                                                       ClutterLayoutManager *manager);
 
-CLUTTER_DEPRECATED_IN_1_10_FOR(clutter_actor_get_layout_manager)
+CLUTTER_DEPRECATED_FOR(clutter_actor_get_layout_manager)
 ClutterLayoutManager *clutter_box_get_layout_manager (ClutterBox           *box);
 
-CLUTTER_DEPRECATED_IN_1_10_FOR(clutter_actor_set_background_color)
+CLUTTER_DEPRECATED_FOR(clutter_actor_set_background_color)
 void                  clutter_box_set_color          (ClutterBox           *box,
                                                       const ClutterColor   *color);
 
-CLUTTER_DEPRECATED_IN_1_10_FOR(clutter_actor_get_background_color)
+CLUTTER_DEPRECATED_FOR(clutter_actor_get_background_color)
 void                  clutter_box_get_color          (ClutterBox           *box,
                                                       ClutterColor         *color);
 
-CLUTTER_DEPRECATED_IN_1_10_FOR(clutter_actor_add_child)
+CLUTTER_DEPRECATED_FOR(clutter_actor_add_child)
 void                  clutter_box_pack               (ClutterBox           *box,
                                                       ClutterActor         *actor,
                                                       const gchar          *first_property,
                                                       ...);
 
-CLUTTER_DEPRECATED_IN_1_10_FOR(clutter_actor_add_child)
+CLUTTER_DEPRECATED_FOR(clutter_actor_add_child)
 void                  clutter_box_packv              (ClutterBox           *box,
                                                       ClutterActor         *actor,
                                                       guint                 n_properties,
                                                       const gchar * const   properties[],
                                                       const GValue         *values);
 
-CLUTTER_DEPRECATED_IN_1_10_FOR(clutter_actor_insert_child_above)
+CLUTTER_DEPRECATED_FOR(clutter_actor_insert_child_above)
 void                  clutter_box_pack_after         (ClutterBox           *box,
                                                       ClutterActor         *actor,
                                                       ClutterActor         *sibling,
                                                       const gchar          *first_property,
                                                       ...);
 
-CLUTTER_DEPRECATED_IN_1_10_FOR(clutter_actor_insert_child_below)
+CLUTTER_DEPRECATED_FOR(clutter_actor_insert_child_below)
 void                  clutter_box_pack_before        (ClutterBox           *box,
                                                       ClutterActor         *actor,
                                                       ClutterActor         *sibling,
                                                       const gchar          *first_property,
                                                       ...);
 
-CLUTTER_DEPRECATED_IN_1_10_FOR(clutter_actor_insert_child_at_index)
+CLUTTER_DEPRECATED_FOR(clutter_actor_insert_child_at_index)
 void                  clutter_box_pack_at            (ClutterBox           *box,
                                                       ClutterActor         *actor,
                                                       gint                  position,
diff --git a/clutter/clutter/deprecated/clutter-cairo-texture.h 
b/clutter/clutter/deprecated/clutter-cairo-texture.h
index 63b6158b7..57d7e1ec7 100644
--- a/clutter/clutter/deprecated/clutter-cairo-texture.h
+++ b/clutter/clutter/deprecated/clutter-cairo-texture.h
@@ -94,44 +94,44 @@ struct _ClutterCairoTextureClass
   void (*_clutter_cairo_4) (void);
 };
 
-CLUTTER_DEPRECATED_IN_1_12_FOR(clutter_canvas_get_type)
+CLUTTER_DEPRECATED_FOR(clutter_canvas_get_type)
 GType clutter_cairo_texture_get_type (void) G_GNUC_CONST;
 
-CLUTTER_DEPRECATED_IN_1_12_FOR(clutter_canvas_new)
+CLUTTER_DEPRECATED_FOR(clutter_canvas_new)
 ClutterActor *  clutter_cairo_texture_new                       (guint                  width,
                                                                  guint                  height);
 
-CLUTTER_DEPRECATED_IN_1_12_FOR(clutter_canvas_set_size)
+CLUTTER_DEPRECATED_FOR(clutter_canvas_set_size)
 void            clutter_cairo_texture_set_surface_size          (ClutterCairoTexture   *self,
                                                                  guint                  width,
                                                                  guint                  height);
-CLUTTER_DEPRECATED_IN_1_12_FOR(clutter_canvas_get_size)
+CLUTTER_DEPRECATED_FOR(clutter_canvas_get_size)
 void            clutter_cairo_texture_get_surface_size          (ClutterCairoTexture   *self,
                                                                  guint                 *width,
                                                                  guint                 *height);
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 void            clutter_cairo_texture_set_auto_resize           (ClutterCairoTexture   *self,
                                                                  gboolean               value);
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 gboolean        clutter_cairo_texture_get_auto_resize           (ClutterCairoTexture   *self);
 
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 void            clutter_cairo_texture_clear                     (ClutterCairoTexture   *self);
 
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 void            clutter_cairo_texture_invalidate_rectangle      (ClutterCairoTexture   *self,
                                                                  cairo_rectangle_int_t *rect);
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 void            clutter_cairo_texture_invalidate                (ClutterCairoTexture   *self);
 
-CLUTTER_DEPRECATED_IN_1_8_FOR(clutter_cairo_texture_invalidate_rectangle)
+CLUTTER_DEPRECATED_FOR(clutter_cairo_texture_invalidate_rectangle)
 cairo_t *       clutter_cairo_texture_create_region             (ClutterCairoTexture   *self,
                                                                  gint                   x_offset,
                                                                  gint                   y_offset,
                                                                  gint                   width,
                                                                  gint                   height);
 
-CLUTTER_DEPRECATED_IN_1_8_FOR(clutter_cairo_texture_invalidate)
+CLUTTER_DEPRECATED_FOR(clutter_cairo_texture_invalidate)
 cairo_t *       clutter_cairo_texture_create                    (ClutterCairoTexture   *self);
 
 G_END_DECLS
diff --git a/clutter/clutter/deprecated/clutter-container.h b/clutter/clutter/deprecated/clutter-container.h
index 38e78982f..0be03b26b 100644
--- a/clutter/clutter/deprecated/clutter-container.h
+++ b/clutter/clutter/deprecated/clutter-container.h
@@ -34,58 +34,58 @@
 
 G_BEGIN_DECLS
 
-CLUTTER_DEPRECATED_IN_1_10_FOR(clutter_actor_add_child)
+CLUTTER_DEPRECATED_FOR(clutter_actor_add_child)
 void            clutter_container_add                           (ClutterContainer *container,
                                                                  ClutterActor     *first_actor,
                                                                  ...) G_GNUC_NULL_TERMINATED;
 
-CLUTTER_DEPRECATED_IN_1_10_FOR(clutter_actor_add_child)
+CLUTTER_DEPRECATED_FOR(clutter_actor_add_child)
 void            clutter_container_add_actor                     (ClutterContainer *container,
                                                                  ClutterActor     *actor);
 
-CLUTTER_DEPRECATED_IN_1_10_FOR(clutter_actor_add_child)
+CLUTTER_DEPRECATED_FOR(clutter_actor_add_child)
 void            clutter_container_add_valist                    (ClutterContainer *container,
                                                                  ClutterActor     *first_actor,
                                                                  va_list           var_args);
 
-CLUTTER_DEPRECATED_IN_1_10_FOR(clutter_actor_remove_child)
+CLUTTER_DEPRECATED_FOR(clutter_actor_remove_child)
 void            clutter_container_remove                        (ClutterContainer *container,
                                                                  ClutterActor     *first_actor,
                                                                  ...) G_GNUC_NULL_TERMINATED;
 
-CLUTTER_DEPRECATED_IN_1_10_FOR(clutter_actor_remove_child)
+CLUTTER_DEPRECATED_FOR(clutter_actor_remove_child)
 void            clutter_container_remove_actor                  (ClutterContainer *container,
                                                                  ClutterActor     *actor);
 
-CLUTTER_DEPRECATED_IN_1_10_FOR(clutter_actor_remove_child)
+CLUTTER_DEPRECATED_FOR(clutter_actor_remove_child)
 void            clutter_container_remove_valist                 (ClutterContainer *container,
                                                                  ClutterActor     *first_actor,
                                                                  va_list           var_args);
 
-CLUTTER_DEPRECATED_IN_1_10_FOR(clutter_actor_get_children)
+CLUTTER_DEPRECATED_FOR(clutter_actor_get_children)
 GList *         clutter_container_get_children                  (ClutterContainer *container);
 
-CLUTTER_DEPRECATED_IN_1_10
+CLUTTER_DEPRECATED
 void            clutter_container_foreach                       (ClutterContainer *container,
                                                                  ClutterCallback   callback,
                                                                  gpointer          user_data);
 
-CLUTTER_DEPRECATED_IN_1_10
+CLUTTER_DEPRECATED
 void            clutter_container_foreach_with_internals        (ClutterContainer *container,
                                                                  ClutterCallback   callback,
                                                                  gpointer          user_data);
 
-CLUTTER_DEPRECATED_IN_1_10_FOR(clutter_actor_set_child_above_sibling)
+CLUTTER_DEPRECATED_FOR(clutter_actor_set_child_above_sibling)
 void            clutter_container_raise_child                   (ClutterContainer *container,
                                                                  ClutterActor     *actor,
                                                                  ClutterActor     *sibling);
 
-CLUTTER_DEPRECATED_IN_1_10_FOR(clutter_actor_set_child_below_sibling)
+CLUTTER_DEPRECATED_FOR(clutter_actor_set_child_below_sibling)
 void            clutter_container_lower_child                   (ClutterContainer *container,
                                                                  ClutterActor     *actor,
                                                                  ClutterActor     *sibling);
 
-CLUTTER_DEPRECATED_IN_1_10
+CLUTTER_DEPRECATED
 void            clutter_container_sort_depth_order              (ClutterContainer *container);
 
 G_END_DECLS
diff --git a/clutter/clutter/deprecated/clutter-frame-source.h 
b/clutter/clutter/deprecated/clutter-frame-source.h
index f45134140..d3649fbd3 100644
--- a/clutter/clutter/deprecated/clutter-frame-source.h
+++ b/clutter/clutter/deprecated/clutter-frame-source.h
@@ -32,12 +32,12 @@
 
 G_BEGIN_DECLS
 
-CLUTTER_DEPRECATED_IN_1_6
+CLUTTER_DEPRECATED
 guint clutter_frame_source_add (guint          fps,
                                GSourceFunc    func,
                                gpointer       data);
 
-CLUTTER_DEPRECATED_IN_1_6
+CLUTTER_DEPRECATED
 guint clutter_frame_source_add_full (gint           priority,
                                     guint          fps,
                                     GSourceFunc    func,
diff --git a/clutter/clutter/deprecated/clutter-group.h b/clutter/clutter/deprecated/clutter-group.h
index 5bc378f74..650f1dfc1 100644
--- a/clutter/clutter/deprecated/clutter-group.h
+++ b/clutter/clutter/deprecated/clutter-group.h
@@ -31,17 +31,17 @@
 
 G_BEGIN_DECLS
 
-CLUTTER_DEPRECATED_IN_1_10_FOR(clutter_actor_new)
+CLUTTER_DEPRECATED_FOR(clutter_actor_new)
 ClutterActor *  clutter_group_new               (void);
 
-CLUTTER_DEPRECATED_IN_1_10_FOR(clutter_actor_get_child_at_index)
+CLUTTER_DEPRECATED_FOR(clutter_actor_get_child_at_index)
 ClutterActor *  clutter_group_get_nth_child     (ClutterGroup *self,
                                                  gint          index_);
 
-CLUTTER_DEPRECATED_IN_1_10_FOR(clutter_actor_get_n_children)
+CLUTTER_DEPRECATED_FOR(clutter_actor_get_n_children)
 gint            clutter_group_get_n_children    (ClutterGroup *self);
 
-CLUTTER_DEPRECATED_IN_1_10_FOR(clutter_actor_remove_all_children)
+CLUTTER_DEPRECATED_FOR(clutter_actor_remove_all_children)
 void            clutter_group_remove_all        (ClutterGroup *self);
 
 #ifndef CLUTTER_DISABLE_DEPRECATED
diff --git a/clutter/clutter/deprecated/clutter-input-device.h 
b/clutter/clutter/deprecated/clutter-input-device.h
index 692459d20..447e1a7f2 100644
--- a/clutter/clutter/deprecated/clutter-input-device.h
+++ b/clutter/clutter/deprecated/clutter-input-device.h
@@ -31,7 +31,7 @@
 
 G_BEGIN_DECLS
 
-CLUTTER_DEPRECATED_IN_1_12_FOR(clutter_input_device_get_coords)
+CLUTTER_DEPRECATED_FOR(clutter_input_device_get_coords)
 void clutter_input_device_get_device_coords  (ClutterInputDevice  *device,
                                               gint                *x,
                                               gint                *y);
diff --git a/clutter/clutter/deprecated/clutter-list-model.h b/clutter/clutter/deprecated/clutter-list-model.h
index 021b3cde4..ccf184741 100644
--- a/clutter/clutter/deprecated/clutter-list-model.h
+++ b/clutter/clutter/deprecated/clutter-list-model.h
@@ -79,13 +79,13 @@ struct _ClutterListModelClass
   ClutterModelClass parent_class;
 };
 
-CLUTTER_DEPRECATED_IN_1_24_FOR(g_list_store_get_type)
+CLUTTER_DEPRECATED_FOR(g_list_store_get_type)
 GType         clutter_list_model_get_type (void) G_GNUC_CONST;
 
-CLUTTER_DEPRECATED_IN_1_24_FOR(g_list_store_new)
+CLUTTER_DEPRECATED_FOR(g_list_store_new)
 ClutterModel *clutter_list_model_new      (guint                n_columns,
                                               ...);
-CLUTTER_DEPRECATED_IN_1_24_FOR(g_list_store_new)
+CLUTTER_DEPRECATED_FOR(g_list_store_new)
 ClutterModel *clutter_list_model_newv     (guint                n_columns,
                                            GType               *types,
                                            const gchar * const  names[]);
diff --git a/clutter/clutter/deprecated/clutter-main.h b/clutter/clutter/deprecated/clutter-main.h
index 257ac5a70..afcc4aa24 100644
--- a/clutter/clutter/deprecated/clutter-main.h
+++ b/clutter/clutter/deprecated/clutter-main.h
@@ -31,64 +31,64 @@
 
 G_BEGIN_DECLS
 
-CLUTTER_DEPRECATED_IN_1_10
+CLUTTER_DEPRECATED
 void                    clutter_threads_init                    (void);
 
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 void                    clutter_threads_enter                   (void);
 
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 void                    clutter_threads_leave                   (void);
 
-CLUTTER_DEPRECATED_IN_1_6
+CLUTTER_DEPRECATED
 guint                   clutter_threads_add_frame_source        (guint             fps,
                                                                  GSourceFunc       func,
                                                                  gpointer          data);
-CLUTTER_DEPRECATED_IN_1_6
+CLUTTER_DEPRECATED
 guint                   clutter_threads_add_frame_source_full   (gint              priority,
                                                                  guint             fps,
                                                                  GSourceFunc       func,
                                                                  gpointer          data,
                                                                  GDestroyNotify    notify);
 
-CLUTTER_DEPRECATED_IN_1_8_FOR(clutter_stage_set_motion_events_enabled)
+CLUTTER_DEPRECATED_FOR(clutter_stage_set_motion_events_enabled)
 void                    clutter_set_motion_events_enabled       (gboolean          enable);
 
-CLUTTER_DEPRECATED_IN_1_8_FOR(clutter_stage_get_motion_events_enabled)
+CLUTTER_DEPRECATED_FOR(clutter_stage_get_motion_events_enabled)
 gboolean                clutter_get_motion_events_enabled       (void);
 
-CLUTTER_DEPRECATED_IN_1_10_FOR(clutter_stage_ensure_redraw)
+CLUTTER_DEPRECATED_FOR(clutter_stage_ensure_redraw)
 void                    clutter_redraw                          (ClutterStage     *stage);
 
-CLUTTER_DEPRECATED_IN_1_10_FOR(cogl_pango_font_map_clear_glyph_cache)
+CLUTTER_DEPRECATED_FOR(cogl_pango_font_map_clear_glyph_cache)
 void                    clutter_clear_glyph_cache               (void);
 
-CLUTTER_DEPRECATED_IN_1_10_FOR(clutter_backend_set_font_options)
+CLUTTER_DEPRECATED_FOR(clutter_backend_set_font_options)
 void                    clutter_set_font_flags                  (ClutterFontFlags  flags);
 
-CLUTTER_DEPRECATED_IN_1_10_FOR(clutter_backend_get_font_options)
+CLUTTER_DEPRECATED_FOR(clutter_backend_get_font_options)
 ClutterFontFlags        clutter_get_font_flags                  (void);
 
-CLUTTER_DEPRECATED_IN_1_10_FOR(clutter_device_manager_get_device)
+CLUTTER_DEPRECATED_FOR(clutter_device_manager_get_device)
 ClutterInputDevice *    clutter_get_input_device_for_id         (gint id_);
 
-CLUTTER_DEPRECATED_IN_1_10_FOR(clutter_input_device_grab)
+CLUTTER_DEPRECATED_FOR(clutter_input_device_grab)
 void                    clutter_grab_pointer_for_device         (ClutterActor     *actor,
                                                                  gint              id_);
 
-CLUTTER_DEPRECATED_IN_1_10_FOR(clutter_input_device_ungrab)
+CLUTTER_DEPRECATED_FOR(clutter_input_device_ungrab)
 void                    clutter_ungrab_pointer_for_device       (gint              id_);
 
-CLUTTER_DEPRECATED_IN_1_10
+CLUTTER_DEPRECATED
 void                    clutter_set_default_frame_rate          (guint             frames_per_sec);
 
-CLUTTER_DEPRECATED_IN_1_10
+CLUTTER_DEPRECATED
 gulong                  clutter_get_timestamp                   (void);
 
-CLUTTER_DEPRECATED_IN_1_10
+CLUTTER_DEPRECATED
 gboolean                clutter_get_debug_enabled               (void);
 
-CLUTTER_DEPRECATED_IN_1_10
+CLUTTER_DEPRECATED
 gboolean                clutter_get_show_fps                    (void);
 
 G_END_DECLS
diff --git a/clutter/clutter/deprecated/clutter-media.h b/clutter/clutter/deprecated/clutter-media.h
index ad1068ad4..3cb2fbc75 100644
--- a/clutter/clutter/deprecated/clutter-media.h
+++ b/clutter/clutter/deprecated/clutter-media.h
@@ -72,48 +72,48 @@ struct _ClutterMediaIface
                  const GError *error);
 };
 
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 GType    clutter_media_get_type               (void) G_GNUC_CONST;
 
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 void     clutter_media_set_uri                (ClutterMedia *media,
                                                const gchar  *uri);
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 gchar *  clutter_media_get_uri                (ClutterMedia *media);
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 void     clutter_media_set_filename           (ClutterMedia *media,
                                                const gchar  *filename);
 
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 void     clutter_media_set_playing            (ClutterMedia *media,
                                                gboolean      playing);
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 gboolean clutter_media_get_playing            (ClutterMedia *media);
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 void     clutter_media_set_progress           (ClutterMedia *media,
                                                gdouble       progress);
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 gdouble  clutter_media_get_progress           (ClutterMedia *media);
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 void     clutter_media_set_subtitle_uri       (ClutterMedia *media,
                                                const gchar  *uri);
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 gchar *  clutter_media_get_subtitle_uri       (ClutterMedia *media);
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 void     clutter_media_set_subtitle_font_name (ClutterMedia *media,
                                                const char   *font_name);
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 gchar *  clutter_media_get_subtitle_font_name (ClutterMedia *media);
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 void     clutter_media_set_audio_volume       (ClutterMedia *media,
                                                gdouble       volume);
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 gdouble  clutter_media_get_audio_volume       (ClutterMedia *media);
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 gboolean clutter_media_get_can_seek           (ClutterMedia *media);
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 gdouble  clutter_media_get_buffer_fill        (ClutterMedia *media);
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 gdouble  clutter_media_get_duration           (ClutterMedia *media);
 
 G_END_DECLS
diff --git a/clutter/clutter/deprecated/clutter-model.h b/clutter/clutter/deprecated/clutter-model.h
index f598f3978..28b9e3326 100644
--- a/clutter/clutter/deprecated/clutter-model.h
+++ b/clutter/clutter/deprecated/clutter-model.h
@@ -198,102 +198,102 @@ struct _ClutterModelClass
   void (*_clutter_model_8) (void);
 };
 
-CLUTTER_DEPRECATED_IN_1_24_FOR(g_list_model_get_type)
+CLUTTER_DEPRECATED_FOR(g_list_model_get_type)
 GType                 clutter_model_get_type           (void) G_GNUC_CONST;
 
-CLUTTER_DEPRECATED_IN_1_24_FOR(GListModel)
+CLUTTER_DEPRECATED_FOR(GListModel)
 void                  clutter_model_set_types          (ClutterModel     *model,
                                                         guint             n_columns,
                                                         GType            *types);
-CLUTTER_DEPRECATED_IN_1_24_FOR(GListModel)
+CLUTTER_DEPRECATED_FOR(GListModel)
 void                  clutter_model_set_names          (ClutterModel     *model,
                                                         guint             n_columns,
                                                         const gchar * const names[]);
 
-CLUTTER_DEPRECATED_IN_1_24_FOR(GListModel)
+CLUTTER_DEPRECATED_FOR(GListModel)
 void                  clutter_model_append             (ClutterModel     *model,
                                                         ...);
-CLUTTER_DEPRECATED_IN_1_24_FOR(GListModel)
+CLUTTER_DEPRECATED_FOR(GListModel)
 void                  clutter_model_appendv            (ClutterModel     *model,
                                                         guint             n_columns,
                                                         guint            *columns,
                                                         GValue           *values);
-CLUTTER_DEPRECATED_IN_1_24_FOR(GListModel)
+CLUTTER_DEPRECATED_FOR(GListModel)
 void                  clutter_model_prepend            (ClutterModel     *model,
                                                         ...);
-CLUTTER_DEPRECATED_IN_1_24_FOR(GListModel)
+CLUTTER_DEPRECATED_FOR(GListModel)
 void                  clutter_model_prependv           (ClutterModel     *model,
                                                         guint             n_columns,
                                                         guint            *columns,
                                                         GValue           *values);
-CLUTTER_DEPRECATED_IN_1_24_FOR(GListModel)
+CLUTTER_DEPRECATED_FOR(GListModel)
 void                  clutter_model_insert             (ClutterModel     *model,
                                                         guint             row,
                                                         ...);
-CLUTTER_DEPRECATED_IN_1_24_FOR(GListModel)
+CLUTTER_DEPRECATED_FOR(GListModel)
 void                  clutter_model_insertv            (ClutterModel     *model,
                                                         guint             row,
                                                         guint             n_columns,
                                                         guint            *columns,
                                                         GValue           *values);
-CLUTTER_DEPRECATED_IN_1_24_FOR(GListModel)
+CLUTTER_DEPRECATED_FOR(GListModel)
 void                  clutter_model_insert_value       (ClutterModel     *model,
                                                         guint             row,
                                                         guint             column,
                                                         const GValue     *value);
-CLUTTER_DEPRECATED_IN_1_24_FOR(GListModel)
+CLUTTER_DEPRECATED_FOR(GListModel)
 void                  clutter_model_remove             (ClutterModel     *model,
                                                         guint             row);
 
-CLUTTER_DEPRECATED_IN_1_24_FOR(GListModel)
+CLUTTER_DEPRECATED_FOR(GListModel)
 guint                 clutter_model_get_n_rows         (ClutterModel     *model);
-CLUTTER_DEPRECATED_IN_1_24_FOR(GListModel)
+CLUTTER_DEPRECATED_FOR(GListModel)
 guint                 clutter_model_get_n_columns      (ClutterModel     *model);
-CLUTTER_DEPRECATED_IN_1_24_FOR(GListModel)
+CLUTTER_DEPRECATED_FOR(GListModel)
 const gchar *         clutter_model_get_column_name    (ClutterModel     *model,
                                                         guint             column);
-CLUTTER_DEPRECATED_IN_1_24_FOR(GListModel)
+CLUTTER_DEPRECATED_FOR(GListModel)
 GType                 clutter_model_get_column_type    (ClutterModel     *model,
                                                         guint             column);
 
-CLUTTER_DEPRECATED_IN_1_24_FOR(GListModel)
+CLUTTER_DEPRECATED_FOR(GListModel)
 ClutterModelIter *    clutter_model_get_first_iter     (ClutterModel     *model);
-CLUTTER_DEPRECATED_IN_1_24_FOR(GListModel)
+CLUTTER_DEPRECATED_FOR(GListModel)
 ClutterModelIter *    clutter_model_get_last_iter      (ClutterModel     *model);
-CLUTTER_DEPRECATED_IN_1_24_FOR(GListModel)
+CLUTTER_DEPRECATED_FOR(GListModel)
 ClutterModelIter *    clutter_model_get_iter_at_row    (ClutterModel     *model,
                                                         guint             row);
 
-CLUTTER_DEPRECATED_IN_1_24_FOR(GListModel)
+CLUTTER_DEPRECATED_FOR(GListModel)
 void                  clutter_model_set_sorting_column (ClutterModel     *model,
                                                         gint              column);
-CLUTTER_DEPRECATED_IN_1_24_FOR(GListModel)
+CLUTTER_DEPRECATED_FOR(GListModel)
 gint                  clutter_model_get_sorting_column (ClutterModel     *model);
 
-CLUTTER_DEPRECATED_IN_1_24_FOR(GListModel)
+CLUTTER_DEPRECATED_FOR(GListModel)
 void                  clutter_model_foreach            (ClutterModel     *model,
                                                         ClutterModelForeachFunc func, 
                                                         gpointer          user_data);
-CLUTTER_DEPRECATED_IN_1_24_FOR(GListModel)
+CLUTTER_DEPRECATED_FOR(GListModel)
 void                  clutter_model_set_sort           (ClutterModel     *model, 
                                                         gint              column,
                                                         ClutterModelSortFunc func, 
                                                         gpointer          user_data,
                                                         GDestroyNotify    notify);
-CLUTTER_DEPRECATED_IN_1_24_FOR(GListModel)
+CLUTTER_DEPRECATED_FOR(GListModel)
 void                  clutter_model_set_filter         (ClutterModel     *model, 
                                                         ClutterModelFilterFunc func, 
                                                         gpointer          user_data,
                                                         GDestroyNotify    notify);
-CLUTTER_DEPRECATED_IN_1_24_FOR(GListModel)
+CLUTTER_DEPRECATED_FOR(GListModel)
 gboolean              clutter_model_get_filter_set     (ClutterModel     *model);
 
-CLUTTER_DEPRECATED_IN_1_24_FOR(GListModel)
+CLUTTER_DEPRECATED_FOR(GListModel)
 void                  clutter_model_resort             (ClutterModel     *model);
-CLUTTER_DEPRECATED_IN_1_24_FOR(GListModel)
+CLUTTER_DEPRECATED_FOR(GListModel)
 gboolean              clutter_model_filter_row         (ClutterModel     *model,
                                                         guint             row);
-CLUTTER_DEPRECATED_IN_1_24_FOR(GListModel)
+CLUTTER_DEPRECATED_FOR(GListModel)
 gboolean              clutter_model_filter_iter        (ClutterModel     *model,
                                                         ClutterModelIter *iter);
 
@@ -390,45 +390,45 @@ struct _ClutterModelIterClass
   void (*_clutter_model_iter_8) (void);
 };
 
-CLUTTER_DEPRECATED_IN_1_24
+CLUTTER_DEPRECATED
 GType             clutter_model_iter_get_type   (void) G_GNUC_CONST;
 
-CLUTTER_DEPRECATED_IN_1_24
+CLUTTER_DEPRECATED
 void              clutter_model_iter_get        (ClutterModelIter *iter,
                                                  ...);
-CLUTTER_DEPRECATED_IN_1_24
+CLUTTER_DEPRECATED
 void              clutter_model_iter_get_valist (ClutterModelIter *iter,
                                                  va_list          args);
-CLUTTER_DEPRECATED_IN_1_24
+CLUTTER_DEPRECATED
 void              clutter_model_iter_get_value  (ClutterModelIter *iter,
                                                  guint             column,
                                                  GValue           *value);
-CLUTTER_DEPRECATED_IN_1_24
+CLUTTER_DEPRECATED
 void              clutter_model_iter_set        (ClutterModelIter *iter,
                                                  ...);
-CLUTTER_DEPRECATED_IN_1_24
+CLUTTER_DEPRECATED
 void              clutter_model_iter_set_valist (ClutterModelIter *iter,
                                                  va_list          args);
-CLUTTER_DEPRECATED_IN_1_24
+CLUTTER_DEPRECATED
 void              clutter_model_iter_set_value  (ClutterModelIter *iter,
                                                  guint             column,
                                                  const GValue     *value);
 
-CLUTTER_DEPRECATED_IN_1_24
+CLUTTER_DEPRECATED
 gboolean          clutter_model_iter_is_first   (ClutterModelIter *iter);
-CLUTTER_DEPRECATED_IN_1_24
+CLUTTER_DEPRECATED
 gboolean          clutter_model_iter_is_last    (ClutterModelIter *iter);
-CLUTTER_DEPRECATED_IN_1_24
+CLUTTER_DEPRECATED
 ClutterModelIter *clutter_model_iter_next       (ClutterModelIter *iter);
-CLUTTER_DEPRECATED_IN_1_24
+CLUTTER_DEPRECATED
 ClutterModelIter *clutter_model_iter_prev       (ClutterModelIter *iter);
 
-CLUTTER_DEPRECATED_IN_1_24
+CLUTTER_DEPRECATED
 ClutterModel *    clutter_model_iter_get_model  (ClutterModelIter *iter);
-CLUTTER_DEPRECATED_IN_1_24
+CLUTTER_DEPRECATED
 guint             clutter_model_iter_get_row    (ClutterModelIter *iter);
 
-CLUTTER_DEPRECATED_IN_1_24
+CLUTTER_DEPRECATED
 ClutterModelIter *clutter_model_iter_copy       (ClutterModelIter *iter);
 
 G_END_DECLS
diff --git a/clutter/clutter/deprecated/clutter-rectangle.h b/clutter/clutter/deprecated/clutter-rectangle.h
index ba58bbc8a..0bcda2f14 100644
--- a/clutter/clutter/deprecated/clutter-rectangle.h
+++ b/clutter/clutter/deprecated/clutter-rectangle.h
@@ -80,35 +80,35 @@ struct _ClutterRectangleClass
   void (*_clutter_rectangle4) (void);
 };
 
-CLUTTER_DEPRECATED_IN_1_10
+CLUTTER_DEPRECATED
 GType clutter_rectangle_get_type (void) G_GNUC_CONST;
 
-CLUTTER_DEPRECATED_IN_1_10_FOR(clutter_actor_new)
+CLUTTER_DEPRECATED_FOR(clutter_actor_new)
 ClutterActor *clutter_rectangle_new              (void);
 
-CLUTTER_DEPRECATED_IN_1_10_FOR(clutter_actor_new)
+CLUTTER_DEPRECATED_FOR(clutter_actor_new)
 ClutterActor *clutter_rectangle_new_with_color   (const ClutterColor *color);
 
-CLUTTER_DEPRECATED_IN_1_10_FOR(clutter_actor_get_background_color)
+CLUTTER_DEPRECATED_FOR(clutter_actor_get_background_color)
 void          clutter_rectangle_get_color        (ClutterRectangle   *rectangle,
                                                   ClutterColor       *color);
 
-CLUTTER_DEPRECATED_IN_1_10_FOR(clutter_actor_set_background_color)
+CLUTTER_DEPRECATED_FOR(clutter_actor_set_background_color)
 void          clutter_rectangle_set_color        (ClutterRectangle   *rectangle,
                                                  const ClutterColor *color);
 
-CLUTTER_DEPRECATED_IN_1_10
+CLUTTER_DEPRECATED
 guint         clutter_rectangle_get_border_width (ClutterRectangle   *rectangle);
 
-CLUTTER_DEPRECATED_IN_1_10
+CLUTTER_DEPRECATED
 void          clutter_rectangle_set_border_width (ClutterRectangle   *rectangle,
                                                   guint               width);
 
-CLUTTER_DEPRECATED_IN_1_10
+CLUTTER_DEPRECATED
 void          clutter_rectangle_get_border_color (ClutterRectangle   *rectangle,
                                                   ClutterColor       *color);
 
-CLUTTER_DEPRECATED_IN_1_10
+CLUTTER_DEPRECATED
 void          clutter_rectangle_set_border_color (ClutterRectangle   *rectangle,
                                                   const ClutterColor *color);
 
diff --git a/clutter/clutter/deprecated/clutter-score.h b/clutter/clutter/deprecated/clutter-score.h
index 301dabd5f..8d7a70d73 100644
--- a/clutter/clutter/deprecated/clutter-score.h
+++ b/clutter/clutter/deprecated/clutter-score.h
@@ -96,47 +96,47 @@ struct _ClutterScoreClass
   void (*_clutter_score_5) (void);
 }; 
 
-CLUTTER_DEPRECATED_IN_1_8
+CLUTTER_DEPRECATED
 GType clutter_score_get_type (void) G_GNUC_CONST;
 
-CLUTTER_DEPRECATED_IN_1_8
+CLUTTER_DEPRECATED
 ClutterScore *   clutter_score_new            (void);
 
-CLUTTER_DEPRECATED_IN_1_8
+CLUTTER_DEPRECATED
 void             clutter_score_set_loop         (ClutterScore    *score,
                                                  gboolean         loop);
-CLUTTER_DEPRECATED_IN_1_8
+CLUTTER_DEPRECATED
 gboolean         clutter_score_get_loop         (ClutterScore    *score);
 
-CLUTTER_DEPRECATED_IN_1_8
+CLUTTER_DEPRECATED
 gulong           clutter_score_append           (ClutterScore    *score,
                                                  ClutterTimeline *parent,
                                                  ClutterTimeline *timeline);
-CLUTTER_DEPRECATED_IN_1_8
+CLUTTER_DEPRECATED
 gulong           clutter_score_append_at_marker (ClutterScore    *score,
                                                  ClutterTimeline *parent,
                                                  const gchar     *marker_name,
                                                  ClutterTimeline *timeline);
-CLUTTER_DEPRECATED_IN_1_8
+CLUTTER_DEPRECATED
 void             clutter_score_remove           (ClutterScore    *score,
                                                  gulong           id_);
-CLUTTER_DEPRECATED_IN_1_8
+CLUTTER_DEPRECATED
 void             clutter_score_remove_all       (ClutterScore    *score);
-CLUTTER_DEPRECATED_IN_1_8
+CLUTTER_DEPRECATED
 ClutterTimeline *clutter_score_get_timeline     (ClutterScore    *score,
                                                  gulong           id_);
-CLUTTER_DEPRECATED_IN_1_8
+CLUTTER_DEPRECATED
 GSList *         clutter_score_list_timelines   (ClutterScore    *score);
 
-CLUTTER_DEPRECATED_IN_1_8
+CLUTTER_DEPRECATED
 void             clutter_score_start            (ClutterScore    *score);
-CLUTTER_DEPRECATED_IN_1_8
+CLUTTER_DEPRECATED
 void             clutter_score_stop             (ClutterScore    *score);
-CLUTTER_DEPRECATED_IN_1_8
+CLUTTER_DEPRECATED
 void             clutter_score_pause            (ClutterScore    *score);
-CLUTTER_DEPRECATED_IN_1_8
+CLUTTER_DEPRECATED
 void             clutter_score_rewind           (ClutterScore    *score);
-CLUTTER_DEPRECATED_IN_1_8
+CLUTTER_DEPRECATED
 gboolean         clutter_score_is_playing       (ClutterScore    *score);
 
 G_END_DECLS
diff --git a/clutter/clutter/deprecated/clutter-shader.h b/clutter/clutter/deprecated/clutter-shader.h
index a04b8dd3c..2b48fe97b 100644
--- a/clutter/clutter/deprecated/clutter-shader.h
+++ b/clutter/clutter/deprecated/clutter-shader.h
@@ -105,74 +105,74 @@ struct _ClutterShaderClass
   GObjectClass parent_class;
 };
 
-CLUTTER_DEPRECATED_IN_1_8
+CLUTTER_DEPRECATED
 GQuark clutter_shader_error_quark (void);
 
-CLUTTER_DEPRECATED_IN_1_8
+CLUTTER_DEPRECATED
 GType clutter_shader_get_type (void) G_GNUC_CONST;
 
-CLUTTER_DEPRECATED_IN_1_8_FOR(ClutterShaderEffect)
+CLUTTER_DEPRECATED_FOR(ClutterShaderEffect)
 ClutterShader *       clutter_shader_new                      (void);
 
-CLUTTER_DEPRECATED_IN_1_8_FOR(ClutterShaderEffect)
+CLUTTER_DEPRECATED_FOR(ClutterShaderEffect)
 void                  clutter_shader_set_is_enabled           (ClutterShader      *shader,
                                                                gboolean            enabled);
-CLUTTER_DEPRECATED_IN_1_8_FOR(ClutterShaderEffect)
+CLUTTER_DEPRECATED_FOR(ClutterShaderEffect)
 gboolean              clutter_shader_get_is_enabled           (ClutterShader      *shader);
 
-CLUTTER_DEPRECATED_IN_1_8_FOR(ClutterShaderEffect)
+CLUTTER_DEPRECATED_FOR(ClutterShaderEffect)
 gboolean              clutter_shader_compile                  (ClutterShader      *shader,
                                                                GError            **error);
-CLUTTER_DEPRECATED_IN_1_8_FOR(ClutterShaderEffect)
+CLUTTER_DEPRECATED_FOR(ClutterShaderEffect)
 void                  clutter_shader_release                  (ClutterShader      *shader);
-CLUTTER_DEPRECATED_IN_1_8_FOR(ClutterShaderEffect)
+CLUTTER_DEPRECATED_FOR(ClutterShaderEffect)
 gboolean              clutter_shader_is_compiled              (ClutterShader      *shader);
 
-CLUTTER_DEPRECATED_IN_1_8_FOR(ClutterShaderEffect)
+CLUTTER_DEPRECATED_FOR(ClutterShaderEffect)
 void                  clutter_shader_set_vertex_source        (ClutterShader      *shader,
                                                                const gchar        *data,
                                                                gssize              length);
-CLUTTER_DEPRECATED_IN_1_8_FOR(ClutterShaderEffect)
+CLUTTER_DEPRECATED_FOR(ClutterShaderEffect)
 void                  clutter_shader_set_fragment_source      (ClutterShader      *shader,
                                                                const gchar        *data,
                                                                gssize              length);
-CLUTTER_DEPRECATED_IN_1_8_FOR(ClutterShaderEffect)
+CLUTTER_DEPRECATED_FOR(ClutterShaderEffect)
 const gchar *         clutter_shader_get_vertex_source        (ClutterShader      *shader);
-CLUTTER_DEPRECATED_IN_1_8_FOR(ClutterShaderEffect)
+CLUTTER_DEPRECATED_FOR(ClutterShaderEffect)
 const gchar *         clutter_shader_get_fragment_source      (ClutterShader      *shader);
 
-CLUTTER_DEPRECATED_IN_1_8_FOR(ClutterShaderEffect)
+CLUTTER_DEPRECATED_FOR(ClutterShaderEffect)
 void                  clutter_shader_set_uniform              (ClutterShader      *shader,
                                                                const gchar        *name,
                                                                const GValue       *value);
 
-CLUTTER_DEPRECATED_IN_1_8_FOR(ClutterShaderEffect)
+CLUTTER_DEPRECATED_FOR(ClutterShaderEffect)
 CoglHandle            clutter_shader_get_cogl_program         (ClutterShader      *shader);
-CLUTTER_DEPRECATED_IN_1_8_FOR(ClutterShaderEffect)
+CLUTTER_DEPRECATED_FOR(ClutterShaderEffect)
 CoglHandle            clutter_shader_get_cogl_fragment_shader (ClutterShader      *shader);
-CLUTTER_DEPRECATED_IN_1_8_FOR(ClutterShaderEffect)
+CLUTTER_DEPRECATED_FOR(ClutterShaderEffect)
 CoglHandle            clutter_shader_get_cogl_vertex_shader   (ClutterShader      *shader);
 
 /* ClutterActor methods */
 
-CLUTTER_DEPRECATED_IN_1_8_FOR(clutter_actor_add_effect)
+CLUTTER_DEPRECATED_FOR(clutter_actor_add_effect)
 gboolean              clutter_actor_set_shader                (ClutterActor       *self,
                                                                ClutterShader      *shader);
 
-CLUTTER_DEPRECATED_IN_1_8_FOR(clutter_actor_get_effect)
+CLUTTER_DEPRECATED_FOR(clutter_actor_get_effect)
 ClutterShader *       clutter_actor_get_shader                (ClutterActor       *self);
 
-CLUTTER_DEPRECATED_IN_1_8_FOR(clutter_shader_effect_set_uniform_value)
+CLUTTER_DEPRECATED_FOR(clutter_shader_effect_set_uniform_value)
 void                  clutter_actor_set_shader_param          (ClutterActor       *self,
                                                                const gchar        *param,
                                                                const GValue       *value);
 
-CLUTTER_DEPRECATED_IN_1_8_FOR(clutter_shader_effect_set_uniform)
+CLUTTER_DEPRECATED_FOR(clutter_shader_effect_set_uniform)
 void                  clutter_actor_set_shader_param_int      (ClutterActor       *self,
                                                                const gchar        *param,
                                                                gint                value);
 
-CLUTTER_DEPRECATED_IN_1_8_FOR(clutter_shader_effect_set_uniform)
+CLUTTER_DEPRECATED_FOR(clutter_shader_effect_set_uniform)
 void                  clutter_actor_set_shader_param_float    (ClutterActor       *self,
                                                                const gchar        *param,
                                                                gfloat              value);
diff --git a/clutter/clutter/deprecated/clutter-stage-manager.h 
b/clutter/clutter/deprecated/clutter-stage-manager.h
index df19298dd..ba2a16bbf 100644
--- a/clutter/clutter/deprecated/clutter-stage-manager.h
+++ b/clutter/clutter/deprecated/clutter-stage-manager.h
@@ -32,7 +32,7 @@
 
 G_BEGIN_DECLS
 
-CLUTTER_DEPRECATED_IN_1_2
+CLUTTER_DEPRECATED
 void    clutter_stage_manager_set_default_stage (ClutterStageManager *stage_manager,
                                                  ClutterStage        *stage);
 
diff --git a/clutter/clutter/deprecated/clutter-stage.h b/clutter/clutter/deprecated/clutter-stage.h
index 1a0f2880f..4395f9439 100644
--- a/clutter/clutter/deprecated/clutter-stage.h
+++ b/clutter/clutter/deprecated/clutter-stage.h
@@ -65,39 +65,39 @@ G_BEGIN_DECLS
 
 #endif /* CLUTTER_DISABLE_DEPRECATED */
 
-CLUTTER_DEPRECATED_IN_1_10_FOR(clutter_stage_new)
+CLUTTER_DEPRECATED_FOR(clutter_stage_new)
 ClutterActor *  clutter_stage_get_default       (void);
 
-CLUTTER_DEPRECATED_IN_1_10
+CLUTTER_DEPRECATED
 gboolean        clutter_stage_is_default        (ClutterStage       *stage);
 
-CLUTTER_DEPRECATED_IN_1_10_FOR(clutter_actor_queue_redraw)
+CLUTTER_DEPRECATED_FOR(clutter_actor_queue_redraw)
 void            clutter_stage_queue_redraw      (ClutterStage       *stage);
 
-CLUTTER_DEPRECATED_IN_1_10
+CLUTTER_DEPRECATED
 void            clutter_stage_set_use_fog       (ClutterStage       *stage,
                                                  gboolean            fog);
 
-CLUTTER_DEPRECATED_IN_1_10
+CLUTTER_DEPRECATED
 gboolean        clutter_stage_get_use_fog       (ClutterStage       *stage);
 
-CLUTTER_DEPRECATED_IN_1_10
+CLUTTER_DEPRECATED
 void            clutter_stage_set_fog           (ClutterStage       *stage,
                                                  ClutterFog         *fog);
 
-CLUTTER_DEPRECATED_IN_1_10
+CLUTTER_DEPRECATED
 void            clutter_stage_get_fog           (ClutterStage       *stage,
                                                  ClutterFog         *fog);
 
-CLUTTER_DEPRECATED_IN_1_10_FOR(clutter_actor_set_background_color)
+CLUTTER_DEPRECATED_FOR(clutter_actor_set_background_color)
 void            clutter_stage_set_color         (ClutterStage       *stage,
                                                  const ClutterColor *color);
 
-CLUTTER_DEPRECATED_IN_1_10_FOR(clutter_actor_get_background_color)
+CLUTTER_DEPRECATED_FOR(clutter_actor_get_background_color)
 void            clutter_stage_get_color         (ClutterStage       *stage,
                                                  ClutterColor       *color);
 
-CLUTTER_DEPRECATED_IN_MUTTER
+CLUTTER_DEPRECATED
 void            clutter_stage_ensure_current    (ClutterStage       *stage);
 
 G_END_DECLS
diff --git a/clutter/clutter/deprecated/clutter-state.h b/clutter/clutter/deprecated/clutter-state.h
index e33ae0fec..46151b858 100644
--- a/clutter/clutter/deprecated/clutter-state.h
+++ b/clutter/clutter/deprecated/clutter-state.h
@@ -88,20 +88,20 @@ struct _ClutterStateClass
   gpointer _padding_dummy[8];
 };
 
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 GType clutter_state_get_type (void) G_GNUC_CONST;
 
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 ClutterState    *clutter_state_new            (void);
 
 
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 ClutterTimeline * clutter_state_set_state     (ClutterState    *state,
                                                const gchar     *target_state_name);
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 ClutterTimeline * clutter_state_warp_to_state (ClutterState    *state,
                                                const gchar     *target_state_name);
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 ClutterState *    clutter_state_set_key       (ClutterState    *state,
                                                const gchar     *source_state_name,
                                                const gchar     *target_state_name,
@@ -111,16 +111,16 @@ ClutterState *    clutter_state_set_key       (ClutterState    *state,
                                                const GValue    *value,
                                                gdouble          pre_delay,
                                                gdouble          post_delay);
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 void              clutter_state_set_duration  (ClutterState    *state,
                                                const gchar     *source_state_name,
                                                const gchar     *target_state_name,
                                                guint            duration);
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 guint             clutter_state_get_duration  (ClutterState    *state,
                                                const gchar     *source_state_name,
                                                const gchar     *target_state_name);
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 void              clutter_state_set           (ClutterState    *state,
                                                const gchar     *source_state_name,
                                                const gchar     *target_state_name,
@@ -128,58 +128,58 @@ void              clutter_state_set           (ClutterState    *state,
                                                const gchar     *first_property_name,
                                                gulong           first_mode,
                                                 ...) G_GNUC_NULL_TERMINATED;
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 GList           * clutter_state_get_states    (ClutterState    *state);
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 GList           * clutter_state_get_keys      (ClutterState    *state,
                                                const gchar     *source_state_name,
                                                const gchar     *target_state_name,
                                                GObject         *object,
                                                const gchar     *property_name);
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 void              clutter_state_remove_key    (ClutterState    *state,
                                                const gchar     *source_state_name,
                                                const gchar     *target_state_name,
                                                GObject         *object,
                                                const gchar     *property_name);
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 ClutterTimeline * clutter_state_get_timeline  (ClutterState    *state);
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 void              clutter_state_set_animator  (ClutterState    *state,
                                                const gchar     *source_state_name,
                                                const gchar     *target_state_name,
                                                ClutterAnimator *animator);
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 ClutterAnimator * clutter_state_get_animator  (ClutterState    *state,
                                                const gchar     *source_state_name,
                                                const gchar     *target_state_name);
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 const gchar *     clutter_state_get_state     (ClutterState    *state);
 
 /*
  * ClutterStateKey
  */
 
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 GType                 clutter_state_key_get_type              (void) G_GNUC_CONST;
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 gdouble               clutter_state_key_get_pre_delay         (const ClutterStateKey *state_key);
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 gdouble               clutter_state_key_get_post_delay        (const ClutterStateKey *state_key);
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 gulong                clutter_state_key_get_mode              (const ClutterStateKey *state_key);
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 gboolean              clutter_state_key_get_value             (const ClutterStateKey *state_key,
                                                                GValue                *value);
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 GType                 clutter_state_key_get_property_type     (const ClutterStateKey *key);
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 GObject *             clutter_state_key_get_object            (const ClutterStateKey *state_key);
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 const gchar *         clutter_state_key_get_property_name     (const ClutterStateKey *state_key);
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 const gchar *         clutter_state_key_get_source_state_name (const ClutterStateKey *state_key);
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 const gchar *         clutter_state_key_get_target_state_name (const ClutterStateKey *state_key);
 
 G_END_DECLS
diff --git a/clutter/clutter/deprecated/clutter-table-layout.h 
b/clutter/clutter/deprecated/clutter-table-layout.h
index dffbfb777..fd503cdf4 100644
--- a/clutter/clutter/deprecated/clutter-table-layout.h
+++ b/clutter/clutter/deprecated/clutter-table-layout.h
@@ -81,90 +81,90 @@ struct _ClutterTableLayoutClass
   ClutterLayoutManagerClass parent_class;
 };
 
-CLUTTER_DEPRECATED_IN_1_18_FOR (clutter_grid_layout_get_type)
+CLUTTER_DEPRECATED_FOR (clutter_grid_layout_get_type)
 GType clutter_table_layout_get_type (void) G_GNUC_CONST;
 
-CLUTTER_DEPRECATED_IN_1_18_FOR (clutter_grid_layout_new)
+CLUTTER_DEPRECATED_FOR (clutter_grid_layout_new)
 ClutterLayoutManager *clutter_table_layout_new                 (void);
 
-CLUTTER_DEPRECATED_IN_1_18_FOR (clutter_grid_layout_attach)
+CLUTTER_DEPRECATED_FOR (clutter_grid_layout_attach)
 void                  clutter_table_layout_pack                (ClutterTableLayout    *layout,
                                                                 ClutterActor          *actor,
                                                                 gint                   column,
                                                                 gint                   row);
 
-CLUTTER_DEPRECATED_IN_1_18_FOR (clutter_grid_layout_set_column_spacing)
+CLUTTER_DEPRECATED_FOR (clutter_grid_layout_set_column_spacing)
 void                  clutter_table_layout_set_column_spacing  (ClutterTableLayout    *layout,
                                                                 guint                  spacing);
-CLUTTER_DEPRECATED_IN_1_18_FOR (clutter_grid_layout_set_row_spacing)
+CLUTTER_DEPRECATED_FOR (clutter_grid_layout_set_row_spacing)
 void                  clutter_table_layout_set_row_spacing     (ClutterTableLayout    *layout,
                                                                 guint                  spacing);
-CLUTTER_DEPRECATED_IN_1_18_FOR (clutter_grid_layout_get_column_spacing)
+CLUTTER_DEPRECATED_FOR (clutter_grid_layout_get_column_spacing)
 guint                 clutter_table_layout_get_column_spacing  (ClutterTableLayout    *layout);
-CLUTTER_DEPRECATED_IN_1_18_FOR (clutter_grid_layout_get_row_spacing)
+CLUTTER_DEPRECATED_FOR (clutter_grid_layout_get_row_spacing)
 guint                 clutter_table_layout_get_row_spacing     (ClutterTableLayout    *layout);
 
-CLUTTER_DEPRECATED_IN_1_18
+CLUTTER_DEPRECATED
 void                  clutter_table_layout_set_span            (ClutterTableLayout    *layout,
                                                                 ClutterActor          *actor,
                                                                 gint                   column_span,
                                                                 gint                   row_span);
-CLUTTER_DEPRECATED_IN_1_18
+CLUTTER_DEPRECATED
 void                  clutter_table_layout_get_span            (ClutterTableLayout    *layout,
                                                                 ClutterActor          *actor,
                                                                 gint                  *column_span,
                                                                 gint                  *row_span);
 
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 void                  clutter_table_layout_set_alignment       (ClutterTableLayout    *layout,
                                                                 ClutterActor          *actor,
                                                                 ClutterTableAlignment  x_align,
                                                                 ClutterTableAlignment  y_align);
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 void                  clutter_table_layout_get_alignment       (ClutterTableLayout    *layout,
                                                                 ClutterActor          *actor,
                                                                 ClutterTableAlignment *x_align,
                                                                 ClutterTableAlignment *y_align);
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 void                  clutter_table_layout_set_fill            (ClutterTableLayout    *layout,
                                                                 ClutterActor          *actor,
                                                                 gboolean               x_fill,
                                                                 gboolean               y_fill);
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 void                  clutter_table_layout_get_fill            (ClutterTableLayout    *layout,
                                                                 ClutterActor          *actor,
                                                                 gboolean              *x_fill,
                                                                 gboolean              *y_fill);
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 void                  clutter_table_layout_set_expand          (ClutterTableLayout    *layout,
                                                                 ClutterActor          *actor,
                                                                 gboolean               x_expand,
                                                                 gboolean               y_expand);
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 void                  clutter_table_layout_get_expand          (ClutterTableLayout    *layout,
                                                                 ClutterActor          *actor,
                                                                 gboolean              *x_expand,
                                                                 gboolean              *y_expand);
 
-CLUTTER_DEPRECATED_IN_1_18
+CLUTTER_DEPRECATED
 gint                  clutter_table_layout_get_row_count       (ClutterTableLayout    *layout);
-CLUTTER_DEPRECATED_IN_1_18
+CLUTTER_DEPRECATED
 gint                  clutter_table_layout_get_column_count    (ClutterTableLayout    *layout);
 
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 void                  clutter_table_layout_set_use_animations  (ClutterTableLayout    *layout,
                                                                 gboolean               animate);
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 gboolean              clutter_table_layout_get_use_animations  (ClutterTableLayout    *layout);
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 void                  clutter_table_layout_set_easing_mode     (ClutterTableLayout    *layout,
                                                                 gulong                 mode);
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 gulong                clutter_table_layout_get_easing_mode     (ClutterTableLayout    *layout);
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 void                  clutter_table_layout_set_easing_duration (ClutterTableLayout    *layout,
                                                                 guint                  msecs);
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 guint                 clutter_table_layout_get_easing_duration (ClutterTableLayout    *layout);
 
 G_END_DECLS
diff --git a/clutter/clutter/deprecated/clutter-texture.h b/clutter/clutter/deprecated/clutter-texture.h
index 6e0494370..5dfda27b2 100644
--- a/clutter/clutter/deprecated/clutter-texture.h
+++ b/clutter/clutter/deprecated/clutter-texture.h
@@ -32,18 +32,18 @@
 
 G_BEGIN_DECLS
 
-CLUTTER_DEPRECATED_IN_1_12_FOR(clutter_image_new)
+CLUTTER_DEPRECATED_FOR(clutter_image_new)
 ClutterActor *          clutter_texture_new                    (void);
 
-CLUTTER_DEPRECATED_IN_1_12_FOR(ClutterImage and platform-specific image loading)
+CLUTTER_DEPRECATED_FOR(ClutterImage and platform-specific image loading)
 ClutterActor *          clutter_texture_new_from_file           (const gchar            *filename,
                                                                  GError                **error);
 
-CLUTTER_DEPRECATED_IN_1_12_FOR(ClutterImage and platform-specific image loading)
+CLUTTER_DEPRECATED_FOR(ClutterImage and platform-specific image loading)
 gboolean                clutter_texture_set_from_file           (ClutterTexture         *texture,
                                                                  const gchar            *filename,
                                                                  GError                **error);
-CLUTTER_DEPRECATED_IN_1_12_FOR(clutter_image_set_data)
+CLUTTER_DEPRECATED_FOR(clutter_image_set_data)
 gboolean                clutter_texture_set_from_rgb_data       (ClutterTexture         *texture,
                                                                  const guchar           *data,
                                                                  gboolean                has_alpha,
@@ -53,7 +53,7 @@ gboolean                clutter_texture_set_from_rgb_data       (ClutterTexture
                                                                  gint                    bpp,
                                                                  ClutterTextureFlags     flags,
                                                                  GError                **error);
-CLUTTER_DEPRECATED_IN_1_12_FOR(clutter_image_set_area)
+CLUTTER_DEPRECATED_FOR(clutter_image_set_area)
 gboolean                clutter_texture_set_area_from_rgb_data  (ClutterTexture         *texture,
                                                                  const guchar           *data,
                                                                  gboolean                has_alpha,
@@ -65,65 +65,65 @@ gboolean                clutter_texture_set_area_from_rgb_data  (ClutterTexture
                                                                  gint                    bpp,
                                                                  ClutterTextureFlags     flags,
                                                                  GError                **error);
-CLUTTER_DEPRECATED_IN_1_12_FOR(ClutterImage and clutter_content_get_preferred_size)
+CLUTTER_DEPRECATED_FOR(ClutterImage and clutter_content_get_preferred_size)
 void                    clutter_texture_get_base_size           (ClutterTexture         *texture,
                                                                  gint                   *width,
                                                                  gint                   *height);
-CLUTTER_DEPRECATED_IN_1_12_FOR(ClutterImage and clutter_actor_set_content_scaling_filters)
+CLUTTER_DEPRECATED_FOR(ClutterImage and clutter_actor_set_content_scaling_filters)
 void                    clutter_texture_set_filter_quality      (ClutterTexture         *texture,
                                                                  ClutterTextureQuality   filter_quality);
-CLUTTER_DEPRECATED_IN_1_12_FOR(ClutterImage and clutter_actor_get_content_scaling_filters)
+CLUTTER_DEPRECATED_FOR(ClutterImage and clutter_actor_get_content_scaling_filters)
 ClutterTextureQuality   clutter_texture_get_filter_quality      (ClutterTexture         *texture);
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 CoglHandle              clutter_texture_get_cogl_texture        (ClutterTexture         *texture);
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 void                    clutter_texture_set_cogl_texture        (ClutterTexture         *texture,
                                                                  CoglHandle              cogl_tex);
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 CoglHandle              clutter_texture_get_cogl_material       (ClutterTexture         *texture);
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 void                    clutter_texture_set_cogl_material       (ClutterTexture         *texture,
                                                                  CoglHandle              cogl_material);
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 void                    clutter_texture_set_sync_size           (ClutterTexture         *texture,
                                                                  gboolean                sync_size);
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 gboolean                clutter_texture_get_sync_size           (ClutterTexture         *texture);
-CLUTTER_DEPRECATED_IN_1_12_FOR(ClutterImage and clutter_actor_set_content_repeat)
+CLUTTER_DEPRECATED_FOR(ClutterImage and clutter_actor_set_content_repeat)
 void                    clutter_texture_set_repeat              (ClutterTexture         *texture,
                                                                  gboolean                repeat_x,
                                                                  gboolean                repeat_y);
-CLUTTER_DEPRECATED_IN_1_12_FOR(ClutterImage and clutter_actor_get_content_repeat)
+CLUTTER_DEPRECATED_FOR(ClutterImage and clutter_actor_get_content_repeat)
 void                    clutter_texture_get_repeat              (ClutterTexture         *texture,
                                                                  gboolean               *repeat_x,
                                                                  gboolean               *repeat_y);
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 gint                    clutter_texture_get_max_tile_waste      (ClutterTexture         *texture);
-CLUTTER_DEPRECATED_IN_1_12_FOR(ClutterImage and clutter_actor_set_content_gravity)
+CLUTTER_DEPRECATED_FOR(ClutterImage and clutter_actor_set_content_gravity)
 void                    clutter_texture_set_keep_aspect_ratio   (ClutterTexture         *texture,
                                                                  gboolean                keep_aspect);
-CLUTTER_DEPRECATED_IN_1_12_FOR(ClutterImage and clutter_actor_get_content_gravity)
+CLUTTER_DEPRECATED_FOR(ClutterImage and clutter_actor_get_content_gravity)
 gboolean                clutter_texture_get_keep_aspect_ratio   (ClutterTexture         *texture);
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 void                    clutter_texture_set_load_async          (ClutterTexture         *texture,
                                                                  gboolean                load_async);
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 gboolean                clutter_texture_get_load_async          (ClutterTexture         *texture);
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 void                    clutter_texture_set_load_data_async     (ClutterTexture         *texture,
                                                                  gboolean                load_async);
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 gboolean                clutter_texture_get_load_data_async     (ClutterTexture         *texture);
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 void                    clutter_texture_set_pick_with_alpha     (ClutterTexture         *texture,
                                                                  gboolean                pick_with_alpha);
-CLUTTER_DEPRECATED_IN_1_12
+CLUTTER_DEPRECATED
 gboolean                clutter_texture_get_pick_with_alpha     (ClutterTexture         *texture);
 
-CLUTTER_DEPRECATED_IN_1_8_FOR(ClutterOffscreenEffect)
+CLUTTER_DEPRECATED_FOR(ClutterOffscreenEffect)
 ClutterActor *          clutter_texture_new_from_actor          (ClutterActor           *actor);
 
-CLUTTER_DEPRECATED_IN_1_10
+CLUTTER_DEPRECATED
 gboolean                clutter_texture_set_from_yuv_data       (ClutterTexture         *texture,
                                                                  const guchar           *data,
                                                                  gint                    width,
diff --git a/clutter/clutter/deprecated/clutter-timeline.h b/clutter/clutter/deprecated/clutter-timeline.h
index e99c7df39..950362e90 100644
--- a/clutter/clutter/deprecated/clutter-timeline.h
+++ b/clutter/clutter/deprecated/clutter-timeline.h
@@ -26,14 +26,14 @@
 
 G_BEGIN_DECLS
 
-CLUTTER_DEPRECATED_IN_1_10_FOR(clutter_timeline_new)
+CLUTTER_DEPRECATED_FOR(clutter_timeline_new)
 ClutterTimeline *               clutter_timeline_clone                  (ClutterTimeline          *timeline);
 
-CLUTTER_DEPRECATED_IN_1_10_FOR(clutter_timeline_set_repeat_count)
+CLUTTER_DEPRECATED_FOR(clutter_timeline_set_repeat_count)
 void                            clutter_timeline_set_loop               (ClutterTimeline          *timeline,
                                                                          gboolean                  loop);
 
-CLUTTER_DEPRECATED_IN_1_10_FOR(clutter_timeline_get_repeat_count)
+CLUTTER_DEPRECATED_FOR(clutter_timeline_get_repeat_count)
 gboolean                        clutter_timeline_get_loop               (ClutterTimeline          *timeline);
 
 G_END_DECLS
diff --git a/clutter/clutter/deprecated/clutter-timeout-pool.h 
b/clutter/clutter/deprecated/clutter-timeout-pool.h
index 61780e546..7e9384254 100644
--- a/clutter/clutter/deprecated/clutter-timeout-pool.h
+++ b/clutter/clutter/deprecated/clutter-timeout-pool.h
@@ -51,16 +51,16 @@ G_BEGIN_DECLS
  */
 typedef struct _ClutterTimeoutPool    ClutterTimeoutPool;
 
-CLUTTER_DEPRECATED_IN_1_6
+CLUTTER_DEPRECATED
 ClutterTimeoutPool *clutter_timeout_pool_new    (gint                priority);
 
-CLUTTER_DEPRECATED_IN_1_6
+CLUTTER_DEPRECATED
 guint               clutter_timeout_pool_add    (ClutterTimeoutPool *pool,
                                                  guint               fps,
                                                  GSourceFunc         func,
                                                  gpointer            data,
                                                  GDestroyNotify      notify);
-CLUTTER_DEPRECATED_IN_1_6
+CLUTTER_DEPRECATED
 void                clutter_timeout_pool_remove (ClutterTimeoutPool *pool,
                                                  guint               id_);
 
diff --git a/clutter/clutter/deprecated/clutter-util.h b/clutter/clutter/deprecated/clutter-util.h
index ff9b325df..26fb7d860 100644
--- a/clutter/clutter/deprecated/clutter-util.h
+++ b/clutter/clutter/deprecated/clutter-util.h
@@ -32,7 +32,7 @@
 
 G_BEGIN_DECLS
 
-CLUTTER_DEPRECATED_IN_1_2
+CLUTTER_DEPRECATED
 gint clutter_util_next_p2 (gint a);
 
 G_END_DECLS
diff --git a/clutter/clutter/egl/clutter-backend-eglnative.h b/clutter/clutter/egl/clutter-backend-eglnative.h
index e871c99a0..3a87ddb3d 100644
--- a/clutter/clutter/egl/clutter-backend-eglnative.h
+++ b/clutter/clutter/egl/clutter-backend-eglnative.h
@@ -71,7 +71,7 @@ struct _ClutterBackendEglNativeClass
   ClutterBackendClass parent_class;
 };
 
-CLUTTER_AVAILABLE_IN_MUTTER
+CLUTTER_EXPORT
 GType clutter_backend_egl_native_get_type (void) G_GNUC_CONST;
 
 ClutterBackend *clutter_backend_egl_native_new (void);
diff --git a/clutter/clutter/egl/clutter-egl.h b/clutter/clutter/egl/clutter-egl.h
index 0a4ab05d9..52fc57ebc 100644
--- a/clutter/clutter/egl/clutter-egl.h
+++ b/clutter/clutter/egl/clutter-egl.h
@@ -84,12 +84,12 @@ EGLDisplay      clutter_egl_display             (void);
  *
  * Since: 1.6
  */
-CLUTTER_AVAILABLE_IN_1_6
+CLUTTER_EXPORT
 EGLDisplay      clutter_egl_get_egl_display     (void);
 
-CLUTTER_AVAILABLE_IN_1_20
+CLUTTER_EXPORT
 void            clutter_egl_freeze_master_clock (void);
-CLUTTER_AVAILABLE_IN_1_20
+CLUTTER_EXPORT
 void            clutter_egl_thaw_master_clock   (void);
 
 G_END_DECLS
diff --git a/clutter/clutter/evdev/clutter-evdev.h b/clutter/clutter/evdev/clutter-evdev.h
index be7f09c44..ccb7b71cb 100644
--- a/clutter/clutter/evdev/clutter-evdev.h
+++ b/clutter/clutter/evdev/clutter-evdev.h
@@ -52,17 +52,17 @@ typedef int (*ClutterOpenDeviceCallback) (const char  *path,
 typedef void (*ClutterCloseDeviceCallback) (int          fd,
                                            gpointer     user_data);
 
-CLUTTER_AVAILABLE_IN_1_16
+CLUTTER_EXPORT
 void  clutter_evdev_set_device_callbacks (ClutterOpenDeviceCallback  open_callback,
                                           ClutterCloseDeviceCallback close_callback,
                                           gpointer                   user_data);
 
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void  clutter_evdev_set_seat_id (const gchar *seat_id);
 
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 void  clutter_evdev_release_devices (void);
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 void  clutter_evdev_reclaim_devices (void);
 
 /**
@@ -91,7 +91,7 @@ typedef void (*ClutterPointerConstrainCallback) (ClutterInputDevice *device,
                                                 float              *y,
                                                 gpointer            user_data);
 
-CLUTTER_AVAILABLE_IN_1_16
+CLUTTER_EXPORT
 void  clutter_evdev_set_pointer_constrain_callback (ClutterDeviceManager            *evdev,
                                                    ClutterPointerConstrainCallback  callback,
                                                    gpointer                         user_data,
@@ -104,30 +104,30 @@ typedef void (*ClutterRelativeMotionFilter) (ClutterInputDevice *device,
                                              float              *dy,
                                              gpointer            user_data);
 
-CLUTTER_AVAILABLE_IN_MUTTER
+CLUTTER_EXPORT
 void clutter_evdev_set_relative_motion_filter (ClutterDeviceManager       *evdev,
                                                ClutterRelativeMotionFilter filter,
                                                gpointer                    user_data);
 
-CLUTTER_AVAILABLE_IN_1_16
+CLUTTER_EXPORT
 void               clutter_evdev_set_keyboard_map   (ClutterDeviceManager *evdev,
                                                     struct xkb_keymap    *keymap);
 
-CLUTTER_AVAILABLE_IN_1_18
+CLUTTER_EXPORT
 struct xkb_keymap * clutter_evdev_get_keyboard_map (ClutterDeviceManager *evdev);
 
-CLUTTER_AVAILABLE_IN_1_20
+CLUTTER_EXPORT
 void clutter_evdev_set_keyboard_layout_index (ClutterDeviceManager *evdev,
                                               xkb_layout_index_t    idx);
 
-CLUTTER_AVAILABLE_IN_MUTTER
+CLUTTER_EXPORT
 xkb_layout_index_t clutter_evdev_get_keyboard_layout_index (ClutterDeviceManager *evdev);
 
-CLUTTER_AVAILABLE_IN_1_26
+CLUTTER_EXPORT
 void clutter_evdev_set_keyboard_numlock (ClutterDeviceManager *evdev,
                                          gboolean              numlock_state);
 
-CLUTTER_AVAILABLE_IN_1_18
+CLUTTER_EXPORT
 void clutter_evdev_set_keyboard_repeat (ClutterDeviceManager *evdev,
                                         gboolean              repeat,
                                         guint32               delay,
@@ -136,42 +136,42 @@ void clutter_evdev_set_keyboard_repeat (ClutterDeviceManager *evdev,
 typedef gboolean (* ClutterEvdevFilterFunc) (struct libinput_event *event,
                                              gpointer               data);
 
-CLUTTER_AVAILABLE_IN_1_20
+CLUTTER_EXPORT
 void clutter_evdev_add_filter    (ClutterEvdevFilterFunc func,
                                   gpointer               data,
                                   GDestroyNotify         destroy_notify);
-CLUTTER_AVAILABLE_IN_1_20
+CLUTTER_EXPORT
 void clutter_evdev_remove_filter (ClutterEvdevFilterFunc func,
                                   gpointer               data);
-CLUTTER_AVAILABLE_IN_1_20
+CLUTTER_EXPORT
 struct libinput_device * clutter_evdev_input_device_get_libinput_device (ClutterInputDevice *device);
 
-CLUTTER_AVAILABLE_IN_1_20
+CLUTTER_EXPORT
 gint32 clutter_evdev_event_sequence_get_slot (const ClutterEventSequence *sequence);
 
-CLUTTER_AVAILABLE_IN_1_20
+CLUTTER_EXPORT
 void clutter_evdev_warp_pointer (ClutterInputDevice   *pointer_device,
                                  guint32               time_,
                                  int                   x,
                                  int                   y);
 
-CLUTTER_AVAILABLE_IN_1_26
+CLUTTER_EXPORT
 guint32 clutter_evdev_event_get_event_code (const ClutterEvent *event);
 
-CLUTTER_AVAILABLE_IN_1_26
+CLUTTER_EXPORT
 guint64 clutter_evdev_event_get_time_usec (const ClutterEvent *event);
 
-CLUTTER_AVAILABLE_IN_1_26
+CLUTTER_EXPORT
 gboolean clutter_evdev_event_get_relative_motion (const ClutterEvent *event,
                                                   double             *dx,
                                                   double             *dy,
                                                   double             *dx_unaccel,
                                                   double             *dy_unaccel);
 
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void clutter_evdev_input_device_tool_set_pressure_curve (ClutterInputDeviceTool *tool,
                                                          gdouble                 curve[4]);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void clutter_evdev_input_device_tool_set_button_code    (ClutterInputDeviceTool *tool,
                                                          guint                   button,
                                                          guint                   evcode);
diff --git a/clutter/clutter/wayland/clutter-wayland-compositor.h 
b/clutter/clutter/wayland/clutter-wayland-compositor.h
index 703a7e2f5..cdd4cebcf 100644
--- a/clutter/clutter/wayland/clutter-wayland-compositor.h
+++ b/clutter/clutter/wayland/clutter-wayland-compositor.h
@@ -37,7 +37,7 @@
 
 G_BEGIN_DECLS
 
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 void    clutter_wayland_set_compositor_display  (void *display);
 
 G_END_DECLS
diff --git a/clutter/clutter/wayland/clutter-wayland-surface.h 
b/clutter/clutter/wayland/clutter-wayland-surface.h
index f674af88a..2b582906a 100644
--- a/clutter/clutter/wayland/clutter-wayland-surface.h
+++ b/clutter/clutter/wayland/clutter-wayland-surface.h
@@ -88,28 +88,28 @@ struct _ClutterWaylandSurfaceClass
   gpointer _padding_dummy[8];
 };
 
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 GType clutter_wayland_surface_get_type (void) G_GNUC_CONST;
 
-CLUTTER_AVAILABLE_IN_1_8
+CLUTTER_EXPORT
 ClutterActor *clutter_wayland_surface_new               (struct wl_surface *surface);
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 void          clutter_wayland_surface_set_surface       (ClutterWaylandSurface *self,
                                                          struct wl_surface *surface);
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 struct wl_surface *clutter_wayland_surface_get_surface  (ClutterWaylandSurface *self);
-CLUTTER_AVAILABLE_IN_1_8
+CLUTTER_EXPORT
 gboolean      clutter_wayland_surface_attach_buffer     (ClutterWaylandSurface *self,
                                                          struct wl_resource *buffer,
                                                          GError **error);
-CLUTTER_AVAILABLE_IN_1_8
+CLUTTER_EXPORT
 void          clutter_wayland_surface_damage_buffer     (ClutterWaylandSurface *self,
                                                          struct wl_resource *buffer,
                                                          gint32 x,
                                                          gint32 y,
                                                          gint32 width,
                                                          gint32 height);
-CLUTTER_AVAILABLE_IN_1_10
+CLUTTER_EXPORT
 CoglTexture  *clutter_wayland_surface_get_cogl_texture  (ClutterWaylandSurface *self);
 
 G_END_DECLS
diff --git a/clutter/clutter/x11/clutter-backend-x11.h b/clutter/clutter/x11/clutter-backend-x11.h
index 50d07975c..387132b92 100644
--- a/clutter/clutter/x11/clutter-backend-x11.h
+++ b/clutter/clutter/x11/clutter-backend-x11.h
@@ -118,7 +118,7 @@ struct _ClutterBackendX11Class
   ClutterBackendClass parent_class;
 };
 
-CLUTTER_AVAILABLE_IN_MUTTER
+CLUTTER_EXPORT
 GType clutter_backend_x11_get_type (void) G_GNUC_CONST;
 
 ClutterBackend *clutter_backend_x11_new (void);
diff --git a/clutter/clutter/x11/clutter-stage-x11.h b/clutter/clutter/x11/clutter-stage-x11.h
index 7b3ab1ffc..e2be10bec 100644
--- a/clutter/clutter/x11/clutter-stage-x11.h
+++ b/clutter/clutter/x11/clutter-stage-x11.h
@@ -82,7 +82,7 @@ struct _ClutterStageX11Class
   ClutterStageCoglClass parent_class;
 };
 
-CLUTTER_AVAILABLE_IN_MUTTER
+CLUTTER_EXPORT
 GType _clutter_stage_x11_get_type (void) G_GNUC_CONST;
 
 void  _clutter_stage_x11_events_device_changed (ClutterStageX11 *stage_x11,
diff --git a/clutter/clutter/x11/clutter-x11-texture-pixmap.h 
b/clutter/clutter/x11/clutter-x11-texture-pixmap.h
index 8d2dc3338..4b2e894b4 100644
--- a/clutter/clutter/x11/clutter-x11-texture-pixmap.h
+++ b/clutter/clutter/x11/clutter-x11-texture-pixmap.h
@@ -81,30 +81,30 @@ struct _ClutterX11TexturePixmapClass
                         gint                     height);
 };
 
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 GType clutter_x11_texture_pixmap_get_type (void) G_GNUC_CONST;
 
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 ClutterActor *clutter_x11_texture_pixmap_new             (void);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 ClutterActor *clutter_x11_texture_pixmap_new_with_pixmap (Pixmap      pixmap);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 ClutterActor *clutter_x11_texture_pixmap_new_with_window (Window      window);
 
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void          clutter_x11_texture_pixmap_set_automatic   (ClutterX11TexturePixmap *texture,
                                                           gboolean                 setting);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void          clutter_x11_texture_pixmap_set_pixmap      (ClutterX11TexturePixmap *texture,
                                                           Pixmap                   pixmap);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void          clutter_x11_texture_pixmap_set_window      (ClutterX11TexturePixmap *texture,
                                                           Window                   window,
                                                           gboolean                 automatic);
 
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void          clutter_x11_texture_pixmap_sync_window     (ClutterX11TexturePixmap *texture);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void          clutter_x11_texture_pixmap_update_area     (ClutterX11TexturePixmap *texture,
                                                           gint                     x,
                                                           gint                     y,
diff --git a/clutter/clutter/x11/clutter-x11.h b/clutter/clutter/x11/clutter-x11.h
index e3204f393..088dba978 100644
--- a/clutter/clutter/x11/clutter-x11.h
+++ b/clutter/clutter/x11/clutter-x11.h
@@ -64,7 +64,7 @@ typedef enum {
   CLUTTER_X11_FILTER_REMOVE
 } ClutterX11FilterReturn;
 
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 GType clutter_x11_filter_return_get_type (void) G_GNUC_CONST;
 
 /*
@@ -88,77 +88,77 @@ typedef ClutterX11FilterReturn (*ClutterX11FilterFunc) (XEvent        *xev,
                                                         ClutterEvent  *cev,
                                                         gpointer       data);
 
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void     clutter_x11_trap_x_errors       (void);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 gint     clutter_x11_untrap_x_errors     (void);
 
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 Display *clutter_x11_get_default_display (void);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 int      clutter_x11_get_default_screen  (void);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 Window   clutter_x11_get_root_window     (void);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 XVisualInfo *clutter_x11_get_visual_info (void);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void     clutter_x11_set_display         (Display * xdpy);
 
 CLUTTER_DEPRECATED_FOR(clutter_x11_get_visual_info)
 XVisualInfo *clutter_x11_get_stage_visual  (ClutterStage *stage);
 
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 Window       clutter_x11_get_stage_window  (ClutterStage *stage);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 gboolean     clutter_x11_set_stage_foreign (ClutterStage *stage,
                                             Window        xwindow);
 
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void         clutter_x11_add_filter    (ClutterX11FilterFunc func,
                                         gpointer             data);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void         clutter_x11_remove_filter (ClutterX11FilterFunc func,
                                         gpointer             data);
 
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 ClutterX11FilterReturn clutter_x11_handle_event (XEvent *xevent);
 
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void     clutter_x11_disable_event_retrieval (void);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 gboolean clutter_x11_has_event_retrieval (void);
 
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 ClutterStage *clutter_x11_get_stage_from_window (Window win);
 
 CLUTTER_DEPRECATED_FOR(clutter_device_manager_peek_devices)
 const GSList* clutter_x11_get_input_devices (void);
 
-CLUTTER_DEPRECATED_IN_1_14
+CLUTTER_DEPRECATED
 void     clutter_x11_enable_xinput (void);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 gboolean clutter_x11_has_xinput (void);
 
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 gboolean clutter_x11_has_composite_extension (void);
 
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 void     clutter_x11_set_use_argb_visual (gboolean use_argb);
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 gboolean clutter_x11_get_use_argb_visual (void);
 
-CLUTTER_AVAILABLE_IN_1_22
+CLUTTER_EXPORT
 void     clutter_x11_set_use_stereo_stage (gboolean use_stereo);
-CLUTTER_AVAILABLE_IN_1_22
+CLUTTER_EXPORT
 gboolean clutter_x11_get_use_stereo_stage (void);
 
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 Time clutter_x11_get_current_event_time (void);
 
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 gint clutter_x11_event_get_key_group (const ClutterEvent *event);
 
-CLUTTER_AVAILABLE_IN_ALL
+CLUTTER_EXPORT
 guint clutter_x11_event_sequence_get_touch_detail (const ClutterEventSequence *sequence);
 
 G_END_DECLS
diff --git a/clutter/configure.ac b/clutter/configure.ac
index 6ad5d9285..ed778223e 100644
--- a/clutter/configure.ac
+++ b/clutter/configure.ac
@@ -1,51 +1,7 @@
-# clutter package version number, (as distinct from shared library version)
-# An odd micro number indicates in-progress development from Git
-# An even micro number indicates a released version
-#
-# Making a point release:
-# - increase clutter_micro_version to the next even number
-# - increase clutter_interface_age to the next even number
-# After the release:
-# - increase clutter_micro_version to the next odd number
-# - increase clutter_interface_version to the next odd number
-m4_define([clutter_major_version], [1])
-m4_define([clutter_minor_version], [26])
-m4_define([clutter_micro_version], [1])
-
-# • for stable releases: increase the interface age by 1 for each release;
-#   if the API changes, set to 0. interface_age and binary_age are used to
-#   create the soname of the shared object:
-#
-#  (<minor> * 100 + <micro>) - <interface_age>
-#
-# this allows using the same soname for different micro-releases in case
-# no API was added or deprecated. for instance:
-#
-#   clutter 1.2.0  -> 100 * 2 + 0  = 200, interface age = 0 -> 200
-#   clutter 1.2.2  -> 100 * 2 + 2  = 202, interface age = 2 -> 200
-#   clutter 1.2.4  -> 100 * 2 + 4  = 204, interface age = 4 -> 200
-#   [ API addition, deprecation ]
-#   clutter 1.2.6  -> 100 * 2 + 6  = 206, interface age = 0 -> 206
-#   clutter 1.2.8  -> 100 * 2 + 8  = 208, interface age = 2 -> 206
-#   clutter 1.2.10 -> 100 * 2 + 10 = 210, interface age = 4 -> 206
-#   ...
-#
-# • for development releases: keep clutter_interface_age to 0
-m4_define([clutter_interface_age], [1])
-
-m4_define([clutter_binary_age], [m4_eval(100 * clutter_minor_version + clutter_micro_version)])
-
-m4_define([clutter_release_status],
-          [m4_if(m4_eval(clutter_micro_version % 2), [1], [git],
-                 [m4_if(m4_eval(clutter_minor_version % 2), [1], [snapshot],
-                                                                 [release])])])
-
-m4_define([clutter_version], [clutter_major_version.clutter_minor_version.clutter_micro_version])
-
 AC_PREREQ([2.63])
 
 AC_INIT([clutter],
-        [clutter_version],
+        [0.1],
         [http://bugzilla.gnome.org/enter_bug.cgi?product=clutter],
         [clutter],
         [http://www.clutter-project.org])
@@ -66,23 +22,7 @@ AC_ARG_VAR([LIBMUTTER_API_VERSION])
 AS_IF([test "x$MUTTER_VERSION" = "x"],
       [AC_MSG_ERROR([Clutter can only be configured by mutter])],)
 
-AC_SUBST([CLUTTER_MAJOR_VERSION],  [clutter_major_version])
-AC_SUBST([CLUTTER_MINOR_VERSION],  [clutter_minor_version])
-AC_SUBST([CLUTTER_MICRO_VERSION],  [clutter_micro_version])
-AC_SUBST([CLUTTER_VERSION],        [clutter_version])
-AC_SUBST([CLUTTER_RELEASE_STATUS], [clutter_release_status])
-
-m4_define([lt_current],  [m4_eval(100 * clutter_minor_version + clutter_micro_version - 
clutter_interface_age)])
-m4_define([lt_revision], [clutter_interface_age])
-m4_define([lt_age],      [m4_eval(clutter_binary_age - clutter_interface_age)])
-CLUTTER_LT_CURRENT=lt_current
-CLUTTER_LT_REV=lt_revision
-CLUTTER_LT_AGE=lt_age
-CLUTTER_LT_VERSION="$CLUTTER_LT_CURRENT:$CLUTTER_LT_REV:$CLUTTER_LT_AGE"
-CLUTTER_LT_LDFLAGS="-avoid-version"
-AC_SUBST([CLUTTER_LT_CURRENT],  [lt_current])
-AC_SUBST([CLUTTER_LT_REVISION], [lt_revision])
-AC_SUBST([CLUTTER_LT_VERSION],  [$CLUTTER_LT_VERSION])
+AC_DEFINE_UNQUOTED(MUTTER_VERSION, "$MUTTER_VERSION", [Mutter version])
 
 AC_PROG_SED
 
@@ -92,8 +32,6 @@ AC_CANONICAL_HOST
 
 AC_DEFINE([OS_LINUX], [1], [Define to 1 if building for Linux])
 
-AC_SUBST(CLUTTER_LT_LDFLAGS)
-
 AC_CACHE_SAVE
 
 dnl = Dependencies =========================================================
@@ -565,7 +503,7 @@ AM_CONDITIONAL([PIXBUF_TESTS], [test "x$pixbuf_tests" = "xyes"])
 
 dnl === Enable debug level ====================================================
 
-m4_define([debug_default], [m4_if(m4_eval(clutter_minor_version % 2), [1], [yes], [minimum])])
+m4_define([debug_default], [minimum])
 AC_ARG_ENABLE([debug],
               [AS_HELP_STRING([--enable-debug=@<:@no/minimum/yes@:>@],
                               [Control Clutter debugging level @<:@default=]debug_default[@:>@])],
@@ -594,10 +532,7 @@ AC_SUBST(CLUTTER_DEBUG_CFLAGS)
 dnl === Enable deprecation guards ==================================================
 
 m4_define([deprecated_default],
-          [m4_if(m4_eval(clutter_minor_version % 2),
-                 [1],
-                 [no],
-                 [yes])])
+          [yes])
 
 AC_ARG_ENABLE([deprecated],
               [AS_HELP_STRING([--enable-deprecated=@<:@no/yes@:>@],
@@ -626,7 +561,7 @@ dnl === Enable strict compiler flags ==========================================
 
 # use strict compiler flags only when building from git; the rules for
 # distcheck will take care of turning this on when making a release
-m4_define([maintainer_flags_default], [m4_if(m4_eval(clutter_micro_version % 2), [1], [yes], [no])])
+m4_define([maintainer_flags_default], [no])
 AC_ARG_ENABLE([maintainer-flags],
               [AS_HELP_STRING([--enable-maintainer-flags=@<:@no/yes/error@:>@],
                               [Use strict compiler flags @<:@default=]maintainer_flags_default[@:>@])],
@@ -811,7 +746,6 @@ AC_CONFIG_FILES([
 
        clutter/Makefile
         clutter/clutter-config.h
-       clutter/clutter-version.h
        clutter/mutter-clutter-$LIBMUTTER_API_VERSION.pc:clutter/mutter-clutter.pc.in
 
        tests/Makefile


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]