include <gtk/gtk.h> instead of <gtk/gtkaccessible.h>

2008-05-28  Michael Natterer  <mitch@gimp.org>

	* modules/other/gail/gailwidget.h: include <gtk/gtk.h> instead of
	<gtk/gtkaccessible.h>

	* modules/other/gail/*.h: don't include anyting from gtk since all
	headers indirectly include gailwidget.h.

	* modules/other/gail/gailcellparent.c: include <gtk/gtk.h> instead
	of individual files.

	* modules/other/gail/gailcheckmenuitem.c
	* modules/other/gail/gailmenu.c
	* modules/other/gail/gailtreeview.c: remove all gtk includes since
	it's always included by including any gail header.


svn path=/trunk/; revision=20211

46 files changed, 4 insertions, 51 deletions

diff --git a/modules/other/gail/gailarrow.h b/modules/other/gail/gailarrow.h
index 91f8894bf1..f2bfa3e3f1 100644
--- a/modules/other/gail/gailarrow.h
+++ b/modules/other/gail/gailarrow.h
@@ -20,7 +20,6 @@
 #ifndef __GAIL_ARROW_H__
 #define __GAIL_ARROW_H__
 
-#include <gtk/gtkaccessible.h>
 #include <gail/gailwidget.h>
 
 G_BEGIN_DECLS
diff --git a/modules/other/gail/gailbox.h b/modules/other/gail/gailbox.h
index dd92ea7bcc..403f163b80 100644
--- a/modules/other/gail/gailbox.h
+++ b/modules/other/gail/gailbox.h
@@ -20,7 +20,6 @@
 #ifndef __GAIL_BOX_H__
 #define __GAIL_BOX_H__
 
-#include <gtk/gtkaccessible.h>
 #include <gail/gailcontainer.h>
 
 G_BEGIN_DECLS
diff --git a/modules/other/gail/gailbutton.h b/modules/other/gail/gailbutton.h
index 3ce770d47a..cf6d715ed7 100644
--- a/modules/other/gail/gailbutton.h
+++ b/modules/other/gail/gailbutton.h
@@ -20,7 +20,6 @@
 #ifndef __GAIL_BUTTON_H__
 #define __GAIL_BUTTON_H__
 
-#include <gtk/gtkaccessible.h>
 #include <gail/gailcontainer.h>
 #include <libgail-util/gailtextutil.h>
 
diff --git a/modules/other/gail/gailcalendar.h b/modules/other/gail/gailcalendar.h
index 352098c6c0..5a99976a0a 100644
--- a/modules/other/gail/gailcalendar.h
+++ b/modules/other/gail/gailcalendar.h
@@ -20,7 +20,6 @@
 #ifndef __GAIL_CALENDAR_H__
 #define __GAIL_CALENDAR_H__
 
-#include <gtk/gtkaccessible.h>
 #include <gail/gailcontainer.h>
 
 G_BEGIN_DECLS
diff --git a/modules/other/gail/gailcellparent.c b/modules/other/gail/gailcellparent.c
index 5ca6bb29a8..d67fff2e24 100644
--- a/modules/other/gail/gailcellparent.c
+++ b/modules/other/gail/gailcellparent.c
@@ -20,7 +20,7 @@
 
 #include <config.h>
 
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 #include "gailcellparent.h"
 
 GType
diff --git a/modules/other/gail/gailcheckmenuitem.c b/modules/other/gail/gailcheckmenuitem.c
index 362562d4ca..8befef914c 100644
--- a/modules/other/gail/gailcheckmenuitem.c
+++ b/modules/other/gail/gailcheckmenuitem.c
@@ -20,7 +20,6 @@
 #include <config.h>
 
 #include <string.h>
-#include <gtk/gtk.h>
 #include "gailcheckmenuitem.h"
 #include "gailchecksubmenuitem.h"
 
diff --git a/modules/other/gail/gailcheckmenuitem.h b/modules/other/gail/gailcheckmenuitem.h
index 5821ce77c2..e78d38fb3c 100644
--- a/modules/other/gail/gailcheckmenuitem.h
+++ b/modules/other/gail/gailcheckmenuitem.h
@@ -20,7 +20,6 @@
 #ifndef __GAIL_CHECK_MENU_ITEM_H__
 #define __GAIL_CHECK_MENU_ITEM_H__
 
-#include <gtk/gtkaccessible.h>
 #include <gail/gailmenuitem.h>
 
 G_BEGIN_DECLS
diff --git a/modules/other/gail/gailchecksubmenuitem.h b/modules/other/gail/gailchecksubmenuitem.h
index f46e66ff10..c77bd663cc 100644
--- a/modules/other/gail/gailchecksubmenuitem.h
+++ b/modules/other/gail/gailchecksubmenuitem.h
@@ -20,7 +20,6 @@
 #ifndef __GAIL_CHECK_SUB_MENU_ITEM_H__
 #define __GAIL_CHECK_SUB_MENU_ITEM_H__
 
-#include <gtk/gtkaccessible.h>
 #include <gail/gailsubmenuitem.h>
 
 G_BEGIN_DECLS
diff --git a/modules/other/gail/gailclist.h b/modules/other/gail/gailclist.h
index f51104ea22..44eba4d17f 100644
--- a/modules/other/gail/gailclist.h
+++ b/modules/other/gail/gailclist.h
@@ -20,7 +20,6 @@
 #ifndef __GAIL_CLIST_H__
 #define __GAIL_CLIST_H__
 
-#include <gtk/gtkaccessible.h>
 #include <gail/gailcontainer.h>
 
 G_BEGIN_DECLS
diff --git a/modules/other/gail/gailcombo.h b/modules/other/gail/gailcombo.h
index 3acc74b07b..e7155e87df 100644
--- a/modules/other/gail/gailcombo.h
+++ b/modules/other/gail/gailcombo.h
@@ -20,7 +20,6 @@
 #ifndef __GAIL_COMBO_H__
 #define __GAIL_COMBO_H__
 
-#include <gtk/gtkaccessible.h>
 #include <gail/gailcontainer.h>
 
 G_BEGIN_DECLS
diff --git a/modules/other/gail/gailcombobox.h b/modules/other/gail/gailcombobox.h
index b342715900..be8eae99eb 100644
--- a/modules/other/gail/gailcombobox.h
+++ b/modules/other/gail/gailcombobox.h
@@ -20,7 +20,6 @@
 #ifndef __GAIL_COMBO_BOX_H__
 #define __GAIL_COMBO_BOX_H__
 
-#include <gtk/gtkaccessible.h>
 #include <gail/gailcontainer.h>
 
 G_BEGIN_DECLS
diff --git a/modules/other/gail/gailcontainer.h b/modules/other/gail/gailcontainer.h
index 3ad738193d..58adc88eb3 100644
--- a/modules/other/gail/gailcontainer.h
+++ b/modules/other/gail/gailcontainer.h
@@ -20,7 +20,6 @@
 #ifndef __GAIL_CONTAINER_H__
 #define __GAIL_CONTAINER_H__
 
-#include <gtk/gtkaccessible.h>
 #include <gail/gailwidget.h>
 
 G_BEGIN_DECLS
diff --git a/modules/other/gail/gailentry.h b/modules/other/gail/gailentry.h
index 150025e50b..4387730c56 100644
--- a/modules/other/gail/gailentry.h
+++ b/modules/other/gail/gailentry.h
@@ -20,7 +20,6 @@
 #ifndef __GAIL_ENTRY_H__
 #define __GAIL_ENTRY_H__
 
-#include <gtk/gtkaccessible.h>
 #include <gail/gailwidget.h>
 #include <libgail-util/gailtextutil.h>
 
diff --git a/modules/other/gail/gailexpander.h b/modules/other/gail/gailexpander.h
index 721a115a21..0e958b5f77 100644
--- a/modules/other/gail/gailexpander.h
+++ b/modules/other/gail/gailexpander.h
@@ -20,7 +20,6 @@
 #ifndef __GAIL_EXPANDER_H__
 #define __GAIL_EXPANDER_H__
 
-#include <gtk/gtkaccessible.h>
 #include <gail/gailcontainer.h>
 #include <libgail-util/gailtextutil.h>
 
diff --git a/modules/other/gail/gailframe.h b/modules/other/gail/gailframe.h
index 49f2b55d0f..4c832ed537 100644
--- a/modules/other/gail/gailframe.h
+++ b/modules/other/gail/gailframe.h
@@ -20,7 +20,6 @@
 #ifndef __GAIL_FRAME_H__
 #define __GAIL_FRAME_H__
 
-#include <gtk/gtkaccessible.h>
 #include <gail/gailcontainer.h>
 
 G_BEGIN_DECLS
diff --git a/modules/other/gail/gailimage.h b/modules/other/gail/gailimage.h
index 9feadd44f7..d3d2b523c4 100644
--- a/modules/other/gail/gailimage.h
+++ b/modules/other/gail/gailimage.h
@@ -20,7 +20,6 @@
 #ifndef __GAIL_IMAGE_H__
 #define __GAIL_IMAGE_H__
 
-#include <gtk/gtkaccessible.h>
 #include <gail/gailwidget.h>
 
 G_BEGIN_DECLS
diff --git a/modules/other/gail/gailimagecell.h b/modules/other/gail/gailimagecell.h
index d6f3ebc2cd..f317801320 100644
--- a/modules/other/gail/gailimagecell.h
+++ b/modules/other/gail/gailimagecell.h
@@ -31,7 +31,7 @@ G_BEGIN_DECLS
 #define GAIL_IS_IMAGE_CELL(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GAIL_TYPE_IMAGE_CELL))
 #define GAIL_IS_IMAGE_CELL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GAIL_TYPE_IMAGE_CELL))78
 #define GAIL_IMAGE_CELL_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GAIL_TYPE_IMAGE_CELL, GailImageCellClass))
-  
+
 typedef struct _GailImageCell                  GailImageCell;
 typedef struct _GailImageCellClass             GailImageCellClass;
 
diff --git a/modules/other/gail/gailitem.h b/modules/other/gail/gailitem.h
index 08b0eb647e..c356279a2a 100644
--- a/modules/other/gail/gailitem.h
+++ b/modules/other/gail/gailitem.h
@@ -20,7 +20,6 @@
 #ifndef __GAIL_ITEM_H__
 #define __GAIL_ITEM_H__
 
-#include <gtk/gtkaccessible.h>
 #include <gail/gailcontainer.h>
 #include <libgail-util/gailtextutil.h>
 
diff --git a/modules/other/gail/gaillabel.h b/modules/other/gail/gaillabel.h
index 24e2af7f7f..1706aa5f3c 100644
--- a/modules/other/gail/gaillabel.h
+++ b/modules/other/gail/gaillabel.h
@@ -20,7 +20,6 @@
 #ifndef __GAIL_LABEL_H__
 #define __GAIL_LABEL_H__
 
-#include <gtk/gtkaccessible.h>
 #include <gail/gailwidget.h>
 #include <libgail-util/gailtextutil.h>
 
diff --git a/modules/other/gail/gaillist.h b/modules/other/gail/gaillist.h
index d2e2ce5bdb..e33e87cbc1 100644
--- a/modules/other/gail/gaillist.h
+++ b/modules/other/gail/gaillist.h
@@ -20,7 +20,6 @@
 #ifndef __GAIL_LIST_H__
 #define __GAIL_LIST_H__
 
-#include <gtk/gtkaccessible.h>
 #include <gail/gailcontainer.h>
 
 G_BEGIN_DECLS
diff --git a/modules/other/gail/gailmenu.c b/modules/other/gail/gailmenu.c
index 57de76d681..32de2905f4 100644
--- a/modules/other/gail/gailmenu.c
+++ b/modules/other/gail/gailmenu.c
@@ -19,10 +19,6 @@
 
 #include <config.h>
 
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkoptionmenu.h>
-#include <gtk/gtkcombobox.h>
 #include "gailmenu.h"
 
 static void gail_menu_class_init (GailMenuClass *klass);
diff --git a/modules/other/gail/gailmenu.h b/modules/other/gail/gailmenu.h
index f25aae5422..7efed5e7fa 100644
--- a/modules/other/gail/gailmenu.h
+++ b/modules/other/gail/gailmenu.h
@@ -20,7 +20,6 @@
 #ifndef __GAIL_MENU_H__
 #define __GAIL_MENU_H__
 
-#include <gtk/gtkaccessible.h>
 #include <gail/gailmenushell.h>
 
 G_BEGIN_DECLS
diff --git a/modules/other/gail/gailmenuitem.h b/modules/other/gail/gailmenuitem.h
index fd011bebac..5f83db7520 100644
--- a/modules/other/gail/gailmenuitem.h
+++ b/modules/other/gail/gailmenuitem.h
@@ -20,7 +20,6 @@
 #ifndef __GAIL_MENU_ITEM_H__
 #define __GAIL_MENU_ITEM_H__
 
-#include <gtk/gtkaccessible.h>
 #include <gail/gailitem.h>
 
 G_BEGIN_DECLS
diff --git a/modules/other/gail/gailmenushell.h b/modules/other/gail/gailmenushell.h
index 17b32c6c0e..53e39f67ac 100644
--- a/modules/other/gail/gailmenushell.h
+++ b/modules/other/gail/gailmenushell.h
@@ -20,7 +20,6 @@
 #ifndef __GAIL_MENU_SHELL_H__
 #define __GAIL_MENU_SHELL_H__
 
-#include <gtk/gtkaccessible.h>
 #include <gail/gailcontainer.h>
 
 G_BEGIN_DECLS
diff --git a/modules/other/gail/gailnotebook.h b/modules/other/gail/gailnotebook.h
index db6ebe276c..36cd4c6753 100644
--- a/modules/other/gail/gailnotebook.h
+++ b/modules/other/gail/gailnotebook.h
@@ -20,7 +20,6 @@
 #ifndef __GAIL_NOTEBOOK_H__
 #define __GAIL_NOTEBOOK_H__
 
-#include <gtk/gtkaccessible.h>
 #include <gail/gailcontainer.h>
 
 G_BEGIN_DECLS
@@ -38,7 +37,7 @@ typedef struct _GailNotebookClass         GailNotebookClass;
 struct _GailNotebook
 {
   GailContainer parent;
-  
+
   /*
    * page_cache maintains a list of pre-ref'd Notebook Pages.
    * This cache is queried by gail_notebook_ref_child().
diff --git a/modules/other/gail/gailnotebookpage.h b/modules/other/gail/gailnotebookpage.h
index 9210c65e05..38e2acfb88 100644
--- a/modules/other/gail/gailnotebookpage.h
+++ b/modules/other/gail/gailnotebookpage.h
@@ -20,8 +20,6 @@
 #ifndef __GAIL_NOTEBOOK_PAGE_H__
 #define __GAIL_NOTEBOOK_PAGE_H__
 
-#include <atk/atk.h>
-#include <gtk/gtknotebook.h>
 #include <gail/gailnotebook.h>
 #include <libgail-util/gailtextutil.h>
 
diff --git a/modules/other/gail/gailoptionmenu.h b/modules/other/gail/gailoptionmenu.h
index 608ec26af3..1939a9aaed 100644
--- a/modules/other/gail/gailoptionmenu.h
+++ b/modules/other/gail/gailoptionmenu.h
@@ -20,7 +20,6 @@
 #ifndef __GAIL_OPTION_MENU_H__
 #define __GAIL_OPTION_MENU_H__
 
-#include <gtk/gtkaccessible.h>
 #include <gail/gailbutton.h>
 
 G_BEGIN_DECLS
diff --git a/modules/other/gail/gailpaned.h b/modules/other/gail/gailpaned.h
index 250e890dcd..bb4412f004 100644
--- a/modules/other/gail/gailpaned.h
+++ b/modules/other/gail/gailpaned.h
@@ -20,7 +20,6 @@
 #ifndef __GAIL_PANED_H__
 #define __GAIL_PANED_H__
 
-#include <gtk/gtkaccessible.h>
 #include <gail/gailcontainer.h>
 
 G_BEGIN_DECLS
diff --git a/modules/other/gail/gailpixmap.h b/modules/other/gail/gailpixmap.h
index 8a4df448dd..41cdcd8f02 100644
--- a/modules/other/gail/gailpixmap.h
+++ b/modules/other/gail/gailpixmap.h
@@ -20,7 +20,6 @@
 #ifndef __GAIL_PIXMAP_H__
 #define __GAIL_PIXMAP_H__
 
-#include <gtk/gtkaccessible.h>
 #include <gail/gailwidget.h>
 
 G_BEGIN_DECLS
diff --git a/modules/other/gail/gailprogressbar.h b/modules/other/gail/gailprogressbar.h
index 27b578a1f2..37e096a6db 100644
--- a/modules/other/gail/gailprogressbar.h
+++ b/modules/other/gail/gailprogressbar.h
@@ -20,7 +20,6 @@
 #ifndef __GAIL_PROGRESS_BAR_H__
 #define __GAIL_PROGRESS_BAR_H__
 
-#include <gtk/gtkaccessible.h>
 #include <gail/gailwidget.h>
 
 G_BEGIN_DECLS
diff --git a/modules/other/gail/gailradiobutton.h b/modules/other/gail/gailradiobutton.h
index 938c2830b5..0a4fe21545 100644
--- a/modules/other/gail/gailradiobutton.h
+++ b/modules/other/gail/gailradiobutton.h
@@ -20,7 +20,6 @@
 #ifndef __GAIL_RADIO_BUTTON_H__
 #define __GAIL_RADIO_BUTTON_H__
 
-#include <gtk/gtkaccessible.h>
 #include <gail/gailtogglebutton.h>
 
 G_BEGIN_DECLS
diff --git a/modules/other/gail/gailradiomenuitem.h b/modules/other/gail/gailradiomenuitem.h
index 332d81f82d..8dfa6880e6 100644
--- a/modules/other/gail/gailradiomenuitem.h
+++ b/modules/other/gail/gailradiomenuitem.h
@@ -20,7 +20,6 @@
 #ifndef __GAIL_RADIO_MENU_ITEM_H__
 #define __GAIL_RADIO_MENU_ITEM_H__
 
-#include <gtk/gtkaccessible.h>
 #include <gail/gailcheckmenuitem.h>
 
 G_BEGIN_DECLS
diff --git a/modules/other/gail/gailradiosubmenuitem.h b/modules/other/gail/gailradiosubmenuitem.h
index 5bcf168b40..2433a3ba04 100644
--- a/modules/other/gail/gailradiosubmenuitem.h
+++ b/modules/other/gail/gailradiosubmenuitem.h
@@ -20,7 +20,6 @@
 #ifndef __GAIL_RADIO_SUB_MENU_ITEM_H__
 #define __GAIL_RADIO_SUB_MENU_ITEM_H__
 
-#include <gtk/gtkaccessible.h>
 #include <gail/gailchecksubmenuitem.h>
 
 G_BEGIN_DECLS
diff --git a/modules/other/gail/gailrange.h b/modules/other/gail/gailrange.h
index 5e6bc0de17..7761265cd9 100644
--- a/modules/other/gail/gailrange.h
+++ b/modules/other/gail/gailrange.h
@@ -20,7 +20,6 @@
 #ifndef __GAIL_RANGE_H__
 #define __GAIL_RANGE_H__
 
-#include <gtk/gtkaccessible.h>
 #include <gail/gailwidget.h>
 
 G_BEGIN_DECLS
diff --git a/modules/other/gail/gailscale.h b/modules/other/gail/gailscale.h
index b670a42bfc..fd0252f1c2 100644
--- a/modules/other/gail/gailscale.h
+++ b/modules/other/gail/gailscale.h
@@ -20,7 +20,6 @@
 #ifndef __GAIL_SCALE_H__
 #define __GAIL_SCALE_H__
 
-#include <gtk/gtkaccessible.h>
 #include <gail/gailrange.h>
 #include <libgail-util/gailtextutil.h>
 
diff --git a/modules/other/gail/gailscrollbar.h b/modules/other/gail/gailscrollbar.h
index 37830e62eb..bfcf1758a0 100644
--- a/modules/other/gail/gailscrollbar.h
+++ b/modules/other/gail/gailscrollbar.h
@@ -20,7 +20,6 @@
 #ifndef __GAIL_SCROLLBAR_H__
 #define __GAIL_SCROLLBAR_H__
 
-#include <gtk/gtkaccessible.h>
 #include <gail/gailrange.h>
 
 G_BEGIN_DECLS
diff --git a/modules/other/gail/gailscrolledwindow.h b/modules/other/gail/gailscrolledwindow.h
index 5d8b7c078c..f7c456dda1 100644
--- a/modules/other/gail/gailscrolledwindow.h
+++ b/modules/other/gail/gailscrolledwindow.h
@@ -20,7 +20,6 @@
 #ifndef __GAIL_SCROLLED_WINDOW_H__
 #define __GAIL_SCROLLED_WINDOW_H__
 
-#include <gtk/gtkaccessible.h>
 #include <gail/gailcontainer.h>
 
 G_BEGIN_DECLS
diff --git a/modules/other/gail/gailseparator.h b/modules/other/gail/gailseparator.h
index 46a7882546..67db371ba2 100644
--- a/modules/other/gail/gailseparator.h
+++ b/modules/other/gail/gailseparator.h
@@ -20,7 +20,6 @@
 #ifndef __GAIL_SEPARATOR_H__
 #define __GAIL_SEPARATOR_H__
 
-#include <gtk/gtkaccessible.h>
 #include <gail/gailwidget.h>
 
 G_BEGIN_DECLS
diff --git a/modules/other/gail/gailspinbutton.h b/modules/other/gail/gailspinbutton.h
index 3dac8d18e6..fecda124a2 100644
--- a/modules/other/gail/gailspinbutton.h
+++ b/modules/other/gail/gailspinbutton.h
@@ -20,7 +20,6 @@
 #ifndef __GAIL_SPIN_BUTTON_H__
 #define __GAIL_SPIN_BUTTON_H__
 
-#include <gtk/gtkaccessible.h>
 #include <gail/gailentry.h>
 
 G_BEGIN_DECLS
diff --git a/modules/other/gail/gailstatusbar.h b/modules/other/gail/gailstatusbar.h
index 6078731369..c8f2d9c9d1 100644
--- a/modules/other/gail/gailstatusbar.h
+++ b/modules/other/gail/gailstatusbar.h
@@ -20,7 +20,6 @@
 #ifndef __GAIL_STATUSBAR_H__
 #define __GAIL_STATUSBAR_H__
 
-#include <gtk/gtkaccessible.h>
 #include <gail/gailcontainer.h>
 #include <libgail-util/gailtextutil.h>
 
diff --git a/modules/other/gail/gailsubmenuitem.h b/modules/other/gail/gailsubmenuitem.h
index 963839e79f..64cd66cb28 100644
--- a/modules/other/gail/gailsubmenuitem.h
+++ b/modules/other/gail/gailsubmenuitem.h
@@ -20,7 +20,6 @@
 #ifndef __GAIL_SUB_MENU_ITEM_H__
 #define __GAIL_SUB_MENU_ITEM_H__
 
-#include <gtk/gtkaccessible.h>
 #include <gail/gailmenuitem.h>
 
 G_BEGIN_DECLS
diff --git a/modules/other/gail/gailtextview.h b/modules/other/gail/gailtextview.h
index 273694dff0..5a88aba232 100644
--- a/modules/other/gail/gailtextview.h
+++ b/modules/other/gail/gailtextview.h
@@ -20,7 +20,6 @@
 #ifndef __GAIL_TEXT_VIEW_H__
 #define __GAIL_TEXT_VIEW_H__
 
-#include <gtk/gtkaccessible.h>
 #include <gail/gailcontainer.h>
 #include <libgail-util/gailtextutil.h>
 
diff --git a/modules/other/gail/gailtogglebutton.h b/modules/other/gail/gailtogglebutton.h
index aa93210bd0..6c16382823 100644
--- a/modules/other/gail/gailtogglebutton.h
+++ b/modules/other/gail/gailtogglebutton.h
@@ -20,7 +20,6 @@
 #ifndef __GAIL_TOGGLE_BUTTON_H__
 #define __GAIL_TOGGLE_BUTTON_H__
 
-#include <gtk/gtkaccessible.h>
 #include <gail/gailbutton.h>
 
 G_BEGIN_DECLS
diff --git a/modules/other/gail/gailtreeview.c b/modules/other/gail/gailtreeview.c
index a380dbf65d..af9c058341 100644
--- a/modules/other/gail/gailtreeview.c
+++ b/modules/other/gail/gailtreeview.c
@@ -24,7 +24,6 @@
 #ifdef GDK_WINDOWING_X11
 #include <gdk/x11/gdkx.h>
 #endif
-#include <gtk/gtktreeviewcolumn.h>
 #include "gailtreeview.h"
 #include "gailrenderercell.h"
 #include "gailbooleancell.h"
diff --git a/modules/other/gail/gailwidget.h b/modules/other/gail/gailwidget.h
index bf046872f6..ddc8f3a82a 100644
--- a/modules/other/gail/gailwidget.h
+++ b/modules/other/gail/gailwidget.h
@@ -20,7 +20,7 @@
 #ifndef __GAIL_WIDGET_H__
 #define __GAIL_WIDGET_H__
 
-#include <gtk/gtkaccessible.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
diff --git a/modules/other/gail/gailwindow.h b/modules/other/gail/gailwindow.h
index 923554add2..b417ae89d5 100644
--- a/modules/other/gail/gailwindow.h
+++ b/modules/other/gail/gailwindow.h
@@ -20,7 +20,6 @@
 #ifndef __GAIL_WINDOW_H__
 #define __GAIL_WINDOW_H__
 
-#include <gtk/gtkaccessible.h>
 #include <gail/gailcontainer.h>
 
 G_BEGIN_DECLS