diff --git a/clutter/tests/interactive/test-actors.c b/clutter/tests/interactive/test-actors.c
index aeed9cb98..b27ee3e3d 100644
--- a/clutter/tests/interactive/test-actors.c
+++ b/clutter/tests/interactive/test-actors.c
@@ -27,6 +27,9 @@ typedef struct SuperOH
 
 static gint n_hands = NHANDS;
 
+int
+test_actors_main (int argc, char *argv[]);
+
 static GOptionEntry super_oh_entries[] = {
   {
     "num-hands", 'n',
diff --git a/clutter/tests/interactive/test-animation.c b/clutter/tests/interactive/test-animation.c
index 31938f3ed..dbd5e5876 100644
--- a/clutter/tests/interactive/test-animation.c
+++ b/clutter/tests/interactive/test-animation.c
@@ -4,6 +4,12 @@
 
 static gboolean is_expanded = FALSE;
 
+int
+test_animation_main (int argc, char *argv[]);
+
+const char *
+test_animation_describe (void);
+
 static void
 on_rect_transitions_completed (ClutterActor *actor)
 {
diff --git a/clutter/tests/interactive/test-animator.c b/clutter/tests/interactive/test-animator.c
index fc9f9f513..5ef926c99 100644
--- a/clutter/tests/interactive/test-animator.c
+++ b/clutter/tests/interactive/test-animator.c
@@ -5,6 +5,10 @@
 
 static ClutterAnimator *animator;
 
+gint
+test_animator_main (gint    argc,
+                    gchar **argv);
+
 static ClutterActor *new_rect (gint r,
                                gint g,
                                gint b,
diff --git a/clutter/tests/interactive/test-bind-constraint.c b/clutter/tests/interactive/test-bind-constraint.c
index 6cceebad7..4308799ed 100644
--- a/clutter/tests/interactive/test-bind-constraint.c
+++ b/clutter/tests/interactive/test-bind-constraint.c
@@ -47,6 +47,12 @@ static const gchar *desaturare_glsl_shader =
 
 static gboolean      is_expanded = FALSE;
 
+const char *
+test_bind_constraint_describe (void);
+
+int
+test_bind_constraint_main (int argc, char *argv[]);
+
 static gboolean
 on_button_release (ClutterActor *actor,
                    ClutterEvent *event,
diff --git a/clutter/tests/interactive/test-binding-pool.c b/clutter/tests/interactive/test-binding-pool.c
index 59b42c198..b33eebd42 100644
--- a/clutter/tests/interactive/test-binding-pool.c
+++ b/clutter/tests/interactive/test-binding-pool.c
@@ -31,6 +31,14 @@ struct _KeyGroupClass
                      ClutterActor *child);
 };
 
+GType key_group_get_type (void);
+
+int
+test_binding_pool_main (int argc, char *argv[]);
+
+const char *
+test_binding_pool_describe (void);
+
 G_DEFINE_TYPE (KeyGroup, key_group, CLUTTER_TYPE_ACTOR)
 
 enum
diff --git a/clutter/tests/interactive/test-cairo-clock.c b/clutter/tests/interactive/test-cairo-clock.c
index fa5166e02..8ef4bd934 100644
--- a/clutter/tests/interactive/test-cairo-clock.c
+++ b/clutter/tests/interactive/test-cairo-clock.c
@@ -3,6 +3,12 @@
 #include <cairo.h>
 #include <clutter/clutter.h>
 
+int
+test_cairo_clock_main (int argc, char *argv[]);
+
+const char *
+test_cairo_clock_describe (void);
+
 static gboolean
 draw_clock (ClutterCanvas *canvas,
             cairo_t       *cr,
diff --git a/clutter/tests/interactive/test-cairo-flowers.c b/clutter/tests/interactive/test-cairo-flowers.c
index 2594d686b..6f60784bb 100644
--- a/clutter/tests/interactive/test-cairo-flowers.c
+++ b/clutter/tests/interactive/test-cairo-flowers.c
@@ -25,6 +25,12 @@ Flower;
 
 static ClutterActor *stage = NULL;
 
+int
+test_cairo_flowers_main (int argc, char **argv);
+
+const char *
+test_cairo_flowers_describe (void);
+
 static gboolean
 draw_flower (ClutterCanvas *canvas,
              cairo_t       *cr,
diff --git a/clutter/tests/interactive/test-cogl-multitexture.c b/clutter/tests/interactive/test-cogl-multitexture.c
index b815831b5..3151b6e08 100644
--- a/clutter/tests/interactive/test-cogl-multitexture.c
+++ b/clutter/tests/interactive/test-cogl-multitexture.c
@@ -30,6 +30,11 @@ typedef struct _TestMultiLayerMaterialState
 
 } TestMultiLayerMaterialState;
 
+int
+test_cogl_multitexture_main (int argc, char *argv[]);
+
+const char *
+test_cogl_multitexture_describe (void);
 
 static void
 frame_cb (ClutterTimeline  *timeline,
diff --git a/clutter/tests/interactive/test-cogl-offscreen.c b/clutter/tests/interactive/test-cogl-offscreen.c
index 1589b180e..18469f11b 100644
--- a/clutter/tests/interactive/test-cogl-offscreen.c
+++ b/clutter/tests/interactive/test-cogl-offscreen.c
@@ -56,6 +56,12 @@ struct _TestCoglboxClass
 
 static GType test_coglbox_get_type (void) G_GNUC_CONST;
 
+int
+test_cogl_offscreen_main (int argc, char *argv[]);
+
+const char *
+test_cogl_offscreen_describe (void);
+
 G_END_DECLS
 
 /* Coglbox private declaration
@@ -153,7 +159,7 @@ test_coglbox_dispose (GObject *object)
  * This sets up a Clutter like coordinate system for a Cogl
  * framebuffer
  */
-void
+static void
 setup_viewport (unsigned int width,
                 unsigned int height,
                 float fovy,
diff --git a/clutter/tests/interactive/test-cogl-point-sprites.c b/clutter/tests/interactive/test-cogl-point-sprites.c
index f779dcc13..cd94966de 100644
--- a/clutter/tests/interactive/test-cogl-point-sprites.c
+++ b/clutter/tests/interactive/test-cogl-point-sprites.c
@@ -51,6 +51,12 @@ struct _Data
   CoglMaterial *material;
 };
 
+int
+test_cogl_point_sprites_main (int argc, char *argv[]);
+
+const char *
+test_cogl_point_sprites_describe (void);
+
 static CoglHandle
 generate_round_texture (void)
 {
diff --git a/clutter/tests/interactive/test-cogl-shader-glsl.c b/clutter/tests/interactive/test-cogl-shader-glsl.c
index 4dc65ad8a..ad32527fb 100644
--- a/clutter/tests/interactive/test-cogl-shader-glsl.c
+++ b/clutter/tests/interactive/test-cogl-shader-glsl.c
@@ -11,6 +11,9 @@ typedef struct
   char *source;
 } ShaderSource;
 
+int
+test_cogl_shader_glsl_main (int argc, char *argv[]);
+
 /* a couple of boilerplate defines that are common amongst all the
  * sample shaders
  */
diff --git a/clutter/tests/interactive/test-cogl-tex-convert.c b/clutter/tests/interactive/test-cogl-tex-convert.c
index 661ed1544..819c02d20 100644
--- a/clutter/tests/interactive/test-cogl-tex-convert.c
+++ b/clutter/tests/interactive/test-cogl-tex-convert.c
@@ -56,6 +56,12 @@ struct _TestCoglboxClass
 
 static GType test_coglbox_get_type (void) G_GNUC_CONST;
 
+int
+test_cogl_tex_convert_main (int argc, char *argv[]);
+
+const char *
+test_cogl_tex_convert_describe (void);
+
 G_END_DECLS
 
 /* Coglbox private declaration
diff --git a/clutter/tests/interactive/test-cogl-tex-foreign.c b/clutter/tests/interactive/test-cogl-tex-foreign.c
index 247c74968..aad90ac29 100644
--- a/clutter/tests/interactive/test-cogl-tex-foreign.c
+++ b/clutter/tests/interactive/test-cogl-tex-foreign.c
@@ -60,6 +60,9 @@ typedef struct _TestCoglbox        TestCoglbox;
 typedef struct _TestCoglboxClass   TestCoglboxClass;
 typedef struct _TestCoglboxPrivate TestCoglboxPrivate;
 
+const char *
+test_cogl_tex_foreign_describe (void);
+
 struct _TestCoglbox
 {
   ClutterActor           parent;
@@ -116,6 +119,9 @@ G_DEFINE_TYPE_WITH_PRIVATE (TestCoglbox, test_coglbox, CLUTTER_TYPE_ACTOR);
 #define TEST_COGLBOX_GET_PRIVATE(obj) \
 (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TEST_TYPE_COGLBOX, TestCoglboxPrivate))
 
+int
+test_cogl_tex_foreign_main (int argc, char *argv[]);
+
 /* Coglbox implementation
  *--------------------------------------------------*/
 
diff --git a/clutter/tests/interactive/test-cogl-tex-polygon.c b/clutter/tests/interactive/test-cogl-tex-polygon.c
index 44f13c731..79bb89f53 100644
--- a/clutter/tests/interactive/test-cogl-tex-polygon.c
+++ b/clutter/tests/interactive/test-cogl-tex-polygon.c
@@ -56,6 +56,12 @@ struct _TestCoglboxClass
 
 static GType test_coglbox_get_type (void) G_GNUC_CONST;
 
+int
+test_cogl_tex_polygon_main (int argc, char *argv[]);
+
+const char *
+test_cogl_tex_polygon_describe (void);
+
 G_END_DECLS
 
 /* Coglbox private declaration
diff --git a/clutter/tests/interactive/test-cogl-tex-tile.c b/clutter/tests/interactive/test-cogl-tex-tile.c
index bb9b2f591..e9e33339f 100644
--- a/clutter/tests/interactive/test-cogl-tex-tile.c
+++ b/clutter/tests/interactive/test-cogl-tex-tile.c
@@ -57,6 +57,12 @@ struct _TestCoglboxClass
 
 static GType test_coglbox_get_type (void) G_GNUC_CONST;
 
+int
+test_cogl_tex_tile_main (int argc, char *argv[]);
+
+const char *
+test_cogl_tex_tile_describe (void);
+
 G_END_DECLS
 
 /* Coglbox private declaration
diff --git a/clutter/tests/interactive/test-cogl-vertex-buffer.c b/clutter/tests/interactive/test-cogl-vertex-buffer.c
index e31dcd14c..9683e07f3 100644
--- a/clutter/tests/interactive/test-cogl-vertex-buffer.c
+++ b/clutter/tests/interactive/test-cogl-vertex-buffer.c
@@ -53,6 +53,12 @@ typedef struct _TestState
   guint            frame_id;
 } TestState;
 
+int
+test_cogl_vertex_buffer_main (int argc, char *argv[]);
+
+const char *
+test_cogl_vertex_buffer_describe (void);
+
 static void
 frame_cb (ClutterTimeline *timeline,
           gint             elapsed_msecs,
diff --git a/clutter/tests/interactive/test-content.c b/clutter/tests/interactive/test-content.c
index ecf731d34..94d33bfed 100644
--- a/clutter/tests/interactive/test-content.c
+++ b/clutter/tests/interactive/test-content.c
@@ -19,6 +19,14 @@ typedef struct _ColorContentClass {
 
 static void clutter_content_iface_init (ClutterContentIface *iface);
 
+GType color_content_get_type (void);
+
+int
+test_content_main (int argc, char *argv[]);
+
+const char *
+test_content_describe (void);
+
 G_DEFINE_TYPE_WITH_CODE (ColorContent, color_content, G_TYPE_OBJECT,
                          G_IMPLEMENT_INTERFACE (CLUTTER_TYPE_CONTENT,
                                                 clutter_content_iface_init))
diff --git a/clutter/tests/interactive/test-devices.c b/clutter/tests/interactive/test-devices.c
index f0dd9fa55..c9644eb25 100644
--- a/clutter/tests/interactive/test-devices.c
+++ b/clutter/tests/interactive/test-devices.c
@@ -12,6 +12,9 @@ typedef struct {
   GHashTable *devices;
 } TestDevicesApp;
 
+int
+test_devices_main (int argc, char **argv);
+
 static const gchar *
 device_type_name (ClutterInputDevice *device)
 {
diff --git a/clutter/tests/interactive/test-easing.c b/clutter/tests/interactive/test-easing.c
index feab40ef2..3a66b36f9 100644
--- a/clutter/tests/interactive/test-easing.c
+++ b/clutter/tests/interactive/test-easing.c
@@ -55,6 +55,12 @@ static ClutterActor *easing_mode_label = NULL;
 
 static ClutterAnimation *last_animation = NULL;
 
+int
+test_easing_main (int argc, char *argv[]);
+
+const char *
+test_easing_describe (void);
+
 /* recenter_bouncer:
  *
  * repositions (through an animation) the bouncer at the center of the stage
diff --git a/clutter/tests/interactive/test-events.c b/clutter/tests/interactive/test-events.c
index a41dd8fce..47a4e87f3 100644
--- a/clutter/tests/interactive/test-events.c
+++ b/clutter/tests/interactive/test-events.c
@@ -4,6 +4,12 @@
 
 gboolean IsFullScreen = FALSE, IsMotion = TRUE;
 
+int
+test_events_main (int argc, char *argv[]);
+
+const char *
+test_events_describe (void);
+
 static const gchar *
 get_event_type_name (const ClutterEvent *event)
 {
diff --git a/clutter/tests/interactive/test-fbo.c b/clutter/tests/interactive/test-fbo.c
index c659fe146..9ba22c79b 100644
--- a/clutter/tests/interactive/test-fbo.c
+++ b/clutter/tests/interactive/test-fbo.c
@@ -8,7 +8,13 @@
 #define STAGE_WIDTH   800
 #define STAGE_HEIGHT  600
 
-ClutterActor *
+int
+test_fbo_main (int argc, char *argv[]);
+
+const char *
+test_fbo_describe (void);
+
+static ClutterActor *
 make_source (void)
 {
   ClutterActor *source, *actor;
diff --git a/clutter/tests/interactive/test-grab.c b/clutter/tests/interactive/test-grab.c
index 8d9116b5f..959779653 100644
--- a/clutter/tests/interactive/test-grab.c
+++ b/clutter/tests/interactive/test-grab.c
@@ -1,6 +1,12 @@
 #include <gmodule.h>
 #include <clutter/clutter.h>
 
+int
+test_grab_main (int argc, char *argv[]);
+
+const char *
+test_grab_describe (void);
+
 static void
 stage_state_cb (ClutterStage    *stage,
 		gpointer         data)
diff --git a/clutter/tests/interactive/test-image.c b/clutter/tests/interactive/test-image.c
index e77108cb1..126f3e6de 100644
--- a/clutter/tests/interactive/test-image.c
+++ b/clutter/tests/interactive/test-image.c
@@ -20,6 +20,14 @@ typedef struct _SolidContentClass {
 
 static void clutter_content_iface_init (ClutterContentIface *iface);
 
+GType solid_content_get_type (void);
+
+const char *
+test_image_describe (void);
+
+int
+test_image_main (int argc, char *argv[]);
+
 G_DEFINE_TYPE_WITH_CODE (SolidContent, solid_content, G_TYPE_OBJECT,
                          G_IMPLEMENT_INTERFACE (CLUTTER_TYPE_CONTENT,
                                                 clutter_content_iface_init))
diff --git a/clutter/tests/interactive/test-keyframe-transition.c b/clutter/tests/interactive/test-keyframe-transition.c
index 747a03934..ec5d0c5b5 100644
--- a/clutter/tests/interactive/test-keyframe-transition.c
+++ b/clutter/tests/interactive/test-keyframe-transition.c
@@ -11,6 +11,12 @@ static const ClutterColor colors[] = {
 #define PADDING         (64.0f)
 #define SIZE            (64.0f)
 
+const char *
+test_keyframe_transition_describe (void);
+
+int
+test_keyframe_transition_main (int argc, char *argv[]);
+
 static void
 on_transition_stopped (ClutterActor *actor,
                        const gchar  *transition_name,
diff --git a/clutter/tests/interactive/test-layout.c b/clutter/tests/interactive/test-layout.c
index fbc405c40..7a5b3cf2e 100644
--- a/clutter/tests/interactive/test-layout.c
+++ b/clutter/tests/interactive/test-layout.c
@@ -48,6 +48,14 @@ struct _MyThingPrivate
   guint   use_transformed_box : 1;
 };
 
+GType my_thing_get_type (void);
+
+int
+test_layout_main (int argc, char *argv[]);
+
+const char *
+test_layout_describe (void);
+
 G_DEFINE_TYPE_WITH_PRIVATE (MyThing, my_thing, CLUTTER_TYPE_ACTOR)
 
 #define MY_THING_GET_PRIVATE(obj)    \
@@ -417,7 +425,7 @@ my_thing_init (MyThing *thing)
   thing->priv = MY_THING_GET_PRIVATE (thing);
 }
 
-ClutterActor *
+static ClutterActor *
 my_thing_new (gfloat padding,
               gfloat spacing)
 {
diff --git a/clutter/tests/interactive/test-multistage.c b/clutter/tests/interactive/test-multistage.c
index 4a55f69d1..b870c9e25 100644
--- a/clutter/tests/interactive/test-multistage.c
+++ b/clutter/tests/interactive/test-multistage.c
@@ -4,6 +4,9 @@
 static GList *stages = NULL;
 static gint n_stages = 1;
 
+int
+test_multistage_main (int argc, char *argv[]);
+
 static gboolean
 tex_button_cb (ClutterActor    *actor,
                ClutterEvent    *event,
diff --git a/clutter/tests/interactive/test-paint-wrapper.c b/clutter/tests/interactive/test-paint-wrapper.c
index 103f9d01f..8f905cd8b 100644
--- a/clutter/tests/interactive/test-paint-wrapper.c
+++ b/clutter/tests/interactive/test-paint-wrapper.c
@@ -56,6 +56,12 @@ static GOptionEntry super_oh_entries[] = {
   { NULL }
 };
 
+int
+test_paint_wrapper_main (int argc, char *argv[]);
+
+const char *
+test_paint_wrapper_describe (void);
+
 static gboolean
 on_button_press_event (ClutterActor *actor,
                        ClutterEvent *event,
diff --git a/clutter/tests/interactive/test-path-constraint.c b/clutter/tests/interactive/test-path-constraint.c
index bded798f7..f802ed481 100644
--- a/clutter/tests/interactive/test-path-constraint.c
+++ b/clutter/tests/interactive/test-path-constraint.c
@@ -11,6 +11,10 @@
 
 static gboolean toggled = FALSE;
 
+int
+test_path_constraint_main (int   argc,
+                           char *argv[]);
+
 static gboolean
 on_button_press (ClutterActor *actor,
                  const ClutterEvent *event,
diff --git a/clutter/tests/interactive/test-pixmap.c b/clutter/tests/interactive/test-pixmap.c
index 759345721..9a0661859 100644
--- a/clutter/tests/interactive/test-pixmap.c
+++ b/clutter/tests/interactive/test-pixmap.c
@@ -23,6 +23,12 @@
 static gboolean disable_x11 = FALSE;
 static gboolean disable_animation = FALSE;
 
+int
+test_pixmap_main (int argc, char **argv);
+
+const char *
+test_pixmap_describe (void);
+
 static GOptionEntry g_options[] =
 {
   { "disable-x11",
@@ -131,7 +137,7 @@ stage_button_press_cb (ClutterActor    *actor,
   return CLUTTER_EVENT_STOP;
 }
 
-Pixmap
+static Pixmap
 create_pixmap (guint *width, guint *height, guint *depth)
 {
   Display *dpy = clutter_x11_get_default_display ();
diff --git a/clutter/tests/interactive/test-rotate-zoom.c b/clutter/tests/interactive/test-rotate-zoom.c
index 2c25d7f7f..64ae6fce2 100644
--- a/clutter/tests/interactive/test-rotate-zoom.c
+++ b/clutter/tests/interactive/test-rotate-zoom.c
@@ -26,6 +26,12 @@
 #define STAGE_WIDTH 800
 #define STAGE_HEIGHT 550
 
+int
+test_rotate_zoom_main (int argc, char *argv[]);
+
+const char *
+test_rotate_zoom_describe (void);
+
 static ClutterActor *
 create_hand (void)
 {
diff --git a/clutter/tests/interactive/test-scale.c b/clutter/tests/interactive/test-scale.c
index a21f6d6d5..f885e9ccd 100644
--- a/clutter/tests/interactive/test-scale.c
+++ b/clutter/tests/interactive/test-scale.c
@@ -18,6 +18,12 @@ static const ClutterGravity gravities[] = {
 static gint gindex = 0;
 static ClutterActor *label;
 
+int
+test_scale_main (int argc, char *argv[]);
+
+const char *
+test_scale_describe (void);
+
 static void
 set_next_gravity (ClutterActor *actor)
 {
diff --git a/clutter/tests/interactive/test-script.c b/clutter/tests/interactive/test-script.c
index e30de3dcf..1b8fa99f4 100644
--- a/clutter/tests/interactive/test-script.c
+++ b/clutter/tests/interactive/test-script.c
@@ -10,6 +10,9 @@
 static ClutterScript *script = NULL;
 static guint merge_id = 0;
 
+int
+test_script_main (int argc, char *argv[]);
+
 static const gchar *test_unmerge =
 "["
 "  {"
diff --git a/clutter/tests/interactive/test-scrolling.c b/clutter/tests/interactive/test-scrolling.c
index 173325fda..d4137bf14 100644
--- a/clutter/tests/interactive/test-scrolling.c
+++ b/clutter/tests/interactive/test-scrolling.c
@@ -20,6 +20,9 @@ static const gchar *rect_color[N_RECTS] = {
 static ClutterActor *rectangle[N_RECTS]; 
 static ClutterActor *viewport = NULL;
 
+int
+test_scrolling_main (int argc, char *argv[]);
+
 static void
 on_drag_end (ClutterDragAction   *action,
              ClutterActor        *actor,
diff --git a/clutter/tests/interactive/test-shader-effects.c b/clutter/tests/interactive/test-shader-effects.c
index d185252d6..a64a0ba29 100644
--- a/clutter/tests/interactive/test-shader-effects.c
+++ b/clutter/tests/interactive/test-shader-effects.c
@@ -7,6 +7,9 @@
 
 #include <clutter/clutter.h>
 
+int
+test_shader_effects_main (int argc, char *argv[]);
+
 G_MODULE_EXPORT int
 test_shader_effects_main (int argc, char *argv[])
 {
diff --git a/clutter/tests/interactive/test-stage-read-pixels.c b/clutter/tests/interactive/test-stage-read-pixels.c
index 535fc8d65..184e6359b 100644
--- a/clutter/tests/interactive/test-stage-read-pixels.c
+++ b/clutter/tests/interactive/test-stage-read-pixels.c
@@ -16,6 +16,12 @@ struct _CallbackData
   guint idle_source;
 };
 
+int
+test_stage_read_pixels_main (int argc, char **argv);
+
+const char *
+test_stage_read_pixels_describe (void);
+
 static ClutterActor *
 make_label (void)
 {
diff --git a/clutter/tests/interactive/test-stage-sizing.c b/clutter/tests/interactive/test-stage-sizing.c
index 45223011b..6c2cce9ef 100644
--- a/clutter/tests/interactive/test-stage-sizing.c
+++ b/clutter/tests/interactive/test-stage-sizing.c
@@ -2,6 +2,12 @@
 #include <gmodule.h>
 #include <clutter/clutter.h>
 
+int
+test_stage_sizing_main (int argc, char *argv[]);
+
+const char *
+test_stage_sizing_describe (void);
+
 static gboolean
 fullscreen_clicked_cb (ClutterStage *stage)
 {
diff --git a/clutter/tests/interactive/test-state-animator.c b/clutter/tests/interactive/test-state-animator.c
index 42ae7d253..9a76f565d 100644
--- a/clutter/tests/interactive/test-state-animator.c
+++ b/clutter/tests/interactive/test-state-animator.c
@@ -6,6 +6,13 @@
 static ClutterState    *state;
 static ClutterAnimator *animator;
 
+gint
+test_state_animator_main (gint    argc,
+                          gchar **argv);
+
+const char *
+test_state_animator_describe (void);
+
 static gboolean press_event (ClutterActor *actor,
                              ClutterEvent *event,
                              gpointer      user_data)
diff --git a/clutter/tests/interactive/test-state-script.c b/clutter/tests/interactive/test-state-script.c
index 34b1b8789..8b5502d68 100644
--- a/clutter/tests/interactive/test-state-script.c
+++ b/clutter/tests/interactive/test-state-script.c
@@ -6,6 +6,9 @@
 
 #define TEST_STATE_SCRIPT_FILE  "test-script-signals.json"
 
+int
+test_state_script_main (int argc, char *argv[]);
+
 gboolean
 on_button_press (ClutterActor *actor,
                  ClutterEvent *event,
diff --git a/clutter/tests/interactive/test-state.c b/clutter/tests/interactive/test-state.c
index 063417386..b6894eac5 100644
--- a/clutter/tests/interactive/test-state.c
+++ b/clutter/tests/interactive/test-state.c
@@ -13,6 +13,12 @@
 #define ROWS  (STAGE_HEIGHT/ACTOR_HEIGHT)
 #define TOTAL (ROWS*COLS)
 
+gint
+test_state_main (gint    argc,
+                 gchar **argv);
+
+const char *
+test_state_describe (void);
 
 static gboolean press_event (ClutterActor *actor,
                              ClutterEvent *event,
diff --git a/clutter/tests/interactive/test-swipe-action.c b/clutter/tests/interactive/test-swipe-action.c
index 75b2e75d5..a33d9e41f 100644
--- a/clutter/tests/interactive/test-swipe-action.c
+++ b/clutter/tests/interactive/test-swipe-action.c
@@ -7,6 +7,12 @@ enum {
   BOTH          = 2
 };
 
+int
+test_swipe_action_main (int argc, char *argv[]);
+
+const char *
+test_swipe_action_describe (void);
+
 static void
 swept_cb (ClutterSwipeAction    *action,
           ClutterActor          *actor,
diff --git a/clutter/tests/interactive/test-table-layout.c b/clutter/tests/interactive/test-table-layout.c
index 0e2d5642f..b791a97d6 100644
--- a/clutter/tests/interactive/test-table-layout.c
+++ b/clutter/tests/interactive/test-table-layout.c
@@ -9,6 +9,12 @@
 
 #define FONT "Sans 12"
 
+int
+test_table_layout_main (int argc, char *argv[]);
+
+const char *
+test_table_layout_describe (void);
+
 static void
 set_text (ClutterActor *actor, const gchar *text)
 {
diff --git a/clutter/tests/interactive/test-text-field.c b/clutter/tests/interactive/test-text-field.c
index 18cdfcb71..8d203a22a 100644
--- a/clutter/tests/interactive/test-text-field.c
+++ b/clutter/tests/interactive/test-text-field.c
@@ -2,6 +2,13 @@
 #include <gmodule.h>
 #include <clutter/clutter.h>
 
+gint
+test_text_field_main (gint    argc,
+                      gchar **argv);
+
+const char *
+test_text_field_describe (void);
+
 static void
 on_entry_activate (ClutterText *text,
                    gpointer     data)
diff --git a/clutter/tests/interactive/test-text.c b/clutter/tests/interactive/test-text.c
index 37e45a798..bbe2a1b4e 100644
--- a/clutter/tests/interactive/test-text.c
+++ b/clutter/tests/interactive/test-text.c
@@ -10,6 +10,13 @@ static const gchar *runes =
 "ᛋᚳᛖᚪᛚ᛫ᚦᛖᚪᚻ᛫ᛗᚪᚾᚾᚪ᛫ᚷᛖᚻᚹᛦᛚᚳ᛫ᛗᛁᚳᛚᚢᚾ᛫ᚻᛦᛏ᛫ᛞᚫᛚᚪᚾ\n"
 "ᚷᛁᚠ᛫ᚻᛖ᛫ᚹᛁᛚᛖ᛫ᚠᚩᚱ᛫ᛞᚱᛁᚻᛏᚾᛖ᛫ᛞᚩᛗᛖᛋ᛫ᚻᛚᛇᛏᚪᚾ᛬\n";
 
+gint
+test_text_main (gint    argc,
+                gchar **argv);
+
+const char *
+test_text_describe (void);
+
 G_MODULE_EXPORT gint
 test_text_main (gint    argc,
                 gchar **argv)
diff --git a/clutter/tests/interactive/test-texture-async.c b/clutter/tests/interactive/test-texture-async.c
index 04377030f..6ea5135d0 100644
--- a/clutter/tests/interactive/test-texture-async.c
+++ b/clutter/tests/interactive/test-texture-async.c
@@ -11,6 +11,12 @@ enum
 
 static ClutterActor *stage = NULL;
 
+const char *
+test_texture_async_describe (void);
+
+gint
+test_texture_async_main (int argc, char *argv[]);
+
 static void
 on_load_finished (ClutterTexture *texture,
                   const GError   *error,
diff --git a/clutter/tests/interactive/test-texture-material.c b/clutter/tests/interactive/test-texture-material.c
index 4886ce03a..90fbcf714 100644
--- a/clutter/tests/interactive/test-texture-material.c
+++ b/clutter/tests/interactive/test-texture-material.c
@@ -3,6 +3,9 @@
 #include <gmodule.h>
 #include <clutter/clutter.h>
 
+int
+test_texture_material_main (int argc, char *argv[]);
+
 G_MODULE_EXPORT int
 test_texture_material_main (int argc, char *argv[])
 {
diff --git a/clutter/tests/interactive/test-texture-quality.c b/clutter/tests/interactive/test-texture-quality.c
index 8cb916af8..91c0f0dc6 100644
--- a/clutter/tests/interactive/test-texture-quality.c
+++ b/clutter/tests/interactive/test-texture-quality.c
@@ -2,6 +2,12 @@
 #include <gmodule.h>
 #include <clutter/clutter.h>
 
+gint
+test_texture_quality_main (int argc, char *argv[]);
+
+const char *
+test_texture_quality_describe (void);
+
 /* each time the timeline animating the label completes, swap the direction */
 static void
 timeline_completed (ClutterTimeline *timeline,
diff --git a/clutter/tests/interactive/test-texture-slicing.c b/clutter/tests/interactive/test-texture-slicing.c
index 94c6b41e0..652fc3239 100644
--- a/clutter/tests/interactive/test-texture-slicing.c
+++ b/clutter/tests/interactive/test-texture-slicing.c
@@ -3,7 +3,13 @@
 
 #include <clutter/clutter.h>
 
-guchar*
+int
+test_textures_main (int argc, char *argv[]);
+
+const char *
+test_texture_slicing_describe (void);
+
+static guchar *
 make_rgba_data (int width, int height, int bpp, int has_alpha, int *rowstride_p)
 {
 #define CHECK_SIZE 20
diff --git a/clutter/tests/interactive/test-touch-events.c b/clutter/tests/interactive/test-touch-events.c
index 45a9012db..55c112540 100644
--- a/clutter/tests/interactive/test-touch-events.c
+++ b/clutter/tests/interactive/test-touch-events.c
@@ -45,6 +45,12 @@ static const ClutterColor static_colors[] = {
 };
 static GHashTable *sequence_to_color = NULL;
 
+int
+test_touch_events_main (int argc, char *argv[]);
+
+const char *
+test_touch_events_describe (void);
+
 static void
 canvas_paint (ClutterCairoTexture *canvas)
 {
diff --git a/clutter/tests/performance/test-common.h b/clutter/tests/performance/test-common.h
index 919fa743d..8c07389aa 100644
--- a/clutter/tests/performance/test-common.h
+++ b/clutter/tests/performance/test-common.h
@@ -7,7 +7,8 @@ static gint testframes = 0;
 static float testmaxtime = 1.0;
 
 /* initialize environment to be suitable for fps testing */
-void clutter_perf_fps_init (void)
+static inline void
+clutter_perf_fps_init (void)
 {
   /* Force not syncing to vblank, we want free-running maximum FPS */
   g_setenv ("vblank_mode", "0", FALSE);
@@ -27,17 +28,20 @@ void clutter_perf_fps_init (void)
 static void perf_stage_paint_cb (ClutterStage *stage, gpointer *data);
 static gboolean perf_fake_mouse_cb (gpointer stage);
 
-void clutter_perf_fps_start (ClutterStage *stage)
+static inline void
+clutter_perf_fps_start (ClutterStage *stage)
 {
   g_signal_connect (stage, "paint", G_CALLBACK (perf_stage_paint_cb), NULL);
 }
 
-void clutter_perf_fake_mouse (ClutterStage *stage)
+static inline void
+clutter_perf_fake_mouse (ClutterStage *stage)
 {
   clutter_threads_add_timeout (1000/60, perf_fake_mouse_cb, stage);
 }
 
-void clutter_perf_fps_report (const gchar *id)
+static inline void
+clutter_perf_fps_report (const gchar *id)
 {
   g_print ("\n@ %s: %.2f fps \n",
        id, testframes / g_timer_elapsed (testtimer, NULL));