19 files changed, 109 insertions, 89 deletions
diff --git a/a11y/e-table/gal-a11y-e-cell-popup.c b/a11y/e-table/gal-a11y-e-cell-popup.c
index 15cae2effb..d819a2fcc8 100644
--- a/a11y/e-table/gal-a11y-e-cell-popup.c
+++ b/a11y/e-table/gal-a11y-e-cell-popup.c
@@ -24,14 +24,16 @@
  */
 
 #include <config.h>
-#include <gal/e-table/e-cell-popup.h>
+
+#include <gdk/gdkkeysyms.h>
+#include <gtk/gtk.h>
+
+#include "gal/a11y/gal-a11y-util.h"
+#include "gal/e-table/e-cell-popup.h"
+#include "gal/util/e-i18n.h"
+
 #include "gal-a11y-e-cell-popup.h"
 #include "gal-a11y-e-cell-registry.h"
-#include "gal-a11y-util.h"
-#include <atk/atkobject.h>
-#include <gdk/gdkkeysyms.h>
-#include <gtk/gtkwidget.h>
-#include <glib/gi18n.h>
 
 static AtkObjectClass *parent_class = NULL;
 #define PARENT_TYPE (gal_a11y_e_cell_get_type ())
diff --git a/a11y/e-table/gal-a11y-e-cell-popup.h b/a11y/e-table/gal-a11y-e-cell-popup.h
index 5809f9b4f4..4162ed21cc 100644
--- a/a11y/e-table/gal-a11y-e-cell-popup.h
+++ b/a11y/e-table/gal-a11y-e-cell-popup.h
@@ -28,7 +28,7 @@
 
 #include <glib-object.h>
 #include <gal/e-table/e-table-item.h>
-#include <a11y/e-table/gal-a11y-e-cell.h>
+#include <gal/a11y/e-table/gal-a11y-e-cell.h>
 #include <atk/atkgobjectaccessible.h>
 
 #define GAL_A11Y_TYPE_E_CELL_POPUP            (gal_a11y_e_cell_popup_get_type ())
diff --git a/a11y/e-table/gal-a11y-e-cell-registry.c b/a11y/e-table/gal-a11y-e-cell-registry.c
index 7110179554..e6fc3a8e18 100644
--- a/a11y/e-table/gal-a11y-e-cell-registry.c
+++ b/a11y/e-table/gal-a11y-e-cell-registry.c
@@ -7,8 +7,9 @@
  */
 
 #include <config.h>
-#include "gal-a11y-e-cell-registry.h"
+
 #include "gal-a11y-e-cell.h"
+#include "gal-a11y-e-cell-registry.h"
 
 static GObjectClass *parent_class;
 static GalA11yECellRegistry *default_registry;
diff --git a/a11y/e-table/gal-a11y-e-cell-text.c b/a11y/e-table/gal-a11y-e-cell-text.c
index 89c1b3a813..37785bfbf5 100644
--- a/a11y/e-table/gal-a11y-e-cell-text.c
+++ b/a11y/e-table/gal-a11y-e-cell-text.c
@@ -7,16 +7,16 @@
  */
 
 #include <config.h>
+
 #include <string.h>
+
+#include <atk/atk.h>
+
+#include "gal/a11y/gal-a11y-util.h"
+#include "gal/e-table/e-cell-text.h"
+#include "gal/util/e-i18n.h"
+
 #include "gal-a11y-e-cell-text.h"
-#include "gal-a11y-util.h"
-#include <gal/e-table/e-cell-text.h>
-#include <atk/atkobject.h>
-#include <atk/atktext.h>
-#include <atk/atkeditabletext.h>
-#include <atk/atkaction.h>
-#include <atk/atkstateset.h>
-#include <glib/gi18n.h>
 
 #define CS_CLASS(a11y) (G_TYPE_INSTANCE_GET_CLASS ((a11y), C_TYPE_STREAM, GalA11yECellTextClass))
 static AtkObjectClass *parent_class;
diff --git a/a11y/e-table/gal-a11y-e-cell-text.h b/a11y/e-table/gal-a11y-e-cell-text.h
index 50056476c3..b2cfef2bd4 100644
--- a/a11y/e-table/gal-a11y-e-cell-text.h
+++ b/a11y/e-table/gal-a11y-e-cell-text.h
@@ -12,7 +12,7 @@
 #include <glib-object.h>
 #include <gal/e-table/e-table-item.h>
 #include <gal/e-table/e-cell-text.h>
