diff --git a/clutter/clutter/clutter-autocleanups.h b/clutter/clutter/clutter-autocleanups.h
index 686e6597d..d38882a4f 100644
--- a/clutter/clutter/clutter-autocleanups.h
+++ b/clutter/clutter/clutter-autocleanups.h
@@ -43,7 +43,6 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterFlowLayout, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterGridLayout, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterInputDevice, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterInterval, g_object_unref)
-G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterKeyframeTransition, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterOffscreenEffect, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterPageTurnEffect, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterScrollActor, g_object_unref)
diff --git a/clutter/clutter/clutter-keyframe-transition.c b/clutter/clutter/clutter-keyframe-transition.c
index f64b4d531..ebb67cb1a 100644
--- a/clutter/clutter/clutter-keyframe-transition.c
+++ b/clutter/clutter/clutter-keyframe-transition.c
@@ -85,12 +85,12 @@ typedef struct _KeyFrame
   ClutterInterval *interval;
 } KeyFrame;
 
-struct _ClutterKeyframeTransitionPrivate
+typedef struct _ClutterKeyframeTransitionPrivate
 {
   GArray *frames;
 
   gint current_frame;
-};
+} ClutterKeyframeTransitionPrivate;
 
 G_DEFINE_TYPE_WITH_PRIVATE (ClutterKeyframeTransition,
                             clutter_keyframe_transition,
@@ -126,15 +126,19 @@ sort_by_key (gconstpointer a,
 static inline void
 clutter_keyframe_transition_sort_frames (ClutterKeyframeTransition *transition)
 {
-  if (transition->priv->frames != NULL)
-    g_array_sort (transition->priv->frames, sort_by_key);
+  ClutterKeyframeTransitionPrivate *priv =
+    clutter_keyframe_transition_get_instance_private (transition);
+
+  if (priv->frames != NULL)
+    g_array_sort (priv->frames, sort_by_key);
 }
 
 static inline void
 clutter_keyframe_transition_init_frames (ClutterKeyframeTransition *transition,
                                          gssize                     n_key_frames)
 {
-  ClutterKeyframeTransitionPrivate *priv = transition->priv;
+  ClutterKeyframeTransitionPrivate *priv =
+    clutter_keyframe_transition_get_instance_private (transition);
   guint i;
 
   priv->frames = g_array_sized_new (FALSE, FALSE,
@@ -165,7 +169,8 @@ clutter_keyframe_transition_init_frames (ClutterKeyframeTransition *transition,
 static inline void
 clutter_keyframe_transition_update_frames (ClutterKeyframeTransition *transition)
 {
-  ClutterKeyframeTransitionPrivate *priv = transition->priv;
+  ClutterKeyframeTransitionPrivate *priv =
+    clutter_keyframe_transition_get_instance_private (transition);
   guint i;
 
   if (priv->frames == NULL)
@@ -215,7 +220,8 @@ clutter_keyframe_transition_compute_value (ClutterTransition *transition,
 {
   ClutterKeyframeTransition *self = CLUTTER_KEYFRAME_TRANSITION (transition);
   ClutterTimeline *timeline = CLUTTER_TIMELINE (transition);
-  ClutterKeyframeTransitionPrivate *priv = self->priv;
+  ClutterKeyframeTransitionPrivate *priv =
+    clutter_keyframe_transition_get_instance_private (self);
   ClutterTransitionClass *parent_class;
   ClutterTimelineDirection direction;
   ClutterInterval *real_interval;
@@ -332,10 +338,12 @@ static void
 clutter_keyframe_transition_started (ClutterTimeline *timeline)
 {
   ClutterKeyframeTransition *transition;
+  ClutterKeyframeTransitionPrivate *priv;
 
   transition = CLUTTER_KEYFRAME_TRANSITION (timeline);
+  priv = clutter_keyframe_transition_get_instance_private (transition);
 
-  transition->priv->current_frame = -1;
+  priv->current_frame = -1;
 
   clutter_keyframe_transition_sort_frames (transition);
   clutter_keyframe_transition_update_frames (transition);
@@ -344,9 +352,9 @@ clutter_keyframe_transition_started (ClutterTimeline *timeline)
 static void
 clutter_keyframe_transition_completed (ClutterTimeline *timeline)
 {
-  ClutterKeyframeTransitionPrivate *priv;
-
-  priv = CLUTTER_KEYFRAME_TRANSITION (timeline)->priv;
+  ClutterKeyframeTransition *transition = CLUTTER_KEYFRAME_TRANSITION (timeline);
+  ClutterKeyframeTransitionPrivate *priv =
+    clutter_keyframe_transition_get_instance_private (transition);
 
   priv->current_frame = -1;
 }
@@ -354,9 +362,9 @@ clutter_keyframe_transition_completed (ClutterTimeline *timeline)
 static void
 clutter_keyframe_transition_finalize (GObject *gobject)
 {
-  ClutterKeyframeTransitionPrivate *priv;
-
-  priv = CLUTTER_KEYFRAME_TRANSITION (gobject)->priv;
+  ClutterKeyframeTransition *transition = CLUTTER_KEYFRAME_TRANSITION (gobject);
+  ClutterKeyframeTransitionPrivate *priv =
+    clutter_keyframe_transition_get_instance_private (transition);
 
   if (priv->frames != NULL)
     g_array_unref (priv->frames);
@@ -382,7 +390,6 @@ clutter_keyframe_transition_class_init (ClutterKeyframeTransitionClass *klass)
 static void
 clutter_keyframe_transition_init (ClutterKeyframeTransition *self)
 {
-  self->priv = clutter_keyframe_transition_get_instance_private (self);
 }
 
 /**
@@ -428,7 +435,7 @@ clutter_keyframe_transition_set_key_frames (ClutterKeyframeTransition *transitio
   g_return_if_fail (n_key_frames > 0);
   g_return_if_fail (key_frames != NULL);
 
-  priv = transition->priv;
+  priv = clutter_keyframe_transition_get_instance_private (transition);
 
   if (priv->frames == NULL)
     clutter_keyframe_transition_init_frames (transition, n_key_frames);
@@ -468,7 +475,7 @@ clutter_keyframe_transition_set_values (ClutterKeyframeTransition *transition,
   g_return_if_fail (n_values > 0);
   g_return_if_fail (values != NULL);
 
-  priv = transition->priv;
+  priv = clutter_keyframe_transition_get_instance_private (transition);
 
   if (priv->frames == NULL)
     clutter_keyframe_transition_init_frames (transition, n_values);
@@ -513,7 +520,7 @@ clutter_keyframe_transition_set_modes (ClutterKeyframeTransition  *transition,
   g_return_if_fail (n_modes > 0);
   g_return_if_fail (modes != NULL);
 
-  priv = transition->priv;
+  priv = clutter_keyframe_transition_get_instance_private (transition);
 
   if (priv->frames == NULL)
     clutter_keyframe_transition_init_frames (transition, n_modes);
@@ -558,7 +565,7 @@ clutter_keyframe_transition_set (ClutterKeyframeTransition *transition,
   g_return_if_fail (gtype != G_TYPE_INVALID);
   g_return_if_fail (n_key_frames > 0);
 
-  priv = transition->priv;
+  priv = clutter_keyframe_transition_get_instance_private (transition);
 
   if (priv->frames == NULL)
     clutter_keyframe_transition_init_frames (transition, n_key_frames);
@@ -603,12 +610,15 @@ clutter_keyframe_transition_set (ClutterKeyframeTransition *transition,
 void
 clutter_keyframe_transition_clear (ClutterKeyframeTransition *transition)
 {
+  ClutterKeyframeTransitionPrivate *priv;
+
   g_return_if_fail (CLUTTER_IS_KEYFRAME_TRANSITION (transition));
 
-  if (transition->priv->frames != NULL)
+  priv = clutter_keyframe_transition_get_instance_private (transition);
+  if (priv->frames != NULL)
     {
-      g_array_unref (transition->priv->frames);
-      transition->priv->frames = NULL;
+      g_array_unref (priv->frames);
+      priv->frames = NULL;
     }
 }
 
@@ -623,12 +633,15 @@ clutter_keyframe_transition_clear (ClutterKeyframeTransition *transition)
 guint
 clutter_keyframe_transition_get_n_key_frames (ClutterKeyframeTransition *transition)
 {
+  ClutterKeyframeTransitionPrivate *priv;
+
   g_return_val_if_fail (CLUTTER_IS_KEYFRAME_TRANSITION (transition), 0);
 
-  if (transition->priv->frames == NULL)
+  priv = clutter_keyframe_transition_get_instance_private (transition);
+  if (priv->frames == NULL)
     return 0;
 
-  return transition->priv->frames->len - 1;
+  return priv->frames->len - 1;
 }
 
 /**
@@ -656,7 +669,7 @@ clutter_keyframe_transition_set_key_frame (ClutterKeyframeTransition *transition
 
   g_return_if_fail (CLUTTER_IS_KEYFRAME_TRANSITION (transition));
 
-  priv = transition->priv;
+  priv = clutter_keyframe_transition_get_instance_private (transition);
   g_return_if_fail (priv->frames != NULL);
   g_return_if_fail (index_ < priv->frames->len - 1);
 
@@ -692,7 +705,7 @@ clutter_keyframe_transition_get_key_frame (ClutterKeyframeTransition *transition
 
   g_return_if_fail (CLUTTER_IS_KEYFRAME_TRANSITION (transition));
 
-  priv = transition->priv;
+  priv = clutter_keyframe_transition_get_instance_private (transition);
   g_return_if_fail (priv->frames != NULL);
   g_return_if_fail (index_ < priv->frames->len - 1);
 
diff --git a/clutter/clutter/clutter-keyframe-transition.h b/clutter/clutter/clutter-keyframe-transition.h
index d26a35770..1a8052340 100644
--- a/clutter/clutter/clutter-keyframe-transition.h
+++ b/clutter/clutter/clutter-keyframe-transition.h
@@ -33,22 +33,14 @@
 G_BEGIN_DECLS
 
 #define CLUTTER_TYPE_KEYFRAME_TRANSITION                (clutter_keyframe_transition_get_type ())
-#define CLUTTER_KEYFRAME_TRANSITION(obj)                (G_TYPE_CHECK_INSTANCE_CAST ((obj), CLUTTER_TYPE_KEYFRAME_TRANSITION, ClutterKeyframeTransition))
-#define CLUTTER_IS_KEYFRAME_TRANSITION(obj)             (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CLUTTER_TYPE_KEYFRAME_TRANSITION))
-#define CLUTTER_KEYFRAME_TRANSITION_CLASS(klass)        (G_TYPE_CHECK_CLASS_CAST ((klass), CLUTTER_TYPE_KEYFRAME_TRANSITION, ClutterKeyframeTransitionClass))
-#define CLUTTER_IS_KEYFRAME_TRANSITION_CLASS(klass)     (G_TYPE_CHECK_CLASS_TYPE ((klass), CLUTTER_TYPE_KEYFRAME_TRANSITION))
-#define CLUTTER_KEYFRAME_TRANSITION_GET_CLASS(obj)      (G_TYPE_INSTANCE_GET_CLASS ((obj), CLUTTER_TYPE_KEYFRAME_TRANSITION, ClutterKeyframeTransitionClass))
 
-typedef struct _ClutterKeyframeTransitionPrivate        ClutterKeyframeTransitionPrivate;
-typedef struct _ClutterKeyframeTransitionClass          ClutterKeyframeTransitionClass;
+CLUTTER_EXPORT
+G_DECLARE_DERIVABLE_TYPE (ClutterKeyframeTransition,
+                          clutter_keyframe_transition,
+                          CLUTTER,
+                          KEYFRAME_TRANSITION,
+                          ClutterPropertyTransition)
 
-struct _ClutterKeyframeTransition
-{
-  /*< private >*/
-  ClutterPropertyTransition parent_instance;
-
-  ClutterKeyframeTransitionPrivate *priv;
-};
 
 /**
  * ClutterKeyframeTransitionClass:
@@ -62,9 +54,6 @@ struct _ClutterKeyframeTransitionClass
   ClutterPropertyTransitionClass parent_class;
 };
 
-CLUTTER_EXPORT
-GType clutter_keyframe_transition_get_type (void) G_GNUC_CONST;
-
 CLUTTER_EXPORT
 ClutterTransition *     clutter_keyframe_transition_new                 (const char *property_name);