2009-01-12 Mark Doffman <mark.doffman@codethink.co.uk>

        * atk-adaptors/
          Large code-structure refactor.
          D-Bus adaptors have been renamed to
          *-adaptor.c.

          atk-dbus.c has been renamed
          to accessible-register.c to better indicate
          its function. The marshalling code has been
          split out.

28 files changed, 195 insertions, 173 deletions

diff --git a/atk-adaptor/Makefile.am b/atk-adaptor/Makefile.am
index 944681f..c47cefc 100644
--- a/atk-adaptor/Makefile.am
+++ b/atk-adaptor/Makefile.am
@@ -1,7 +1,10 @@
 gtkmoduledir = $(libdir)/$(GTK_MODULE_DIR)
 gtkmodule_LTLIBRARIES = libspiatk.la
 
-libspiatk_la_CFLAGS = $(DBUS_GLIB_CFLAGS) $(ATK_CFLAGS) -I$(top_srcdir)\
+libspiatk_la_CFLAGS = $(DBUS_GLIB_CFLAGS)\
+		      $(ATK_CFLAGS)\
+		      -I$(top_srcdir)\
+		      -I$(top_srcdir)/atk-adaptor/adaptors\
 		      -DATSPI_INTROSPECTION_PATH=\"$(pkgdatadir)/$(DEFAULT_ATSPI_INTROSPECTION_PATH)\"
 
 libspiatk_la_LDFLAGS = -no-undefined       \
@@ -15,25 +18,28 @@ libspiatk_la_LIBADD = $(DBUS_GLIB_LIBS)			\
 		      $(top_builddir)/spi-common/libspicommon.la
 
 libspiatk_la_SOURCES =		\
-	accessible.h		\
-	accessible.c		\
-	action.c                \
-	application.c		\
+	accessible-adaptor.c	\
+	accessible-marshaller.c	\
+	accessible-marshaller.h	\
+	accessible-register.c	\
+	accessible-register.h	\
+	action-adaptor.c	\
+	adaptor.h		\
+	application-adaptor.c	\
 	bridge.c		\
 	bridge.h		\
-	collection.c 		\
-	component.c		\
-	document.c		\
-	editabletext.c		\
+	collection-adaptor.c	\
+	component-adaptor.c	\
+	document-adaptor.c	\
+	editabletext-adaptor.c	\
 	event.c			\
-	hyperlink.c		\
-	hypertext.c		\
-	atk-dbus.c		\
-	atk-dbus.h		\
-	image.c			\
-	selection.c		\
-	table.c			\
-	text.c			\
-	tree.c			\
-	tree.h			\
-	value.c
+	event.h			\
+	hyperlink-adaptor.c	\
+	hypertext-adaptor.c	\
+	image-adaptor.c		\
+	selection-adaptor.c	\
+	table-adaptor.c		\
+	text-adaptor.c		\
+	tree-adaptor.c		\
+	tree-adaptor.h		\
+	value-adaptor.c
diff --git a/atk-adaptor/accessible.c b/atk-adaptor/accessible-adaptor.c
index e1e34aa..fd3df3c 100644
--- a/atk-adaptor/accessible.c
+++ b/atk-adaptor/accessible-adaptor.c
@@ -25,8 +25,8 @@
 #include <atk/atk.h>
 #include <droute/droute.h>
 
-#include "atk-dbus.h"
 #include "spi-common/spi-dbus.h"
+#include "accessible-marshaller.h"
 
 static dbus_bool_t
 impl_get_name (DBusMessageIter *iter, void *user_data)