-#include <a11y/e-table/gal-a11y-e-cell.h>
+#include <gal/a11y/e-table/gal-a11y-e-cell.h>
 
 #define GAL_A11Y_TYPE_E_CELL_TEXT            (gal_a11y_e_cell_text_get_type ())
 #define GAL_A11Y_E_CELL_TEXT(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAL_A11Y_TYPE_E_CELL_TEXT, GalA11yECellText))
diff --git a/a11y/e-table/gal-a11y-e-cell-toggle.c b/a11y/e-table/gal-a11y-e-cell-toggle.c
index 21f4955d1d..4c9e47bbaf 100644
--- a/a11y/e-table/gal-a11y-e-cell-toggle.c
+++ b/a11y/e-table/gal-a11y-e-cell-toggle.c
@@ -1,9 +1,10 @@
 #include <gtk/gtk.h>
+
+#include "gal/e-table/e-cell-toggle.h"
+#include "gal/e-table/e-table-model.h"
+#include "gal/util/e-i18n.h"
+
 #include "gal-a11y-e-cell-toggle.h"
-#include <gal/e-table/e-cell-toggle.h>
-#include <gal/e-table/e-table-model.h>
-#include <atk/atkcomponent.h>
-#include <glib/gi18n.h>
 
 #define PARENT_TYPE  (gal_a11y_e_cell_get_type ())
 static GObjectClass *parent_class;
diff --git a/a11y/e-table/gal-a11y-e-cell-tree.c b/a11y/e-table/gal-a11y-e-cell-tree.c
index 126bbcfbe5..64ebfffb89 100644
--- a/a11y/e-table/gal-a11y-e-cell-tree.c
+++ b/a11y/e-table/gal-a11y-e-cell-tree.c
@@ -7,14 +7,17 @@
  */
 
 #include <config.h>
+
 #include <atk/atk.h>
-#include "gal-a11y-e-cell-tree.h"
-#include "gal-a11y-e-cell-registry.h"
-#include "gal-a11y-util.h"
+
+#include "gal/a11y/gal-a11y-util.h"
 #include "gal/e-table/e-cell-tree.h"
 #include "gal/e-table/e-table.h"
 #include "gal/e-table/e-tree-table-adapter.h"
-#include <glib/gi18n.h>
+#include "gal/util/e-i18n.h"
+
+#include "gal-a11y-e-cell-tree.h"
+#include "gal-a11y-e-cell-registry.h"
 
 #define CS_CLASS(a11y) (G_TYPE_INSTANCE_GET_CLASS ((a11y), C_TYPE_STREAM, GalA11yECellTreeClass))
 static AtkObjectClass *a11y_parent_class;
diff --git a/a11y/e-table/gal-a11y-e-cell-vbox.c b/a11y/e-table/gal-a11y-e-cell-vbox.c
index 4f2c156da8..6363b8c5c1 100644
--- a/a11y/e-table/gal-a11y-e-cell-vbox.c
+++ b/a11y/e-table/gal-a11y-e-cell-vbox.c
@@ -19,10 +19,14 @@
  * Author: Eric Zhao <eric.zhao@sun.com> Sun Microsystem Inc., 2004
  *
  */
-#include "gal-a11y-e-cell-vbox.h"
+#include <config.h>
+
+#include <atk/atk.h>
+
+#include "gal/e-table/e-cell-vbox.h"
+
 #include "gal-a11y-e-cell-registry.h"
-#include <gal/e-table/e-cell-vbox.h>
-#include <atk/atkcomponent.h>
+#include "gal-a11y-e-cell-vbox.h"
 
 static GObjectClass *parent_class;
 static AtkComponentIface *component_parent_iface;
diff --git a/a11y/e-table/gal-a11y-e-cell.c b/a11y/e-table/gal-a11y-e-cell.c
index 8718713a44..30ea1b6915 100644
--- a/a11y/e-table/gal-a11y-e-cell.c
+++ b/a11y/e-table/gal-a11y-e-cell.c
@@ -7,19 +7,19 @@
  */
 
 #include <config.h>
