14 files changed, 13 insertions, 18 deletions
diff --git a/a11y/addressbook/ea-addressbook-view.h b/a11y/addressbook/ea-addressbook-view.h
index 2fe13ca2c2..c6fda684d9 100644
--- a/a11y/addressbook/ea-addressbook-view.h
+++ b/a11y/addressbook/ea-addressbook-view.h
@@ -22,7 +22,7 @@
 #ifndef __EA_ADDRESSBOOK_VIEW_H__
 #define __EA_ADDRESSBOOK_VIEW_H__
 
-#include <gtk/gtkaccessible.h>
+#include <gtk/gtk.h>
 #include "e-addressbook-view.h"
 
 #ifdef __cplusplus
diff --git a/a11y/addressbook/ea-minicard-view.c b/a11y/addressbook/ea-minicard-view.c
index 52f923eb24..7319e49b90 100644
--- a/a11y/addressbook/ea-minicard-view.c
+++ b/a11y/addressbook/ea-minicard-view.c
@@ -21,8 +21,7 @@
 
 #include <config.h>
 #include <string.h>
-#include <gtk/gtkaccessible.h>
-#include <glib/gstrfuncs.h>
+#include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include "ea-minicard.h"
 #include "ea-minicard-view.h"
diff --git a/a11y/calendar/ea-cal-view.c b/a11y/calendar/ea-cal-view.c
index 9ce7a11fc8..a995e3bc6e 100644
--- a/a11y/calendar/ea-cal-view.c
+++ b/a11y/calendar/ea-cal-view.c
@@ -29,7 +29,7 @@
 #include "e-week-view.h"
 #include "calendar-commands.h"
 #include "goto.h"
-#include <glib/gstrfuncs.h>
+#include <glib.h>
 #include <glib/gi18n.h>
 
 static void ea_cal_view_class_init (EaCalViewClass *klass);
diff --git a/a11y/calendar/ea-cal-view.h b/a11y/calendar/ea-cal-view.h
index 0d89dfdf65..b966b6db19 100644
--- a/a11y/calendar/ea-cal-view.h
+++ b/a11y/calendar/ea-cal-view.h
@@ -26,7 +26,7 @@
 #ifndef __EA_CAL_VIEW_H__
 #define __EA_CAL_VIEW_H__
 
-#include <gtk/gtkaccessible.h>
+#include <gtk/gtk.h>
 #include "e-calendar-view.h"
 
 #ifdef __cplusplus
diff --git a/a11y/calendar/ea-day-view.c b/a11y/calendar/ea-day-view.c
index 66537c0f3f..4f16cf6bc0 100644
--- a/a11y/calendar/ea-day-view.c
+++ b/a11y/calendar/ea-day-view.c
@@ -29,7 +29,7 @@
 #include "ea-calendar-helpers.h"
 #include "ea-gnome-calendar.h"
 #include "calendar-commands.h"
-#include <glib/gstrfuncs.h>
+#include <glib.h>
 #include <glib/gi18n.h>
 
 static void ea_day_view_class_init (EaDayViewClass *klass);
diff --git a/a11y/calendar/ea-gnome-calendar.c b/a11y/calendar/ea-gnome-calendar.c
index 6de483f952..02602f23f5 100644
--- a/a11y/calendar/ea-gnome-calendar.c
+++ b/a11y/calendar/ea-gnome-calendar.c
@@ -26,7 +26,7 @@
 #include "ea-gnome-calendar.h"
 #include "calendar-commands.h"
 #include <string.h>
-#include <gtk/gtknotebook.h>
+#include <gtk/gtk.h>
 #include <libecal/e-cal-time-util.h>
 #include <libedataserver/e-data-server-util.h>
 #include <glib/gi18n.h>
diff --git a/a11y/calendar/ea-gnome-calendar.h b/a11y/calendar/ea-gnome-calendar.h
index c70e95ab46..6a3cf201dd 100644
--- a/a11y/calendar/ea-gnome-calendar.h
+++ b/a11y/calendar/ea-gnome-calendar.h
@@ -26,7 +26,7 @@
 #ifndef __EA_GNOME_CALENDAR_H__
 #define __EA_GNOME_CALENDAR_H__
 
-#include <gtk/gtkaccessible.h>
+#include <gtk/gtk.h>
 #include "gnome-cal.h"
 
 #ifdef __cplusplus