diff --git a/atk-adaptor/accessible-marshaller.c b/atk-adaptor/accessible-marshaller.c
new file mode 100644
index 0000000..a60f2c8
--- /dev/null
+++ b/atk-adaptor/accessible-marshaller.c
@@ -0,0 +1,75 @@
+/*
+ * AT-SPI - Assistive Technology Service Provider Interface
+ * (Gnome Accessibility Project; http://developer.gnome.org/projects/gap)
+ *
+ * Copyright 2008 Novell, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library 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.
+ */
+
+#include "accessible-register.h"
+#include "accessible-marshaller.h"
+
+/*---------------------------------------------------------------------------*/
+
+/*
+ * Marshals the D-Bus path of an AtkObject into a D-Bus message.
+ *
+ * Unrefs the AtkObject if unref is true.
+ */
+DBusMessage *
+spi_dbus_return_object (DBusMessage *message, AtkObject *obj, gboolean unref)
+{
+  DBusMessage *reply;
+  gchar *path;
+
+  path = atk_dbus_object_to_path (obj);
+
+  if (unref)
+    g_object_unref (obj);
+
+  reply = dbus_message_new_method_return (message);
+  if (reply)
+    {
+      dbus_message_append_args (reply, DBUS_TYPE_OBJECT_PATH, path,
+                                DBUS_TYPE_INVALID);
+    }
+  return reply;
+}
+
+/*---------------------------------------------------------------------------*/
+
+/*
+ * Marshals a variant containing the D-Bus path of an AtkObject into a D-Bus
+ * message.
+ *
+ * Unrefs the object if unref is true.
+ */
+dbus_bool_t
+spi_dbus_return_v_object (DBusMessageIter *iter, AtkObject *obj, int unref)
+{
+  char *path;
+
+  path = atk_dbus_object_to_path (obj);
+
+  if (unref)
+    g_object_unref (obj);
+
+  return droute_return_v_object (iter, path);
+}
+
+/*END------------------------------------------------------------------------*/
+
diff --git a/atk-adaptor/accessible.h b/atk-adaptor/accessible-marshaller.h
index f15b397..b133abc 100644
--- a/atk-adaptor/accessible.h
+++ b/atk-adaptor/accessible-marshaller.h
@@ -2,8 +2,8 @@
  * AT-SPI - Assistive Technology Service Provider Interface
  * (Gnome Accessibility Project; http://developer.gnome.org/projects/gap)
  *
- * Copyright 2001, 2002 Sun Microsystems Inc.,
- * Copyright 2001, 2002 Ximian, Inc.
+ * Copyright 2008 Novell, Inc.
+ * Copyright 2008, 2009 Codethink Ltd.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -21,16 +21,16 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#ifndef SPI_ACCESSIBLE_H_
-#define SPI_ACCESSIBLE_H_
+#ifndef __ACCESSIBLE_MARSHALLER__
+#define __ACCESSIBLE_MARSHALLER__
 
+#include <dbus/dbus.h>
 #include <atk/atk.h>
-#include <spi-common/spi-types.h>
 
-G_BEGIN_DECLS
+DBusMessage *
+spi_dbus_return_object (DBusMessage *message, AtkObject *obj, gboolean unref);
 
-Accessibility_Role spi_accessible_role_from_atk_role (AtkRole role);
+dbus_bool_t
+spi_dbus_return_v_object (DBusMessageIter *iter, AtkObject *obj, int unref);
 
-G_END_DECLS
-
-#endif /* SPI_ACCESSIBLE_H_ */
+#endif /* __ACCESSIBLE_MARSHALLER__ */
diff --git a/atk-adaptor/atk-dbus.c b/atk-adaptor/accessible-register.c
index 956fb29..61521e6 100644
--- a/atk-adaptor/atk-dbus.c
+++ b/atk-adaptor/accessible-register.c
@@ -3,6 +3,7 @@
  * (Gnome Accessibility Project; http://developer.gnome.org/projects/gap)
  *
  * Copyright 2008 Novell, Inc.
+ * Copyright 2008, 2009 Codethink Ltd.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -25,8 +26,7 @@
 #include <string.h>
 
 #include "bridge.h"
-#include "accessible.h"
-#include "atk-dbus.h"
+#include "accessible-register.h"
 
 /* TODO
  * Need to add concurrency support.
@@ -61,18 +61,10 @@
  * removed since the last update.
  */
 
-/* Amazingly the ATK event callbacks dont have a user
- * data parameter. Instead, with great sadness, we use
- * some global data. Data is declared and initialized
- * in bridge.c.
- */
-
 GHashTable *ref2ptr = NULL; /* Used for converting a D-Bus path (Reference) to the object pointer */
 
 static guint counter = 1;
 
-extern SpiAppData *atk_adaptor_app_data;
-
 /*---------------------------------------------------------------------------*/
 
 /*
@@ -326,54 +318,6 @@ atk_dbus_object_to_path (AtkObject *accessible)
 /*---------------------------------------------------------------------------*/
 
 /*
- * Marshals a single object into a D-Bus message.
- *
- * Unrefs the AtkObject if unref is true.
- */
-DBusMessage *
-spi_dbus_return_object (DBusMessage *message, AtkObject *obj, gboolean unref)
-{
-  DBusMessage *reply;
-  gchar *path;
-
-  path = atk_dbus_object_to_path (obj);
-
-  if (unref)
-    g_object_unref (obj);
-
-  reply = dbus_message_new_method_return (message);
-  if (reply)
-    {
-      dbus_message_append_args (reply, DBUS_TYPE_OBJECT_PATH, path,
-                                DBUS_TYPE_INVALID);
-    }
-  return reply;
-}
-
-/*---------------------------------------------------------------------------*/
-
-/*
- * Marshals a variant containing the object reference into the message iter
- * provided.
- *
- * Unrefs the object if unref is true.
- */
-dbus_bool_t
-spi_dbus_return_v_object (DBusMessageIter *iter, AtkObject *obj, int unref)
-{
-  char *path;
-
-  path = atk_dbus_object_to_path (obj);
-
-  if (unref)
-    g_object_unref (obj);
-
-  return droute_return_v_object (iter, path);
-}
-
-/*---------------------------------------------------------------------------*/
-
-/*
  * Initializes required global data. The update and removal lists
  * and the reference lookup tables.
  *
diff --git a/atk-adaptor/atk-dbus.h b/atk-adaptor/accessible-register.h
index 17dc50d..89c7780 100644
--- a/atk-adaptor/atk-dbus.h
+++ b/atk-adaptor/accessible-register.h
@@ -3,6 +3,7 @@
  * (Gnome Accessibility Project; http://developer.gnome.org/projects/gap)
  *
  * Copyright 2008 Novell, Inc.
+ * Copyright 2008, 2009 Codethink Ltd.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -20,23 +21,15 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#ifndef __ATK_DBUS__
-#define __ATK_DBUS__
+#ifndef ACCESSIBLE_REGISTER
+#define ACCESSIBLE_REGISTER
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <atk/atk.h>
 #include <glib.h>
 
 void
 atk_dbus_foreach_registered(GHFunc func, gpointer data);
 
-void
-atk_dbus_foreach_update_list(GHFunc func, gpointer data);
-
-void
-atk_dbus_foreach_remove_list(GHFunc func, gpointer data);
-
 /*---------------------------------------------------------------------------*/
 
 guint
@@ -57,17 +50,6 @@ AtkObject *
 atk_dbus_path_to_object (const char *path);
 
 gchar *
-atk_dbus_ref_to_path (guint ref);
-
-gchar *
 atk_dbus_object_to_path (AtkObject *accessible);
 
-/*---------------------------------------------------------------------------*/
-
-DBusMessage *
-spi_dbus_return_object (DBusMessage *message, AtkObject *obj, gboolean unref);
-
-dbus_bool_t
-spi_dbus_return_v_object (DBusMessageIter *iter, AtkObject *obj, int unref);
-
-#endif /* __ATK_DBUS__ */
+#endif /* ACCESSIBLE_REGISTER */
diff --git a/atk-adaptor/action.c b/atk-adaptor/action-adaptor.c
index e9da657..e9da657 100644
--- a/atk-adaptor/action.c
+++ b/atk-adaptor/action-adaptor.c
diff --git a/atk-adaptor/adaptors.h b/atk-adaptor/adaptors.h
new file mode 100644
index 0000000..d871a7b
--- /dev/null
+++ b/atk-adaptor/adaptors.h
@@ -0,0 +1,48 @@
+/*
+ * AT-SPI - Assistive Technology Service Provider Interface
+ * (Gnome Accessibility Project; http://developer.gnome.org/projects/gap)
+ *
+ * Copyright 2001, 2002 Sun Microsystems Inc.,
+ * Copyright 2001, 2002 Ximian, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library 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.
+ */
+
+#ifndef ADAPTORS_H
+#define ADAPTORS_H
+
+#include <atk/atk.h>
+#include <droute/droute.h>
+
+Accessibility_Role spi_accessible_role_from_atk_role (AtkRole role);
+
+void spi_initialize_accessible      (DRoutePath *path);
+void spi_initialize_action          (DRoutePath *path);
+void spi_initialize_application     (DRoutePath *path);
+void spi_initialize_collection      (DRoutePath *path);
+void spi_initialize_component       (DRoutePath *path);
+void spi_initialize_document        (DRoutePath *path);
+void spi_initialize_editabletext    (DRoutePath *path);
+void spi_initialize_hyperlink       (DRoutePath *path);
+void spi_initialize_hypertext       (DRoutePath *path);
+void spi_initialize_image           (DRoutePath *path);
+void spi_initialize_selection       (DRoutePath *path);
+void spi_initialize_table           (DRoutePath *path);
+void spi_initialize_text            (DRoutePath *path);
+void spi_initialize_value           (DRoutePath *path);
+void spi_initialize_tree            (DRoutePath *path);
+
+#endif /* ADAPTORS_H */
diff --git a/atk-adaptor/application.c b/atk-adaptor/application-adaptor.c
index cf6b689..cf6b689 100644
--- a/atk-adaptor/application.c
+++ b/atk-adaptor/application-adaptor.c
diff --git a/atk-adaptor/bridge.c b/atk-adaptor/bridge.c
index 80d8a5b..a63539e 100644
--- a/atk-adaptor/bridge.c
+++ b/atk-adaptor/bridge.c
@@ -2,7 +2,7 @@
  * AT-SPI - Assistive Technology Service Provider Interface
  * (Gnome Accessibility Project; http://developer.gnome.org/projects/gap)
  *
- * Copyright 2008             Codethink Ltd.
+ * Copyright 2008, 2009 Codethink Ltd.
  * Copyright 2001, 2002, 2003 Sun Microsystems Inc.,
  * Copyright 2001, 2002, 2003 Ximian, Inc.
  *
@@ -27,20 +27,17 @@
 
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
-#include <string.h>
-#include <stdio.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <stdarg.h>
 #include <atk/atk.h>
-#include <atk/atkobject.h>
-#include <atk/atknoopobject.h>
 
 #include <droute/droute.h>
 
 #include "bridge.h"
 #include "event.h"
-#include "atk-dbus.h"
+#include "accessible-register.h"
+#include "adaptors.h"
 
 #include "spi-common/spi-dbus.h"
 
diff --git a/atk-adaptor/bridge.h b/atk-adaptor/bridge.h
index 6b8829b..3e41531 100644
--- a/atk-adaptor/bridge.h
+++ b/atk-adaptor/bridge.h
@@ -4,6 +4,7 @@
  *
  * Copyright 2001, 2002, 2003 Sun Microsystems Inc.,
  * Copyright 2001, 2002, 2003 Ximian, Inc.
+ * Copyright 2008, 2009 Codethink Ltd.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -21,39 +22,21 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#ifndef SPI_BRIDGE_H_
-#define SPI_BRIDGE_H_
+#ifndef BRIDGE_H
+#define BRIDGE_H
 
 #include <atk/atk.h>
 #include <droute/droute.h>
 
-G_BEGIN_DECLS
-
 typedef struct _SpiAppData SpiAppData;
 struct _SpiAppData
 {
     AtkObject      *root;
+
     DBusConnection *bus;
     DRouteContext  *droute;
 };
 
-void spi_initialize_accessible      (DRoutePath *path);
-void spi_initialize_action          (DRoutePath *path);
-void spi_initialize_application     (DRoutePath *path);
-void spi_initialize_collection      (DRoutePath *path);
-void spi_initialize_component       (DRoutePath *path);
-void spi_initialize_document        (DRoutePath *path);
-void spi_initialize_editabletext    (DRoutePath *path);
-void spi_initialize_hyperlink       (DRoutePath *path);
-void spi_initialize_hypertext       (DRoutePath *path);
-void spi_initialize_image           (DRoutePath *path);
-void spi_initialize_selection       (DRoutePath *path);
-void spi_initialize_table           (DRoutePath *path);
-void spi_initialize_text            (DRoutePath *path);
-void spi_initialize_value           (DRoutePath *path);
-
-void spi_initialize_tree            (DRoutePath *path);
-
-G_END_DECLS
+extern SpiAppData *atk_adaptor_app_data;
 
-#endif /* SPI_BRIDGE_H_ */
+#endif /* BRIDGE_H */
diff --git a/atk-adaptor/collection.c b/atk-adaptor/collection-adaptor.c
index c5fe2c0..749198f 100644
--- a/atk-adaptor/collection.c
+++ b/atk-adaptor/collection-adaptor.c
@@ -27,7 +27,8 @@
 #include <atk/atk.h>
 #include <droute/droute.h>
 
-#include "atk-dbus.h"
+#include "accessible-register.h"
+#include "accessible-marshaller.h"
 
 #include "spi-common/bitarray.h"
 #include "spi-common/spi-dbus.h"
diff --git a/atk-adaptor/component.c b/atk-adaptor/component-adaptor.c
index cd132da..25e44c2 100644
--- a/atk-adaptor/component.c
+++ b/atk-adaptor/component-adaptor.c
@@ -25,7 +25,7 @@
 #include <atk/atk.h>
 #include <droute/droute.h>
 
-#include "atk-dbus.h"
+#include "accessible-marshaller.h"
 #include "spi-common/spi-dbus.h"
 
 static DBusMessage *
diff --git a/atk-adaptor/document.c b/atk-adaptor/document-adaptor.c
index 91f6313..91f6313 100644
--- a/atk-adaptor/document.c
+++ b/atk-adaptor/document-adaptor.c
diff --git a/atk-adaptor/editabletext.c b/atk-adaptor/editabletext-adaptor.c
index 76a8866..76a8866 100644
--- a/atk-adaptor/editabletext.c
+++ b/atk-adaptor/editabletext-adaptor.c
diff --git a/atk-adaptor/event.c b/atk-adaptor/event.c
index cc03daf..e4991c3 100644
--- a/atk-adaptor/event.c
+++ b/atk-adaptor/event.c
@@ -2,7 +2,7 @@
  * AT-SPI - Assistive Technology Service Provider Interface
  * (Gnome Accessibility Project; http://developer.gnome.org/projects/gap)
  *
- * Copyright 2008, Codethink Ltd.
+ * Copyright 2008, 2009, Codethink Ltd.
  * Copyright 2001, 2002, 2003 Sun Microsystems Inc.,
  * Copyright 2001, 2002, 2003 Ximian, Inc.
  *
@@ -28,7 +28,7 @@
 #include <droute/droute.h>
 
 #include "bridge.h"
-#include "atk-dbus.h"
+#include "accessible-register.h"
 
 #include "spi-common/spi-dbus.h"
 
@@ -37,13 +37,6 @@ static GArray *listener_ids = NULL;
 static gint atk_bridge_key_event_listener_id;
 static gint atk_bridge_focus_tracker_id;
 
-/* Amazingly the ATK event callbacks dont have a user
- * data parameter. Instead, with great sadness, we use
- * some global data. Data is declared and initialized
- * in bridge.c.
- */
-extern SpiAppData *atk_adaptor_app_data;
-
 /*---------------------------------------------------------------------------*/
 
 #define ITF_EVENT_OBJECT   "org.freedesktop.atspi.Event.Object"
diff --git a/atk-adaptor/event.h b/atk-adaptor/event.h
index d40567d..d62f9ce 100644
--- a/atk-adaptor/event.h
+++ b/atk-adaptor/event.h
@@ -4,6 +4,7 @@
  *
  * Copyright 2001, 2002 Sun Microsystems Inc.,
  * Copyright 2001, 2002 Ximian, Inc.
+ * Copyright 2008, 2009 Codethink Ltd.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -21,18 +22,13 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#ifndef SPI_EVENT_H_
-#define SPI_EVENT_H_
+#ifndef EVENT_H
+#define EVENT_H
 
-#include <atk/atk.h>
 #include <spi-common/spi-types.h>
 
-G_BEGIN_DECLS
-
 void spi_atk_register_event_listeners   (void);
 void spi_atk_deregister_event_listeners (void);
 void spi_atk_tidy_windows               (void);
 
-G_END_DECLS
-
-#endif /* SPI_EVENT_H_ */
+#endif /* EVENT_H */
diff --git a/atk-adaptor/hyperlink.c b/atk-adaptor/hyperlink-adaptor.c
index 39264d5..9634512 100644
--- a/atk-adaptor/hyperlink.c
+++ b/atk-adaptor/hyperlink-adaptor.c
@@ -25,7 +25,7 @@
 #include <atk/atk.h>
 #include <droute/droute.h>
 
-#include "atk-dbus.h"
+#include "accessible-marshaller.h"
 #include "spi-common/spi-dbus.h"
 
 static dbus_bool_t
diff --git a/atk-adaptor/hypertext.c b/atk-adaptor/hypertext-adaptor.c
index a1c2298..a1c2298 100644
--- a/atk-adaptor/hypertext.c
+++ b/atk-adaptor/hypertext-adaptor.c
diff --git a/atk-adaptor/image.c b/atk-adaptor/image-adaptor.c
index 23bf365..23bf365 100644
--- a/atk-adaptor/image.c
+++ b/atk-adaptor/image-adaptor.c
diff --git a/atk-adaptor/relation.c b/atk-adaptor/relation-adaptor.c
index 12edc7a..12edc7a 100644
--- a/atk-adaptor/relation.c
+++ b/atk-adaptor/relation-adaptor.c
diff --git a/atk-adaptor/selection.c b/atk-adaptor/selection-adaptor.c
index 3cae386..3cae386 100644
--- a/atk-adaptor/selection.c
+++ b/atk-adaptor/selection-adaptor.c
diff --git a/atk-adaptor/streamablecontent.c b/atk-adaptor/streamablecontent-adaptor.c
index cbe0686..8b3d40b 100644
--- a/atk-adaptor/streamablecontent.c
+++ b/atk-adaptor/streamablecontent-adaptor.c
@@ -25,7 +25,7 @@
 #include <config.h>
 #include <stdio.h>
 #include <string.h>
-#include <libspi/accessible.h>
+
 #include <libspi/component.h>
 #include <libspi/streamablecontent.h>
 
diff --git a/atk-adaptor/table.c b/atk-adaptor/table-adaptor.c
index c0c6b0f..cc8cfbe 100644
--- a/atk-adaptor/table.c
+++ b/atk-adaptor/table-adaptor.c
@@ -25,7 +25,7 @@
 #include <atk/atk.h>
 #include <droute/droute.h>
 
-#include "atk-dbus.h"
+#include "accessible-marshaller.h"
 #include "spi-common/spi-dbus.h"
 
 static dbus_bool_t
diff --git a/atk-adaptor/text.c b/atk-adaptor/text-adaptor.c
index 7c88211..7c88211 100644
--- a/atk-adaptor/text.c
+++ b/atk-adaptor/text-adaptor.c
diff --git a/atk-adaptor/tree.c b/atk-adaptor/tree-adaptor.c
index ddac5e3..a4411d0 100644
--- a/atk-adaptor/tree.c
+++ b/atk-adaptor/tree-adaptor.c
@@ -5,6 +5,7 @@
  * Copyright 2008 Novell, Inc.
  * Copyright 2001, 2002 Sun Microsystems Inc.,
  * Copyright 2001, 2002 Ximian, Inc.
+ * Copyright 2008, 2009 Codethink Ltd.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -27,9 +28,9 @@
 #include <atk/atk.h>
 #include <droute/droute.h>
 
-#include "atk-dbus.h"
-#include "spi-common/spi-dbus.h"
 #include "bridge.h"
+#include "accessible-register.h"
+#include "spi-common/spi-dbus.h"
 
 /*---------------------------------------------------------------------------*/
 
diff --git a/atk-adaptor/tree.h b/atk-adaptor/tree-adaptor.h
index cdd2b56..b0c99df 100644
--- a/atk-adaptor/tree.h
+++ b/atk-adaptor/tree-adaptor.h
@@ -4,6 +4,7 @@
  *
  * Copyright 2001, 2002 Sun Microsystems Inc.,
  * Copyright 2001, 2002 Ximian, Inc.
+ * Copyright 2008, 2009 Codethink Ltd.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -21,21 +22,16 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#ifndef SPI_TREE_H_
-#define SPI_TREE_H_
+#ifndef TREE_ADAPTOR_H
+#define TREE_ADAPTOR_H
 
 #include <atk/atk.h>
-#include <spi-common/spi-types.h>
 #include <dbus/dbus.h>
 
-G_BEGIN_DECLS
-
 void
 spi_emit_cache_update  (AtkObject *accessible, DBusConnection *bus);
 
 void
 spi_emit_cache_removal (guint ref, DBusConnection *bus);
 
-G_END_DECLS
-
-#endif /* SPI_ACCESSIBLE_H_ */
+#endif /* TREE_ADAPTOR_H */
diff --git a/atk-adaptor/value.c b/atk-adaptor/value-adaptor.c
index 5618e61..5618e61 100644
--- a/atk-adaptor/value.c
+++ b/atk-adaptor/value-adaptor.c