+
 #include <string.h>
+
+#include <gtk/gtk.h>
+
+#include "gal/a11y/gal-a11y-util.h"
 #include "gal/e-table/e-table.h"
 #include "gal/e-table/e-tree.h"
-#include "gal-a11y-e-table-item.h"
+#include "gal/util/e-i18n.h"
+
 #include "gal-a11y-e-cell.h"
 #include "gal-a11y-e-cell-vbox.h"
-#include "gal-a11y-util.h"
-#include <atk/atkobject.h>
-#include <atk/atkcomponent.h>
-#include <atk/atkaction.h>
-#include <atk/atkstateset.h>
-#include <gtk/gtkwindow.h>
-#include <glib/gi18n.h>
+#include "gal-a11y-e-table-item.h"
 
 #define CS_CLASS(a11y) (G_TYPE_INSTANCE_GET_CLASS ((a11y), C_TYPE_STREAM, GalA11yECellClass))
 static GObjectClass *parent_class;
diff --git a/a11y/e-table/gal-a11y-e-table-click-to-add-factory.c b/a11y/e-table/gal-a11y-e-table-click-to-add-factory.c
index 9c46b2badc..c959003a8b 100644
--- a/a11y/e-table/gal-a11y-e-table-click-to-add-factory.c
+++ b/a11y/e-table/gal-a11y-e-table-click-to-add-factory.c
@@ -5,13 +5,15 @@
  */
 
 #include <config.h>
-#include "gal-a11y-e-table-click-to-add-factory.h"
-#include "gal-a11y-e-table-click-to-add.h"
-#include "gal-a11y-e-table.h"
-#include <gal/e-table/e-table.h>
-#include <gal/e-table/e-table-click-to-add.h>
+
 #include <atk/atk.h>
 
+#include "gal/e-table/e-table.h"
+#include "gal/e-table/e-table-click-to-add.h"
+
+#include "gal-a11y-e-table.h"
+#include "gal-a11y-e-table-click-to-add.h"
+#include "gal-a11y-e-table-click-to-add-factory.h"
 
 #define CS_CLASS(factory) (G_TYPE_INSTANCE_GET_CLASS ((factory), C_TYPE_STREAM, GalA11yETableClickToAddFactoryClass))
 static AtkObjectFactoryClass *parent_class;
diff --git a/a11y/e-table/gal-a11y-e-table-click-to-add.c b/a11y/e-table/gal-a11y-e-table-click-to-add.c
index d8400b7ebb..5d7eba16e3 100644
--- a/a11y/e-table/gal-a11y-e-table-click-to-add.c
+++ b/a11y/e-table/gal-a11y-e-table-click-to-add.c
@@ -6,15 +6,17 @@
  */
 
 #include <config.h>
-#include "gal-a11y-util.h"
+
+#include <atk/atk.h>
+
+#include "gal/a11y/gal-a11y-util.h"
+#include "gal/e-table/e-table-click-to-add.h"
+#include "gal/e-table/e-table-group.h"
+#include "gal/e-table/e-table-group-leaf.h"
+#include "gal/util/e-i18n.h"
+
 #include "gal-a11y-e-table-click-to-add.h"
 #include "gal-a11y-e-table-click-to-add-factory.h"
-#include <gal/e-table/e-table-group.h>
-#include <gal/e-table/e-table-group-leaf.h>
-#include <gal/e-table/e-table-click-to-add.h>
-#include <atk/atkcomponent.h>
-#include <atk/atkaction.h>
-#include <glib/gi18n.h>
 
 static AtkObjectClass *parent_class;
 static GType parent_type;
diff --git a/a11y/e-table/gal-a11y-e-table-factory.c b/a11y/e-table/gal-a11y-e-table-factory.c
index 14eaca3d19..8e207716ce 100644
--- a/a11y/e-table/gal-a11y-e-table-factory.c
+++ b/a11y/e-table/gal-a11y-e-table-factory.c
@@ -7,8 +7,9 @@
  */
 
 #include <config.h>
-#include "gal-a11y-e-table-factory.h"
+
 #include "gal-a11y-e-table.h"
