diff --git a/clutter/cally/Makefile.am b/clutter/cally/Makefile.am
index 75cec6a2b..2abbe9bdb 100644
--- a/clutter/cally/Makefile.am
+++ b/clutter/cally/Makefile.am
@@ -23,6 +23,7 @@ cally_h_sources = 		cally.h			\
 				cally-actor.h		\
 				cally-factory.h		\
 				cally-group.h    	\
+				cally-main.h		\
 				cally-rectangle.h	\
 				cally-root.h		\
 				cally-stage.h		\
@@ -76,4 +77,4 @@ libcally_HEADERS = \
 	$(cally_h_sources)
 
 libcally_la_LIBADD =     				\
-	$(CLUTTER_LIBS)
\ No newline at end of file
+	$(CLUTTER_LIBS)
diff --git a/clutter/cally/cally-actor-private.h b/clutter/cally/cally-actor-private.h
index b9c0d0b46..e3d6b8dd2 100644
--- a/clutter/cally/cally-actor-private.h
+++ b/clutter/cally/cally-actor-private.h
@@ -1,9 +1,13 @@
 /* CALLY - The Clutter Accessibility Implementation Library
  *
- * Copyright (C) 2009 Igalia, S.L.
+ * Copyright (C) 2008 Igalia, S.L.
  *
  * Author: Alejandro Piñeiro Iglesias <apinheiro@igalia.com>
  *
+ * Some parts are based on GailWidget from GAIL
+ * GAIL - The GNOME Accessibility Implementation Library
+ * Copyright 2001, 2002, 2003 Sun Microsystems Inc.
+ *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
@@ -15,10 +19,9 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
+
 #ifndef __CALLY_ACTOR_PRIVATE_H__
 #define __CALLY_ACTOR_PRIVATE_H__
 
diff --git a/clutter/cally/cally-actor.c b/clutter/cally/cally-actor.c
index 55dad3c69..379c9b995 100644
--- a/clutter/cally/cally-actor.c
+++ b/clutter/cally/cally-actor.c
@@ -4,7 +4,7 @@
  *
  * Author: Alejandro Piñeiro Iglesias <apinheiro@igalia.com>
  *
- * Some parts are based on GailWidget, GailContaineer, GailCell from GAIL
+ * Some parts are based on GailWidget from GAIL
  * GAIL - The GNOME Accessibility Implementation Library
  * Copyright 2001, 2002, 2003 Sun Microsystems Inc.
  *
@@ -19,13 +19,12 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  * SECTION:cally-actor
+ * @Title: CallyActor
  * @short_description: Implementation of the ATK interfaces for #ClutterActor
  * @see_also: #ClutterActor
  *
@@ -33,7 +32,7 @@
  * exposing the common elements on each ClutterActor (position, extents, etc).
  */
 
-/**
+/*
  *
  * IMPLEMENTATION NOTES:
  *
@@ -98,7 +97,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif
 
 #include <clutter/clutter.h>
 
diff --git a/clutter/cally/cally-actor.h b/clutter/cally/cally-actor.h
index 707845903..2aaef49c5 100644
--- a/clutter/cally/cally-actor.h
+++ b/clutter/cally/cally-actor.h
@@ -19,16 +19,18 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#if !defined(__CALLY_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#error "Only <cally/cally.h> can be included directly."
+#endif
+
 #ifndef __CALLY_ACTOR_H__
 #define __CALLY_ACTOR_H__
 
 #include <atk/atk.h>
-#include <clutter/clutter.h>
+#include <clutter/clutter-actor.h>
 
 G_BEGIN_DECLS
 
@@ -47,23 +49,47 @@ typedef struct _CallyActorPrivate    CallyActorPrivate;
  * CallyActionFunc:
  * @cally_actor: a #CallyActor
  *
- * Action func, to be used on AtkAction implementation as a individual
+ * Action function, to be used on #AtkAction implementations as a individual
  * action
+ *
+ * Since: 1.4
  */
