diff --git a/ChangeLog b/ChangeLog
index 9c5cc6cd7..effc7cb9c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2007-06-16  Emmanuele Bassi  <ebassi@openedhand.com>
+
+	* clutter/clutter-actor.h:
+	* clutter/clutter-stage.h: Add 32 padding slots; when we
+	reach 1.0 it'll be a long road until the following ABI
+	break.
+
+	* tests/test-behave.c: Don't forget to include headers.
+
 2007-06-16  Emmanuele Bassi  <ebassi@openedhand.com>
 
 	* clutter/clutter-container.h:
diff --git a/clutter/clutter-actor.h b/clutter/clutter-actor.h
index 7c2705855..72dc293be 100644
--- a/clutter/clutter-actor.h
+++ b/clutter/clutter-actor.h
@@ -154,13 +154,9 @@ struct _ClutterActorClass
   void (* pick)            (ClutterActor        *actor,
                             const ClutterColor  *color);
 
+  /*< private >*/
   /* padding for future expansion */
-  void (*_clutter_actor_1) (void);
-  void (*_clutter_actor_2) (void);
-  void (*_clutter_actor_3) (void);
-  void (*_clutter_actor_4) (void);
-  void (*_clutter_actor_5) (void);
-  void (*_clutter_actor_6) (void);
+  gpointer _padding_dummy[32];
 };
 
 GType                 clutter_actor_get_type         (void) G_GNUC_CONST;
diff --git a/clutter/clutter-stage.h b/clutter/clutter-stage.h
index 58fa68b20..08d2cc47f 100644
--- a/clutter/clutter-stage.h
+++ b/clutter/clutter-stage.h
@@ -111,13 +111,9 @@ struct _ClutterStageClass
   void     (* stage_state_event)    (ClutterStage           *stage,
                                      ClutterStageStateEvent *event);
 
+  /*< private >*/
   /* padding for future expansion */
-  void (*_clutter_stage1) (void);
-  void (*_clutter_stage2) (void);
-  void (*_clutter_stage3) (void);
-  void (*_clutter_stage4) (void);
-  void (*_clutter_stage5) (void);
-  void (*_clutter_stage6) (void);
+  gpointer _padding_dummy[32];
 };
 
 #define CLUTTER_TYPE_PERSPECTIVE  (clutter_perspective_get_type ())
diff --git a/tests/test-behave.c b/tests/test-behave.c
index 93d0ae029..32cde8078 100644
--- a/tests/test-behave.c
+++ b/tests/test-behave.c
@@ -1,3 +1,9 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <glib.h>
+
 #include <clutter/clutter.h>
 
 static void