+#include "gal-a11y-e-table-factory.h"
 
 #define CS_CLASS(factory) (G_TYPE_INSTANCE_GET_CLASS ((factory), C_TYPE_STREAM, GalA11yETableFactoryClass))
 static AtkObjectFactoryClass *parent_class;
diff --git a/a11y/e-table/gal-a11y-e-table-item-factory.c b/a11y/e-table/gal-a11y-e-table-item-factory.c
index 3c8e60a4bb..f773471772 100644
--- a/a11y/e-table/gal-a11y-e-table-item-factory.c
+++ b/a11y/e-table/gal-a11y-e-table-item-factory.c
@@ -5,13 +5,15 @@
  */
 
 #include <config.h>
-#include "gal-a11y-e-table-item-factory.h"
-#include "gal-a11y-e-table-item.h"
-#include "gal-a11y-e-table.h"
-#include <gal/e-table/e-table.h>
-#include <gal/e-table/e-tree.h>
+
 #include <atk/atk.h>
 
+#include "gal/e-table/e-table.h"
+#include "gal/e-table/e-tree.h"
+
+#include "gal-a11y-e-table.h"
+#include "gal-a11y-e-table-item.h"
+#include "gal-a11y-e-table-item-factory.h"
 
 #define CS_CLASS(factory) (G_TYPE_INSTANCE_GET_CLASS ((factory), C_TYPE_STREAM, GalA11yETableItemFactoryClass))
 static AtkObjectFactoryClass *parent_class;
diff --git a/a11y/e-table/gal-a11y-e-table-item.c b/a11y/e-table/gal-a11y-e-table-item.c
index 20bd94316e..a6945d351c 100644
--- a/a11y/e-table/gal-a11y-e-table-item.c
+++ b/a11y/e-table/gal-a11y-e-table-item.c
@@ -8,26 +8,24 @@
  */
 
 #include <config.h>
+
 #include <string.h>
+
+#include <atk/atk.h>
+
+#include "gal/a11y/gal-a11y-util.h"
+#include "gal/e-table/e-table-click-to-add.h"
+#include "gal/e-table/e-table-subset.h"
+#include "gal/e-table/e-table.h"
+#include "gal/e-table/e-tree.h"
+#include "gal/widgets/e-canvas.h"
+#include "gal/widgets/e-selection-model.h"
+
 #include "gal-a11y-e-table-item.h"
 #include "gal-a11y-e-table-item-factory.h"
 #include "gal-a11y-e-table-click-to-add.h"
 #include "gal-a11y-e-cell-registry.h"
 #include "gal-a11y-e-cell.h"
-#include "gal-a11y-util.h"
-#include <gal/e-table/e-table-subset.h>
-#include <gal/widgets/e-selection-model.h>
-#include <gal/widgets/e-canvas.h>
-#include <gal/e-table/e-table.h>
-#include <gal/e-table/e-table-click-to-add.h>
-#include <gal/e-table/e-tree.h>
-
-#include <atk/atkobject.h>
-#include <atk/atktable.h>
-#include <atk/atkcomponent.h>
-#include <atk/atkobjectfactory.h>
-#include <atk/atkregistry.h>
-#include <atk/atkgobjectaccessible.h>
 
 #define CS_CLASS(a11y) (G_TYPE_INSTANCE_GET_CLASS ((a11y), C_TYPE_STREAM, GalA11yETableItemClass))
 static GObjectClass *parent_class;
diff --git a/a11y/e-table/gal-a11y-e-table.c b/a11y/e-table/gal-a11y-e-table.c
index b49a8a653a..fc5033c31d 100644
--- a/a11y/e-table/gal-a11y-e-table.c
+++ b/a11y/e-table/gal-a11y-e-table.c
@@ -7,15 +7,17 @@
  */
 
 #include <config.h>
+
+#include "gal/a11y/gal-a11y-util.h"
+#include "gal/e-table/e-table.h"
+#include "gal/e-table/e-table-click-to-add.h"
+#include "gal/e-table/e-table-group.h"
+#include "gal/e-table/e-table-group-container.h"
+#include "gal/e-table/e-table-group-leaf.h"
+
 #include "gal-a11y-e-table.h"
 #include "gal-a11y-e-table-factory.h"
 #include "gal-a11y-e-table-item.h"