-typedef void (*CallyActionFunc) (CallyActor *cally_actor);
+typedef void (* CallyActionFunc) (CallyActor *cally_actor);
 
+/**
+ * CallyActor:
+ *
+ * The <structname>CallyActor</structname> structure contains only private
+ * data and should be accessed using the provided API
+ *
+ * Since: 1.4
+ */
 struct _CallyActor
 {
+  /*< private >*/
   AtkGObjectAccessible parent;
 
-  /* < private > */
   CallyActorPrivate *priv;
 };
 
+/**
+ * CallyActorClass:
+ * @notify_clutter: FIXME
+ * @focus_clutter: FIXME
+ * @add_actor: FIXME
+ * @remove_actor: FIXME
+ *
+ * The <structname>CallyActorClass</structname> structure contains only
+ * private data
+ *
+ * Since: 1.4
+ */
 struct _CallyActorClass
 {
+  /*< private >*/
   AtkGObjectAccessibleClass parent_class;
 
+  /*< public >*/
   /* Signal handler for notify signal on Clutter Actor */
   void     (*notify_clutter) (GObject    *object,
                               GParamSpec *pspec);
@@ -82,12 +108,13 @@ struct _CallyActorClass
                               ClutterActor *actor,
                               gpointer      data);
 
+  /*< private >*/
   /* padding for future expansion */
-  gpointer _padding_dummy[30];
+  gpointer _padding_dummy[32];
 };
 
 