diff --git a/a11y/e-table/gal-a11y-e-table.h b/a11y/e-table/gal-a11y-e-table.h
index 780cff4509..0e539d9628 100644
--- a/a11y/e-table/gal-a11y-e-table.h
+++ b/a11y/e-table/gal-a11y-e-table.h
@@ -9,10 +9,9 @@
 #ifndef __GAL_A11Y_E_TABLE_H__
 #define __GAL_A11Y_E_TABLE_H__
 
-#include <glib-object.h>
+#include <gtk/gtk.h>
 #include <atk/atkobject.h>
 #include <atk/atkcomponent.h>
-#include <gtk/gtkaccessible.h>
 
 #define GAL_A11Y_TYPE_E_TABLE            (gal_a11y_e_table_get_type ())
 #define GAL_A11Y_E_TABLE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAL_A11Y_TYPE_E_TABLE, GalA11yETable))
diff --git a/a11y/e-table/gal-a11y-e-tree.h b/a11y/e-table/gal-a11y-e-tree.h
index a9468ced54..952a4ea2b9 100644
--- a/a11y/e-table/gal-a11y-e-tree.h
+++ b/a11y/e-table/gal-a11y-e-tree.h
@@ -7,10 +7,9 @@
 #ifndef __GAL_A11Y_E_TREE_H__
 #define __GAL_A11Y_E_TREE_H__
 
-#include <glib-object.h>
+#include <gtk/gtk.h>
 #include <atk/atkobject.h>
 #include <atk/atkcomponent.h>
-#include <gtk/gtkaccessible.h>
 
 #define GAL_A11Y_TYPE_E_TREE            (gal_a11y_e_tree_get_type ())
 #define GAL_A11Y_E_TREE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAL_A11Y_TYPE_E_TREE, GalA11yETree))
diff --git a/a11y/widgets/ea-calendar-item.c b/a11y/widgets/ea-calendar-item.c
index 00cba1b477..761bbdf251 100644
--- a/a11y/widgets/ea-calendar-item.c
+++ b/a11y/widgets/ea-calendar-item.c
@@ -27,7 +27,7 @@
 #include <time.h>
 #include <string.h>
 #include <libgnomecanvas/gnome-canvas.h>
-#include <glib/gdate.h>
+#include <glib.h>
 #include <e-util/e-util.h>
 #include <glib/gi18n.h>
 #include <libedataserver/e-data-server-util.h>
diff --git a/a11y/widgets/ea-combo-button.c b/a11y/widgets/ea-combo-button.c
index 8a90700f41..affe328561 100644
--- a/a11y/widgets/ea-combo-button.c
+++ b/a11y/widgets/ea-combo-button.c
@@ -6,8 +6,7 @@
 
 #include <config.h>
 #include "ea-combo-button.h"
-#include <gtk/gtkbutton.h>
-#include <gtk/gtklabel.h>
+#include <gtk/gtk.h>
 #include <glib/gi18n.h>
 
 static AtkObjectClass *parent_class;
diff --git a/a11y/widgets/ea-combo-button.h b/a11y/widgets/ea-combo-button.h
index 8f4c279cba..7e1aec498e 100644
--- a/a11y/widgets/ea-combo-button.h
+++ b/a11y/widgets/ea-combo-button.h
@@ -7,7 +7,7 @@
 #ifndef __EA_COMBO_BUTTON_H_
 #define __EA_COMBO_BUTTON_H_
 
-#include <gtk/gtkaccessible.h>
+#include <gtk/gtk.h>
 #include <misc/e-combo-button.h>
 
 #define EA_TYPE_COMBO_BUTTON			(ea_combo_button_get_type ())
diff --git a/a11y/widgets/ea-expander.c b/a11y/widgets/ea-expander.c
index db174c37cb..c0046e9e9a 100644
--- a/a11y/widgets/ea-expander.c
+++ b/a11y/widgets/ea-expander.c
@@ -22,7 +22,6 @@
 
 #include <config.h>
 #include "ea-expander.h"
-#include <gtk/gtkbutton.h>
 #include <glib/gi18n.h>
 
 static AtkObjectClass *parent_class;
diff --git a/a11y/widgets/ea-expander.h b/a11y/widgets/ea-expander.h
index 5216161658..e91602594b 100644
--- a/a11y/widgets/ea-expander.h
+++ b/a11y/widgets/ea-expander.h
@@ -23,7 +23,7 @@
 #ifndef _EA_EXPANDER_H_
 #define _EA_EXPANDER_H_
 
-#include <gtk/gtkaccessible.h>
+#include <gtk/gtk.h>
 #include <misc/e-expander.h>
 
 #define EA_TYPE_EXPANDER           (ea_expander_get_type ())