-#include "gal-a11y-util.h"
-#include <gal/e-table/e-table.h>
-#include <gal/e-table/e-table-group.h>
-#include <gal/e-table/e-table-group-container.h>
-#include <gal/e-table/e-table-group-leaf.h>
-#include <gal/e-table/e-table-click-to-add.h>
 
 #define CS_CLASS(a11y) (G_TYPE_INSTANCE_GET_CLASS ((a11y), C_TYPE_STREAM, GalA11yETableClass))
 static AtkObjectClass *parent_class;
diff --git a/a11y/e-table/gal-a11y-e-tree-factory.c b/a11y/e-table/gal-a11y-e-tree-factory.c
index 2fa34c5fbc..d5c7f80669 100644
--- a/a11y/e-table/gal-a11y-e-tree-factory.c
+++ b/a11y/e-table/gal-a11y-e-tree-factory.c
@@ -5,8 +5,9 @@
  */
 
 #include <config.h>
-#include "gal-a11y-e-tree-factory.h"
+
 #include "gal-a11y-e-tree.h"
+#include "gal-a11y-e-tree-factory.h"
 
 #define CS_CLASS(factory) (G_TYPE_INSTANCE_GET_CLASS ((factory), C_TYPE_STREAM, GalA11yETreeFactoryClass))
 static AtkObjectFactoryClass *parent_class;
diff --git a/a11y/e-table/gal-a11y-e-tree.c b/a11y/e-table/gal-a11y-e-tree.c
index de468398ea..b4b6f5b45d 100644
--- a/a11y/e-table/gal-a11y-e-tree.c
+++ b/a11y/e-table/gal-a11y-e-tree.c
@@ -5,12 +5,14 @@
  */
 
 #include <config.h>
+
+#include "gal/a11y/gal-a11y-util.h"
+#include "gal/e-table/e-table-item.h"
+#include "gal/e-table/e-tree.h"
+
+#include "gal-a11y-e-table-item.h"
 #include "gal-a11y-e-tree.h"
 #include "gal-a11y-e-tree-factory.h"
-#include "gal-a11y-util.h"
-#include "gal-a11y-e-table-item.h"
-#include <gal/e-table/e-tree.h>
-#include <gal/e-table/e-table-item.h>
 
 #define CS_CLASS(a11y) (G_TYPE_INSTANCE_GET_CLASS ((a11y), C_TYPE_STREAM, GalA11yETreeClass))
 static AtkObjectClass *parent_class;
diff --git a/a11y/e-text/gal-a11y-e-text.c b/a11y/e-text/gal-a11y-e-text.c
index 2463126afa..1ad9c33665 100644
--- a/a11y/e-text/gal-a11y-e-text.c
+++ b/a11y/e-text/gal-a11y-e-text.c
@@ -7,19 +7,17 @@
  */
 
 #include <config.h>
+
 #include <string.h>
-#include "gal-a11y-e-text.h"
-#include "gal-a11y-e-text-factory.h"
-#include "gal-a11y-util.h"
-#include <atk/atkobject.h>
-#include <atk/atktable.h>
-#include <atk/atkcomponent.h>
-#include <atk/atkobjectfactory.h>
-#include <atk/atkregistry.h>
-#include <atk/atkgobjectaccessible.h>
+
+#include <gtk/gtk.h>
+
+#include "gal/a11y/gal-a11y-util.h"
 #include "gal/e-text/e-text.h"
 #include "gal/e-text/e-text-model-repos.h"
-#include <gtk/gtkmain.h>
+
+#include "gal-a11y-e-text.h"
+#include "gal-a11y-e-text-factory.h"
 
 #define CS_CLASS(a11y) (G_TYPE_INSTANCE_GET_CLASS ((a11y), C_TYPE_STREAM, GalA11yETextClass))
 static GObjectClass *parent_class;
diff --git a/a11y/gal-a11y-util.c b/a11y/gal-a11y-util.c
index 0cf7c69dbb..29a9dbc37d 100644
--- a/a11y/gal-a11y-util.c
+++ b/a11y/gal-a11y-util.c
@@ -7,6 +7,7 @@
  */
 
 #include <config.h>
+
 #include "gal-a11y-util.h"
 
 GType