-GType      cally_actor_get_type              (void);
+GType      cally_actor_get_type              (void) G_GNUC_CONST;
 
 AtkObject* cally_actor_new                   (ClutterActor *actor);
 guint      cally_actor_add_action            (CallyActor   *cally_actor,
diff --git a/clutter/cally/cally-clone.h b/clutter/cally/cally-clone.h
index 7b63dbeae..aeda63d23 100644
--- a/clutter/cally/cally-clone.h
+++ b/clutter/cally/cally-clone.h
@@ -15,15 +15,18 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#if !defined(__CALLY_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#error "Only <cally/cally.h> can be included directly."
+#endif
+
 #ifndef __CALLY_CLONE_H__
 #define __CALLY_CLONE_H__
 
-#include "cally-actor.h"
+#include <cally/cally-actor.h>
+#include <clutter/clutter-clone.h>
 
 G_BEGIN_DECLS
 
@@ -34,28 +37,44 @@ G_BEGIN_DECLS
 #define CALLY_IS_CLONE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CALLY_TYPE_CLONE))
 #define CALLY_CLONE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), CALLY_TYPE_CLONE, CallyCloneClass))
 
-
 typedef struct _CallyClone        CallyClone;
 typedef struct _CallyCloneClass   CallyCloneClass;
 typedef struct _CallyClonePrivate CallyClonePrivate;
 
+/**
+ * CallyClone:
+ *
+ * The <structname>CallyClone</structname> structure contains only private
+ * data and should be accessed using the provided API
+ *
+ * Since: 1.4
+ */
 struct _CallyClone
 {
+  /*< private >*/
   CallyActor parent;
 
-  /* < private > */
   CallyClonePrivate *priv;
 };
 
+/**
+ * CallyCloneClass:
+ *
+ * The <structname>CallyCloneClass</structname> structure contains only
+ * private data
+ *
+ * Since: 1.4
+ */
 struct _CallyCloneClass
 {
+  /*< private >*/
   CallyActorClass parent_class;
 
   /* padding for future expansion */
-  gpointer _padding_dummy[30];
+  gpointer _padding_dummy[8];
 };
 
-GType      cally_clone_get_type (void);
+GType      cally_clone_get_type (void) G_GNUC_CONST;
 AtkObject *cally_clone_new      (ClutterActor *actor);
 
 G_END_DECLS
diff --git a/clutter/cally/cally-group.h b/clutter/cally/cally-group.h
index 86920030d..9813ef3cb 100644
--- a/clutter/cally/cally-group.h
+++ b/clutter/cally/cally-group.h
@@ -18,15 +18,18 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#if !defined(__CALLY_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#error "Only <cally/cally.h> can be included directly."
+#endif
+
 #ifndef __CALLY_GROUP_H__
 #define __CALLY_GROUP_H__
 
-#include "cally-actor.h"
+#include <cally/cally-actor.h>
+#include <clutter/clutter-group.h>
 
 G_BEGIN_DECLS
 
@@ -41,23 +44,40 @@ typedef struct _CallyGroup        CallyGroup;
 typedef struct _CallyGroupClass   CallyGroupClass;
 typedef struct _CallyGroupPrivate CallyGroupPrivate;
 
+/**
+ * CallyGroup:
+ *
+ * The <structname>CallyGroup</structname> structure contains only
+ * private data and should be accessed using the provided API
+ *
+ * Since: 1.4
+ */
 struct _CallyGroup
 {
+  /*< private >*/
   CallyActor parent;
 
-  /* < private > */
   CallyGroupPrivate *priv;
 };
 
+/**
+ * CallyGroupClass:
+ *
+ * The <structname>CallyGroupClass</structname> structure contains only
+ * private data
+ *
+ * Since: 1.4
+ */
 struct _CallyGroupClass
 {
+  /*< private >*/
   CallyActorClass parent_class;
 
   /* padding for future expansion */
-  gpointer _padding_dummy[30];
+  gpointer _padding_dummy[8];
 };
 
-GType      cally_group_get_type (void);
+GType      cally_group_get_type (void) G_GNUC_CONST;
 AtkObject* cally_group_new      (ClutterActor *actor);
 
 G_END_DECLS
diff --git a/clutter/cally/cally-main.h b/clutter/cally/cally-main.h
new file mode 100644
index 000000000..00e613601
--- /dev/null
+++ b/clutter/cally/cally-main.h
@@ -0,0 +1,39 @@
+/* CALLY - The Clutter Accessibility Implementation Library
+ *
+ * Copyright (C) 2008 Igalia, S.L.
+ *
+ * Author: Alejandro Piñeiro Iglesias <apinheiro@igalia.com>
+ *
+ * Some parts are based on GailWidget from GAIL
+ * GAIL - The GNOME Accessibility Implementation Library
+ * Copyright 2001, 2002, 2003 Sun Microsystems Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#if !defined(__CALLY_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#error "Only <cally/cally.h> can be included directly."
+#endif
+
+#ifndef __CALLY_MAIN_H__
+#define __CALLY_MAIN_H__
+
+G_BEGIN_DECLS
+
+gboolean cally_get_cally_initialized (void);
+gboolean cally_accessibility_init    (void);
+
+G_END_DECLS
+
+#endif /* __CALLY_MAIN_H__ */
diff --git a/clutter/cally/cally-rectangle.h b/clutter/cally/cally-rectangle.h
index b2230c311..23587fb0e 100644
--- a/clutter/cally/cally-rectangle.h
+++ b/clutter/cally/cally-rectangle.h
@@ -15,15 +15,18 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#if !defined(__CALLY_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#error "Only <cally/cally.h> can be included directly."
+#endif
+
 #ifndef __CALLY_RECTANGLE_H__
 #define __CALLY_RECTANGLE_H__
 
-#include "cally-actor.h"
+#include <cally/cally-actor.h>
+#include <clutter/clutter-rectangle.h>
 
 G_BEGIN_DECLS
 
@@ -34,28 +37,44 @@ G_BEGIN_DECLS
 #define CALLY_IS_RECTANGLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CALLY_TYPE_RECTANGLE))
 #define CALLY_RECTANGLE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), CALLY_TYPE_RECTANGLE, CallyRectangleClass))
 
-
 typedef struct _CallyRectangle         CallyRectangle;
 typedef struct _CallyRectangleClass    CallyRectangleClass;
 typedef struct _CallyRectanglePrivate  CallyRectanglePrivate;
 
+/**
+ * CallyRectangle:
+ *
+ * The <structname>CallyRectangle</structname> structure contains only private
+ * data and should be accessed using the provided API
+ *
+ * Since: 1.4
+ */
 struct _CallyRectangle
 {
+  /*< private >*/
   CallyActor parent;
 
-  /* < private > */
   CallyRectanglePrivate *priv;
 };
 
+/**
+ * CallyRectangleClass:
+ *
+ * The <structname>CallyRectangleClass</structname> structure contains
+ * only private data
+ *
+ * Since: 1.4
+ */
 struct _CallyRectangleClass
 {
+  /*< private >*/
   CallyActorClass parent_class;
 
   /* padding for future expansion */
-  gpointer _padding_dummy[30];
+  gpointer _padding_dummy[8];
 };
 
-GType      cally_rectangle_get_type (void);
+GType      cally_rectangle_get_type (void) G_GNUC_CONST;
 AtkObject* cally_rectangle_new      (ClutterActor *actor);
 
 G_END_DECLS
diff --git a/clutter/cally/cally-root.h b/clutter/cally/cally-root.h
index 540a74282..fd3dcbfd0 100644
--- a/clutter/cally/cally-root.h
+++ b/clutter/cally/cally-root.h
@@ -15,11 +15,13 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#if !defined(__CALLY_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#error "Only <cally/cally.h> can be included directly."
+#endif
+
 #ifndef __CALLY_ROOT_H__
 #define __CALLY_ROOT_H__
 
@@ -38,27 +40,43 @@ typedef struct _CallyRoot        CallyRoot;
 typedef struct _CallyRootClass   CallyRootClass;
 typedef struct _CallyRootPrivate CallyRootPrivate;
 
+/**
+ * CallyRoot:
+ *
+ * The <structname>CallyRoot</structname> structure contains only private
+ * data and should be accessed using the provided API
+ *
+ * Since: 1.4
+ */
 struct _CallyRoot
 {
+  /*< private >*/
   AtkGObjectAccessible parent;
 
-  /* < private > */
   CallyRootPrivate *priv;
 };
 
+/**
+ * CallyRootClass:
+ *
+ * The <structname>CallyRootClass</structname> structure contains only
+ * private data
+ *
+ * Since: 1.4
+ */
 struct _CallyRootClass
 {
+  /*< private >*/
   AtkGObjectAccessibleClass parent_class;
 
   /* padding for future expansion */
-  gpointer _padding_dummy[30];
+  gpointer _padding_dummy[16];
 };
 
 
-GType      cally_root_get_type (void);
+GType      cally_root_get_type (void) G_GNUC_CONST;
 AtkObject *cally_root_new      (void);
 
-
 G_END_DECLS
 
 #endif /* __CALLY_ROOT_H__ */
diff --git a/clutter/cally/cally-stage.h b/clutter/cally/cally-stage.h
index e95c08eed..836c6a1aa 100644
--- a/clutter/cally/cally-stage.h
+++ b/clutter/cally/cally-stage.h
@@ -15,15 +15,18 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#if !defined(__CALLY_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#error "Only <cally/cally.h> can be included directly."
+#endif
+
 #ifndef __CALLY_STAGE_H__
 #define __CALLY_STAGE_H__
 
-#include "cally-group.h"
+#include <cally/cally-group.h>
+#include <clutter/clutter-stage.h>
 
 G_BEGIN_DECLS
 
@@ -38,23 +41,40 @@ typedef struct _CallyStage        CallyStage;
 typedef struct _CallyStageClass   CallyStageClass;
 typedef struct _CallyStagePrivate CallyStagePrivate;
 
+/**
+ * CallyStage:
+ *
+ * The <structname>CallyStage</structname> structure contains only
+ * private data and should be accessed using the provided API
+ *
+ * Since: 1.4
+ */
 struct _CallyStage
 {
+  /*< private >*/
   CallyGroup parent;
 
-  /* < private > */
   CallyStagePrivate *priv;
 };
 
+/**
+ * CallyStageClass:
+ *
+ * The <structname>CallyStageClass</structname> structure contains only
+ * private data
+ *
+ * Since: 1.4
+ */
 struct _CallyStageClass
 {
+  /*< private >*/
   CallyGroupClass parent_class;
 
   /* padding for future expansion */
-  gpointer _padding_dummy[30];
+  gpointer _padding_dummy[16];
 };
 
-GType      cally_stage_get_type (void);
+GType      cally_stage_get_type (void) G_GNUC_CONST;
 AtkObject *cally_stage_new      (ClutterActor *actor);
 
 G_END_DECLS
diff --git a/clutter/cally/cally-text.c b/clutter/cally/cally-text.c
index bd55d299c..3ca103c31 100644
--- a/clutter/cally/cally-text.c
+++ b/clutter/cally/cally-text.c
@@ -64,9 +64,15 @@
  *     See details on bug CB#1734
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "cally-text.h"
 #include "cally-actor-private.h"
 
+#include "clutter-main.h"
+
 static void cally_text_class_init (CallyTextClass *klass);
 static void cally_text_init       (CallyText *cally_text);
 static void cally_text_finalize   (GObject *obj);
diff --git a/clutter/cally/cally-text.h b/clutter/cally/cally-text.h
index 54e15d155..d465dafe5 100644
--- a/clutter/cally/cally-text.h
+++ b/clutter/cally/cally-text.h
@@ -15,47 +15,66 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#if !defined(__CALLY_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#error "Only <cally/cally.h> can be included directly."
+#endif
+
 #ifndef __CALLY_TEXT_H__
 #define __CALLY_TEXT_H__
 
-#include "cally-actor.h"
+#include <cally/cally-actor.h>
+#include <clutter/clutter-text.h>
 
 G_BEGIN_DECLS
 
-#define CALLY_TYPE_TEXT           (cally_text_get_type ())
-#define CALLY_TEXT(obj)           (G_TYPE_CHECK_INSTANCE_CAST ((obj), CALLY_TYPE_TEXT, CallyText))
-#define CALLY_TEXT_CLASS(klass)   (G_TYPE_CHECK_CLASS_CAST ((klass), CALLY_TYPE_TEXT, CallyTextClass))
-#define CALLY_IS_TEXT(obj)        (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CALLY_TYPE_TEXT))
-#define CALLY_IS_TEXT_CLASS(klass)(G_TYPE_CHECK_CLASS_TYPE ((klass), CALLY_TYPE_TEXT))
-#define CALLY_TEXT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), CALLY_TYPE_TEXT, CallyTextClass))
+#define CALLY_TYPE_TEXT                 (cally_text_get_type ())
+#define CALLY_TEXT(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), CALLY_TYPE_TEXT, CallyText))
+#define CALLY_TEXT_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass), CALLY_TYPE_TEXT, CallyTextClass))
+#define CALLY_IS_TEXT(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CALLY_TYPE_TEXT))
+#define CALLY_IS_TEXT_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((klass), CALLY_TYPE_TEXT))
+#define CALLY_TEXT_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), CALLY_TYPE_TEXT, CallyTextClass))
 
+typedef struct _CallyText               CallyText;
+typedef struct _CallyTextClass          CallyTextClass;
+typedef struct _CallyTextPrivate        CallyTextPrivate;
 
-typedef struct _CallyText         CallyText;
-typedef struct _CallyTextClass    CallyTextClass;
-typedef struct _CallyTextPrivate  CallyTextPrivate;
-
+/**
+ * CallyText:
+ *
+ * The <structname>CallyText</structname> structure contains only private
+ * data and should be accessed using the provided API
+ *
+ * Since: 1.4
+ */
 struct _CallyText
 {
+  /*< private >*/
   CallyActor parent;
 
-  /* < private > */
   CallyTextPrivate *priv;
 };
 
+/**
+ * CallyTextClass:
+ *
+ * The <structname>CallyTextClass</structname> structure contains only
+ * private data
+ *
+ * Since: 1.4
+ */
 struct _CallyTextClass
 {
+  /*< private >*/
   CallyActorClass parent_class;
 
   /* padding for future expansion */
-  gpointer _padding_dummy[30];
+  gpointer _padding_dummy[8];
 };
 
-GType      cally_text_get_type (void);
+GType      cally_text_get_type (void) G_GNUC_CONST;
 AtkObject* cally_text_new      (ClutterActor *actor);
 
 G_END_DECLS
diff --git a/clutter/cally/cally-texture.h b/clutter/cally/cally-texture.h
index 6603ee2d1..70f1e8a54 100644
--- a/clutter/cally/cally-texture.h
+++ b/clutter/cally/cally-texture.h
@@ -15,15 +15,18 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#if !defined(__CALLY_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#error "Only <cally/cally.h> can be included directly."
+#endif
+
 #ifndef __CALLY_TEXTURE_H__
 #define __CALLY_TEXTURE_H__
 
-#include "cally-actor.h"
+#include <cally/cally-actor.h>
+#include <clutter/clutter-texture.h>
 
 G_BEGIN_DECLS
 
@@ -34,28 +37,44 @@ G_BEGIN_DECLS
 #define CALLY_IS_TEXTURE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CALLY_TYPE_TEXTURE))
 #define CALLY_TEXTURE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), CALLY_TYPE_TEXTURE, CallyTextureClass))
 
-
 typedef struct _CallyTexture        CallyTexture;
 typedef struct _CallyTextureClass   CallyTextureClass;
 typedef struct _CallyTexturePrivate CallyTexturePrivate;
 
+/**
+ * CallyTexture:
+ *
+ * The <structname>CallyTexture</structname> structure contains only
+ * private data and should be accessed using the provided API
+ *
+ * Since: 1.4
+ */
 struct _CallyTexture
 {
+  /*< private >*/
   CallyActor parent;
 
-  /* < private > */
   CallyTexturePrivate *priv;
 };
 
+/**
+ * CallyTextureClass:
+ *
+ * The <structname>CallyTextureClass</structname> structure contains
+ * only private data
+ *
+ * Since: 1.4
+ */
 struct _CallyTextureClass
 {
+  /*< private >*/
   CallyActorClass parent_class;
 
   /* padding for future expansion */
-  gpointer _padding_dummy[30];
+  gpointer _padding_dummy[8];
 };
 
-GType      cally_texture_get_type (void);
+GType      cally_texture_get_type (void) G_GNUC_CONST;
 AtkObject *cally_texture_new      (ClutterActor *actor);
 
 G_END_DECLS
diff --git a/clutter/cally/cally-util.h b/clutter/cally/cally-util.h
index dfb68390b..23d386ce6 100644
--- a/clutter/cally/cally-util.h
+++ b/clutter/cally/cally-util.h
@@ -15,11 +15,13 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#if !defined(__CALLY_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#error "Only <cally/cally.h> can be included directly."
+#endif
+
 #ifndef __CALLY_UTIL_H__
 #define __CALLY_UTIL_H__
 
@@ -38,23 +40,40 @@ typedef struct _CallyUtil        CallyUtil;
 typedef struct _CallyUtilClass   CallyUtilClass;
 typedef struct _CallyUtilPrivate CallyUtilPrivate;
 
+/**
+ * CallyUtil:
+ *
+ * The <structname>CallyUtil</structname> structure contains only
+ * private data and should be accessed using the provided API
+ *
+ * Since: 1.4
+ */
 struct _CallyUtil
 {
+  /*< private >*/
   AtkUtil parent;
 
-  /* < private > */
   CallyUtilPrivate *priv;
 };
 
+/**
+ * CallyUtilClass:
+ *
+ * The <structname>CallyUtilClass</structname> structure contains only
+ * private data
+ *
+ * Since: 1.4
+ */
 struct _CallyUtilClass
 {
+  /*< private >*/
   AtkUtilClass parent_class;
 
   /* padding for future expansion */
-  gpointer _padding_dummy[30];
+  gpointer _padding_dummy[8];
 };
 
-GType cally_util_get_type (void);
+GType cally_util_get_type (void) G_GNUC_CONST;
 
 G_END_DECLS
 
diff --git a/clutter/cally/cally.c b/clutter/cally/cally.c
index fd95d411c..b2419ca62 100644
--- a/clutter/cally/cally.c
+++ b/clutter/cally/cally.c
@@ -20,6 +20,10 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "cally.h"
 
 #include "cally-actor.h"
@@ -33,7 +37,10 @@
 #include "cally-factory.h"
 #include "cally-util.h"
 
+#include "clutter.h"
+
 #include "clutter-debug.h"
+#include "clutter-private.h"
 
 static int cally_initialized = FALSE;
 
diff --git a/clutter/cally/cally.h b/clutter/cally/cally.h
index 4924dfec8..11fa9fc6c 100644
--- a/clutter/cally/cally.h
+++ b/clutter/cally/cally.h
@@ -15,21 +15,26 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __CALLY_H
-#define __CALLY_H
+#ifndef __CALLY_H__
+#define __CALLY_H__
 
-#include <clutter/clutter.h>
+#define __CALLY_H_INSIDE__
 
-G_BEGIN_DECLS
+#include "cally-actor.h"
+#include "cally-clone.h"
+#include "cally-factory.h"
+#include "cally-group.h"
+#include "cally-main.h"
+#include "cally-rectangle.h"
+#include "cally-root.h"
+#include "cally-stage.h"
+#include "cally-text.h"
+#include "cally-texture.h"
+#include "cally-util.h"
 
-gboolean cally_get_cally_initialized (void);
-gboolean cally_accessibility_init (void);
+#undef __CALLY_H_INSIDE__
 
-G_END_DECLS
-
-#endif /* __CALLY_H */
+#endif /* __CALLY_H__ */
diff --git a/clutter/cally/cally.pc.in b/clutter/cally/cally.pc.in
index baf0dc859..224668f79 100644
--- a/clutter/cally/cally.pc.in
+++ b/clutter/cally/cally.pc.in
@@ -2,12 +2,12 @@ prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
+
 apiversion=@CLUTTER_API_VERSION@
+winsys=@CLUTTER_WINSYS@
+soname_infix=@CLUTTER_SONAME_INFIX@
+cogl_driver=@COGL_DRIVER@
 requires=@CLUTTER_REQUIRES@
-backend=@COGL_WINSYS@ #only kept for backward compatability
-winsys=@COGL_WINSYS@
-cogl=@COGL_DRIVER@ #only kept for backward compatability
-driver=@COGL_DRIVER@
 
 Name: Cally
 Description: Clutter Accessibility Implementation Library
diff --git a/doc/reference/cally/Makefile.am b/doc/reference/cally/Makefile.am
index 02d81952f..ff52c2dac 100644
--- a/doc/reference/cally/Makefile.am
+++ b/doc/reference/cally/Makefile.am
@@ -53,7 +53,7 @@ CFILE_GLOB=$(top_srcdir)/clutter/cally/*.c $(top_builddir)/clutter/cally/*.c
 
 # Header files to ignore when scanning.
 # e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h
-IGNORE_HFILES=cally-actor-private.h
+IGNORE_HFILES=cally-actor-private.h cally.h
 
 EXTRA_HFILES=