Fix inter-header includes

Since we are going to install these headers soon, we need
to make their mutual includes work in the installed location
as well. Also, avoid including individual gtk headers, to
avoid trouble with single-include guards.

50 files changed, 54 insertions, 55 deletions

diff --git a/gtk/a11y/gtkarrowaccessible.h b/gtk/a11y/gtkarrowaccessible.h
index 59f1ad35fd..151f419e91 100644
--- a/gtk/a11y/gtkarrowaccessible.h
+++ b/gtk/a11y/gtkarrowaccessible.h
@@ -18,7 +18,7 @@
 #ifndef __GTK_ARROW_ACCESSIBLE_H__
 #define __GTK_ARROW_ACCESSIBLE_H__
 
-#include "gtkwidgetaccessible.h"
+#include <gtk/a11y/gtkwidgetaccessible.h>
 
 G_BEGIN_DECLS
 
diff --git a/gtk/a11y/gtkbooleancellaccessible.h b/gtk/a11y/gtkbooleancellaccessible.h
index 120c49250c..7bef74ffc9 100644
--- a/gtk/a11y/gtkbooleancellaccessible.h
+++ b/gtk/a11y/gtkbooleancellaccessible.h
@@ -19,7 +19,7 @@
 #define __GTK_BOOLEAN_CELL_ACCESSIBLE_H__
 
 #include <atk/atk.h>
-#include "gtkrenderercellaccessible.h"
+#include <gtk/a11y/gtkrenderercellaccessible.h>
 
 G_BEGIN_DECLS
 
diff --git a/gtk/a11y/gtkbuttonaccessible.h b/gtk/a11y/gtkbuttonaccessible.h
index 12019753cb..e8fe21cd21 100644
--- a/gtk/a11y/gtkbuttonaccessible.h
+++ b/gtk/a11y/gtkbuttonaccessible.h
@@ -18,7 +18,7 @@
 #ifndef __GTK_BUTTON_ACCESSIBLE_H__
 #define __GTK_BUTTON_ACCESSIBLE_H__
 
-#include "gtkcontaineraccessible.h"
+#include <gtk/a11y/gtkcontaineraccessible.h>
 
 G_BEGIN_DECLS
 
diff --git a/gtk/a11y/gtkcellaccessible.h b/gtk/a11y/gtkcellaccessible.h
index 27a174d477..caa1cc6e61 100644
--- a/gtk/a11y/gtkcellaccessible.h
+++ b/gtk/a11y/gtkcellaccessible.h
@@ -19,7 +19,7 @@
 #define __GTK_CELL_ACCESSIBLE_H__
 
 #include <atk/atk.h>
-#include "gtk/gtkaccessible.h"
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
diff --git a/gtk/a11y/gtkcellaccessibleparent.h b/gtk/a11y/gtkcellaccessibleparent.h
index 7751ad395d..07a5b004d9 100644
--- a/gtk/a11y/gtkcellaccessibleparent.h
+++ b/gtk/a11y/gtkcellaccessibleparent.h
@@ -19,7 +19,7 @@
 #define __GTK_CELL_ACCESSIBLE_PARENT_H__
 
 #include <atk/atk.h>
-#include "gtkcellaccessible.h"
+#include <gtk/a11y/gtkcellaccessible.h>
 
 G_BEGIN_DECLS
 
diff --git a/gtk/a11y/gtkcellaccessibleprivate.h b/gtk/a11y/gtkcellaccessibleprivate.h
index 79c6b98474..e4417faeda 100644
--- a/gtk/a11y/gtkcellaccessibleprivate.h
+++ b/gtk/a11y/gtkcellaccessibleprivate.h
@@ -18,7 +18,7 @@
 #ifndef __GTK_CELL_ACCESSIBLE_PRIVATE_H__
 #define __GTK_CELL_ACCESSIBLE_PRIVATE_H__
 
-#include "gtkcellaccessible.h"
+#include <gtk/a11y/gtkcellaccessible.h>
 
 G_BEGIN_DECLS
 
diff --git a/gtk/a11y/gtkcheckmenuitemaccessible.h b/gtk/a11y/gtkcheckmenuitemaccessible.h
index 0e1207c2ec..6d2516cb29 100644
--- a/gtk/a11y/gtkcheckmenuitemaccessible.h
+++ b/gtk/a11y/gtkcheckmenuitemaccessible.h
@@ -18,7 +18,7 @@
 #ifndef __GTK_CHECK_MENU_ITEM_ACCESSIBLE_H__
 #define __GTK_CHECK_MENU_ITEM_ACCESSIBLE_H__
 
-#include "gtkmenuitemaccessible.h"
+#include <gtk/a11y/gtkmenuitemaccessible.h>
 
 G_BEGIN_DECLS
 
diff --git a/gtk/a11y/gtkcolorswatchaccessible.h b/gtk/a11y/gtkcolorswatchaccessible.h
index 13c3447af2..123f65f7a8 100644
--- a/gtk/a11y/gtkcolorswatchaccessible.h
+++ b/gtk/a11y/gtkcolorswatchaccessible.h
@@ -18,7 +18,7 @@
 #ifndef __GTK_COLOR_SWATCH_ACCESSIBLE_H__
 #define __GTK_COLOR_SWATCH_ACCESSIBLE_H__
 
-#include "gtkwidgetaccessible.h"
+#include <gtk/a11y/gtkwidgetaccessible.h>
 
 G_BEGIN_DECLS
 
diff --git a/gtk/a11y/gtkcomboboxaccessible.h b/gtk/a11y/gtkcomboboxaccessible.h
index afd852e866..214f5eb4ad 100644
--- a/gtk/a11y/gtkcomboboxaccessible.h
+++ b/gtk/a11y/gtkcomboboxaccessible.h
@@ -18,7 +18,7 @@
 #ifndef __GTK_COMBO_BOX_ACCESSIBLE_H__
 #define __GTK_COMBO_BOX_ACCESSIBLE_H__
 
-#include "gtkcontaineraccessible.h"
+#include <gtk/a11y/gtkcontaineraccessible.h>
 
 G_BEGIN_DECLS
 
diff --git a/gtk/a11y/gtkcontaineraccessible.h b/gtk/a11y/gtkcontaineraccessible.h
index 108bbdd250..605f22e0fb 100644
--- a/gtk/a11y/gtkcontaineraccessible.h
+++ b/gtk/a11y/gtkcontaineraccessible.h
@@ -18,8 +18,8 @@
 #ifndef __GTK_CONTAINER_ACCESSIBLE_H__
 #define __GTK_CONTAINER_ACCESSIBLE_H__
 
-#include "gtkcontainer.h"
-#include "gtkwidgetaccessible.h"
+#include <gtk/gtk.h>
+#include <gtk/a11y/gtkwidgetaccessible.h>
 
 G_BEGIN_DECLS
 
diff --git a/gtk/a11y/gtkcontainercellaccessible.h b/gtk/a11y/gtkcontainercellaccessible.h
index 63883a54fe..7f78f77c47 100644
--- a/gtk/a11y/gtkcontainercellaccessible.h
+++ b/gtk/a11y/gtkcontainercellaccessible.h
@@ -19,7 +19,7 @@
 #define __GTK_CONTAINER_CELL_ACCESSIBLE_H__
 
 #include <atk/atk.h>
-#include "gtkcellaccessible.h"
+#include <gtk/a11y/gtkcellaccessible.h>
 
 G_BEGIN_DECLS
 
diff --git a/gtk/a11y/gtkentryaccessible.h b/gtk/a11y/gtkentryaccessible.h
index 74f995ea1b..30cdfd8847 100644
--- a/gtk/a11y/gtkentryaccessible.h
+++ b/gtk/a11y/gtkentryaccessible.h
@@ -18,7 +18,7 @@
 #ifndef __GTK_ENTRY_ACCESSIBLE_H__
 #define __GTK_ENTRY_ACCESSIBLE_H__
 
-#include "gtkwidgetaccessible.h"
+#include <gtk/a11y/gtkwidgetaccessible.h>
 
 G_BEGIN_DECLS
 
diff --git a/gtk/a11y/gtkexpanderaccessible.h b/gtk/a11y/gtkexpanderaccessible.h
index 0723ae452a..b110c24206 100644
--- a/gtk/a11y/gtkexpanderaccessible.h
+++ b/gtk/a11y/gtkexpanderaccessible.h
@@ -18,7 +18,7 @@
 #ifndef __GTK_EXPANDER_ACCESSIBLE_H__
 #define __GTK_EXPANDER_ACCESSIBLE_H__
 
-#include "gtkcontaineraccessible.h"
+#include <gtk/a11y/gtkcontaineraccessible.h>
 
 G_BEGIN_DECLS
 
diff --git a/gtk/a11y/gtkframeaccessible.h b/gtk/a11y/gtkframeaccessible.h
index c25f2e1f0f..e82119e3f5 100644
--- a/gtk/a11y/gtkframeaccessible.h
+++ b/gtk/a11y/gtkframeaccessible.h
@@ -18,7 +18,7 @@
 #ifndef __GTK_FRAME_ACCESSIBLE_H__
 #define __GTK_FRAME_ACCESSIBLE_H__
 
-#include "gtkcontaineraccessible.h"
+#include <gtk/a11y/gtkcontaineraccessible.h>
 
 G_BEGIN_DECLS
 
diff --git a/gtk/a11y/gtkiconviewaccessible.h b/gtk/a11y/gtkiconviewaccessible.h
index 8e4e9b7e0a..0474b3d393 100644
--- a/gtk/a11y/gtkiconviewaccessible.h
+++ b/gtk/a11y/gtkiconviewaccessible.h
@@ -18,8 +18,8 @@
 #ifndef __GTK_ICON_VIEW_ACCESSIBLE_H__
 #define __GTK_ICON_VIEW_ACCESSIBLE_H__
 
-#include "gtkcontaineraccessible.h"
-#include "gtk/gtkiconview.h"
+#include <gtk/gtk.h>
+#include <gtk/a11y/gtkcontaineraccessible.h>
 
 G_BEGIN_DECLS
 
diff --git a/gtk/a11y/gtkiconviewaccessibleprivate.h b/gtk/a11y/gtkiconviewaccessibleprivate.h
index 64ad8f38f0..c8a2421689 100644
--- a/gtk/a11y/gtkiconviewaccessibleprivate.h
+++ b/gtk/a11y/gtkiconviewaccessibleprivate.h
@@ -18,7 +18,7 @@
 #ifndef __GTK_ICON_VIEW_ACCESSIBLE_PRIVATE_H__
 #define __GTK_ICON_VIEW_ACCESSIBLE_PRIVATE_H__
 
-#include "gtkiconviewaccessible.h"
+#include <gtk/a11y/gtkiconviewaccessible.h>
 
 G_BEGIN_DECLS
 
diff --git a/gtk/a11y/gtkimageaccessible.h b/gtk/a11y/gtkimageaccessible.h
index 1e47da2803..dae9cdc6f5 100644
--- a/gtk/a11y/gtkimageaccessible.h
+++ b/gtk/a11y/gtkimageaccessible.h
@@ -18,7 +18,7 @@
 #ifndef __GTK_IMAGE_ACCESSIBLE_H__
 #define __GTK_IMAGE_ACCESSIBLE_H__
 
-#include "gtkwidgetaccessible.h"
+#include <gtk/a11y/gtkwidgetaccessible.h>
 
 G_BEGIN_DECLS
 
diff --git a/gtk/a11y/gtkimagecellaccessible.h b/gtk/a11y/gtkimagecellaccessible.h
index e18053445d..b1db0f7b1d 100644
--- a/gtk/a11y/gtkimagecellaccessible.h
+++ b/gtk/a11y/gtkimagecellaccessible.h
@@ -19,7 +19,7 @@
 #define __GTK_IMAGE_CELL_ACCESSIBLE_H__
 
 #include <atk/atk.h>
-#include "gtkrenderercellaccessible.h"
+#include <gtk/a11y/gtkrenderercellaccessible.h>
 
 G_BEGIN_DECLS
 
diff --git a/gtk/a11y/gtklabelaccessible.h b/gtk/a11y/gtklabelaccessible.h
index 4846cfa38d..7f38ce32b1 100644
--- a/gtk/a11y/gtklabelaccessible.h
+++ b/gtk/a11y/gtklabelaccessible.h
@@ -18,7 +18,7 @@
 #ifndef __GTK_LABEL_ACCESSIBLE_H__
 #define __GTK_LABEL_ACCESSIBLE_H__
 
-#include "gtkwidgetaccessible.h"
+#include <gtk/a11y/gtkwidgetaccessible.h>
 
 G_BEGIN_DECLS
 
diff --git a/gtk/a11y/gtklinkbuttonaccessible.h b/gtk/a11y/gtklinkbuttonaccessible.h
index 78a4f1184b..b3eb7b8130 100644
--- a/gtk/a11y/gtklinkbuttonaccessible.h
+++ b/gtk/a11y/gtklinkbuttonaccessible.h
@@ -18,7 +18,7 @@
 #ifndef __GTK_LINK_BUTTON_ACCESSIBLE_H__
 #define __GTK_LINK_BUTTON_ACCESSIBLE_H__
 
-#include "gtkbuttonaccessible.h"
+#include <gtk/a11y/gtkbuttonaccessible.h>
 
 G_BEGIN_DECLS
 
diff --git a/gtk/a11y/gtklockbuttonaccessible.h b/gtk/a11y/gtklockbuttonaccessible.h
index 3a754bd325..c275072de6 100644
--- a/gtk/a11y/gtklockbuttonaccessible.h
+++ b/gtk/a11y/gtklockbuttonaccessible.h
@@ -18,8 +18,8 @@
 #ifndef __GTK_LOCK_BUTTON_ACCESSIBLE_H__
 #define __GTK_LOCK_BUTTON_ACCESSIBLE_H__
 
-#include "gtkbuttonaccessible.h"
-#include "gtk/gtklockbutton.h"
+#include <gtk/gtk.h>
+#include <gtk/a11y/gtkbuttonaccessible.h>
 
 G_BEGIN_DECLS
 
diff --git a/gtk/a11y/gtklockbuttonaccessibleprivate.h b/gtk/a11y/gtklockbuttonaccessibleprivate.h
index ced2355923..80194c1edc 100644
--- a/gtk/a11y/gtklockbuttonaccessibleprivate.h
+++ b/gtk/a11y/gtklockbuttonaccessibleprivate.h
@@ -18,7 +18,7 @@
 #ifndef __GTK_LOCK_BUTTON_ACCESSIBLE_PRIVATE_H__
 #define __GTK_LOCK_BUTTON_ACCESSIBLE_PRIVATE_H__
 
-#include "gtklockbuttonaccessible.h"
+#include <gtk/a11y/gtklockbuttonaccessible.h>
 
 G_BEGIN_DECLS
 
diff --git a/gtk/a11y/gtkmenuaccessible.h b/gtk/a11y/gtkmenuaccessible.h
index f221d7f919..8b6556faa4 100644
--- a/gtk/a11y/gtkmenuaccessible.h
+++ b/gtk/a11y/gtkmenuaccessible.h
@@ -18,8 +18,8 @@
 #ifndef __GTK_MENU_ACCESSIBLE_H__
 #define __GTK_MENU_ACCESSIBLE_H__
 
-#include "gtkmenu.h"
-#include "gtkmenushellaccessible.h"
+#include <gtk/gtk.h>
+#include <gtk/a11y/gtkmenushellaccessible.h>
 
 G_BEGIN_DECLS
 
diff --git a/gtk/a11y/gtkmenuitemaccessible.h b/gtk/a11y/gtkmenuitemaccessible.h
index 1b3113dabf..7f12ebdb23 100644
--- a/gtk/a11y/gtkmenuitemaccessible.h
+++ b/gtk/a11y/gtkmenuitemaccessible.h
@@ -18,7 +18,7 @@
 #ifndef __GTK_MENU_ITEM_ACCESSIBLE_H__
 #define __GTK_MENU_ITEM_ACCESSIBLE_H__
 
-#include "gtkcontaineraccessible.h"
+#include <gtk/a11y/gtkcontaineraccessible.h>
 
 G_BEGIN_DECLS
 
diff --git a/gtk/a11y/gtkmenushellaccessible.h b/gtk/a11y/gtkmenushellaccessible.h
index 64d5cb4804..393ce4bb3b 100644
--- a/gtk/a11y/gtkmenushellaccessible.h
+++ b/gtk/a11y/gtkmenushellaccessible.h
@@ -18,7 +18,7 @@
 #ifndef __GTK_MENU_SHELL_ACCESSIBLE_H__
 #define __GTK_MENU_SHELL_ACCESSIBLE_H__
 
-#include "gtkcontaineraccessible.h"
+#include <gtk/a11y/gtkcontaineraccessible.h>
 
 G_BEGIN_DECLS
 
diff --git a/gtk/a11y/gtknotebookaccessible.h b/gtk/a11y/gtknotebookaccessible.h
index f279a1ede8..60146a7a2d 100644
--- a/gtk/a11y/gtknotebookaccessible.h
+++ b/gtk/a11y/gtknotebookaccessible.h
@@ -18,7 +18,7 @@
 #ifndef __GTK_NOTEBOOK_ACCESSIBLE_H__
 #define __GTK_NOTEBOOK_ACCESSIBLE_H__
 
-#include "gtkcontaineraccessible.h"
+#include <gtk/a11y/gtkcontaineraccessible.h>
 
 G_BEGIN_DECLS
 
diff --git a/gtk/a11y/gtknotebookpageaccessible.h b/gtk/a11y/gtknotebookpageaccessible.h
index 26d6bf9172..63db83677e 100644
--- a/gtk/a11y/gtknotebookpageaccessible.h
+++ b/gtk/a11y/gtknotebookpageaccessible.h
@@ -18,7 +18,7 @@
 #ifndef __GTK_NOTEBOOK_PAGE_ACCESSIBLE_H__
 #define __GTK_NOTEBOOK_PAGE_ACCESSIBLE_H__
 
-#include "gtknotebookaccessible.h"
+#include <gtk/a11y/gtknotebookaccessible.h>
 
 G_BEGIN_DECLS
 
diff --git a/gtk/a11y/gtkpanedaccessible.h b/gtk/a11y/gtkpanedaccessible.h
index 191f82353a..69aced6ace 100644
--- a/gtk/a11y/gtkpanedaccessible.h
+++ b/gtk/a11y/gtkpanedaccessible.h
@@ -18,7 +18,7 @@
 #ifndef __GTK_PANED_ACCESSIBLE_H__
 #define __GTK_PANED_ACCESSIBLE_H__
 
-#include "gtkcontaineraccessible.h"
+#include <gtk/a11y/gtkcontaineraccessible.h>
 
 G_BEGIN_DECLS
 
diff --git a/gtk/a11y/gtkprogressbaraccessible.h b/gtk/a11y/gtkprogressbaraccessible.h
index d6fc8a7c62..0979ad21cf 100644
--- a/gtk/a11y/gtkprogressbaraccessible.h
+++ b/gtk/a11y/gtkprogressbaraccessible.h
@@ -18,7 +18,7 @@
 #ifndef __GTK_PROGRESS_BAR_ACCESSIBLE_H__
 #define __GTK_PROGRESS_BAR_ACCESSIBLE_H__
 
-#include "gtkwidgetaccessible.h"
+#include <gtk/a11y/gtkwidgetaccessible.h>
 
 G_BEGIN_DECLS
 
diff --git a/gtk/a11y/gtkradiobuttonaccessible.h b/gtk/a11y/gtkradiobuttonaccessible.h
index a0c6550ebf..f10a1e34a9 100644
--- a/gtk/a11y/gtkradiobuttonaccessible.h
+++ b/gtk/a11y/gtkradiobuttonaccessible.h
@@ -18,7 +18,7 @@
 #ifndef __GTK_RADIO_BUTTON_ACCESSIBLE_H__
 #define __GTK_RADIO_BUTTON_ACCESSIBLE_H__
 
-#include "gtktogglebuttonaccessible.h"
+#include <gtk/a11y/gtktogglebuttonaccessible.h>
 
 G_BEGIN_DECLS
 
diff --git a/gtk/a11y/gtkradiomenuitemaccessible.h b/gtk/a11y/gtkradiomenuitemaccessible.h
index e209808ed6..bdf3690500 100644
--- a/gtk/a11y/gtkradiomenuitemaccessible.h
+++ b/gtk/a11y/gtkradiomenuitemaccessible.h
@@ -18,7 +18,7 @@
 #ifndef __GTK_RADIO_MENU_ITEM_ACCESSIBLE_H__
 #define __GTK_RADIO_MENU_ITEM_ACCESSIBLE_H__
 
-#include "gtkcheckmenuitemaccessible.h"
+#include <gtk/a11y/gtkcheckmenuitemaccessible.h>
 
 G_BEGIN_DECLS
 
diff --git a/gtk/a11y/gtkrangeaccessible.h b/gtk/a11y/gtkrangeaccessible.h
index 0c0cc1ba85..47db74ae38 100644
--- a/gtk/a11y/gtkrangeaccessible.h
+++ b/gtk/a11y/gtkrangeaccessible.h
@@ -18,7 +18,7 @@
 #ifndef __GTK_RANGE_ACCESSIBLE_H__
 #define __GTK_RANGE_ACCESSIBLE_H__
 
-#include "gtkwidgetaccessible.h"
+#include <gtk/a11y/gtkwidgetaccessible.h>
 
 G_BEGIN_DECLS
 
diff --git a/gtk/a11y/gtkrenderercellaccessible.h b/gtk/a11y/gtkrenderercellaccessible.h
index 223cac9f92..4bb2625685 100644
--- a/gtk/a11y/gtkrenderercellaccessible.h
+++ b/gtk/a11y/gtkrenderercellaccessible.h
@@ -19,7 +19,7 @@
 #define __GTK_RENDERER_CELL_ACCESSIBLE_H__
 
 #include <atk/atk.h>
-#include "gtkcellaccessible.h"
+#include <gtk/a11y/gtkcellaccessible.h>
 
 G_BEGIN_DECLS
 
diff --git a/gtk/a11y/gtkscaleaccessible.h b/gtk/a11y/gtkscaleaccessible.h
index 7db1226d4b..42301ef526 100644
--- a/gtk/a11y/gtkscaleaccessible.h
+++ b/gtk/a11y/gtkscaleaccessible.h
@@ -18,7 +18,7 @@
 #ifndef __GTK_SCALE_ACCESSIBLE_H__
 #define __GTK_SCALE_ACCESSIBLE_H__
 
-#include "gtkrangeaccessible.h"
+#include <gtk/a11y/gtkrangeaccessible.h>
 
 G_BEGIN_DECLS
 
diff --git a/gtk/a11y/gtkscalebuttonaccessible.h b/gtk/a11y/gtkscalebuttonaccessible.h
index 1ea177f3f9..4a60164f39 100644
--- a/gtk/a11y/gtkscalebuttonaccessible.h
+++ b/gtk/a11y/gtkscalebuttonaccessible.h
@@ -18,7 +18,7 @@
 #ifndef __GTK_SCALE_BUTTON_ACCESSIBLE_H__
 #define __GTK_SCALE_BUTTON_ACCESSIBLE_H__
 
-#include "gtkbuttonaccessible.h"
+#include <gtk/a11y/gtkbuttonaccessible.h>
 
 G_BEGIN_DECLS
 
diff --git a/gtk/a11y/gtkscrollbaraccessible.h b/gtk/a11y/gtkscrollbaraccessible.h
index 44e65e0f08..c32144d03a 100644
--- a/gtk/a11y/gtkscrollbaraccessible.h
+++ b/gtk/a11y/gtkscrollbaraccessible.h
@@ -18,7 +18,7 @@
 #ifndef __GTK_SCROLLBAR_ACCESSIBLE_H__
 #define __GTK_SCROLLBAR_ACCESSIBLE_H__
 
-#include "gtkrangeaccessible.h"
+#include <gtk/a11y/gtkrangeaccessible.h>
 
 G_BEGIN_DECLS
 
diff --git a/gtk/a11y/gtkscrolledwindowaccessible.h b/gtk/a11y/gtkscrolledwindowaccessible.h
index ad885005a4..fb31190872 100644
--- a/gtk/a11y/gtkscrolledwindowaccessible.h
+++ b/gtk/a11y/gtkscrolledwindowaccessible.h
@@ -18,7 +18,7 @@
 #ifndef __GTK_SCROLLED_WINDOW_ACCESSIBLE_H__
 #define __GTK_SCROLLED_WINDOW_ACCESSIBLE_H__
 
-#include "gtkcontaineraccessible.h"
+#include <gtk/a11y/gtkcontaineraccessible.h>
 
 G_BEGIN_DECLS
 
diff --git a/gtk/a11y/gtkspinbuttonaccessible.h b/gtk/a11y/gtkspinbuttonaccessible.h
index b5a43f2013..a2b4502d94 100644
--- a/gtk/a11y/gtkspinbuttonaccessible.h
+++ b/gtk/a11y/gtkspinbuttonaccessible.h
@@ -18,7 +18,7 @@
 #ifndef __GTK_SPIN_BUTTON_ACCESSIBLE_H__
 #define __GTK_SPIN_BUTTON_ACCESSIBLE_H__
 
-#include "gtkentryaccessible.h"
+#include <gtk/a11y/gtkentryaccessible.h>
 
 G_BEGIN_DECLS
 
diff --git a/gtk/a11y/gtkspinneraccessible.h b/gtk/a11y/gtkspinneraccessible.h
index e2e04a9df4..fdb3f498fc 100644
--- a/gtk/a11y/gtkspinneraccessible.h
+++ b/gtk/a11y/gtkspinneraccessible.h
@@ -18,7 +18,7 @@
 #ifndef __GTK_SPINNER_ACCESSIBLE_H__
 #define __GTK_SPINNER_ACCESSIBLE_H__
 
-#include "gtkwidgetaccessible.h"
+#include <gtk/a11y/gtkwidgetaccessible.h>
 
 G_BEGIN_DECLS
 
diff --git a/gtk/a11y/gtkstatusbaraccessible.h b/gtk/a11y/gtkstatusbaraccessible.h
index f84e61b3ab..7706f47669 100644
--- a/gtk/a11y/gtkstatusbaraccessible.h
+++ b/gtk/a11y/gtkstatusbaraccessible.h
@@ -18,7 +18,7 @@
 #ifndef __GTK_STATUSBAR_ACCESSIBLE_H__
 #define __GTK_STATUSBAR_ACCESSIBLE_H__
 
-#include "gtkcontaineraccessible.h"
+#include <gtk/a11y/gtkcontaineraccessible.h>
 
 G_BEGIN_DECLS
 
diff --git a/gtk/a11y/gtkswitchaccessible.h b/gtk/a11y/gtkswitchaccessible.h
index f90bb24757..7e11513592 100644
--- a/gtk/a11y/gtkswitchaccessible.h
+++ b/gtk/a11y/gtkswitchaccessible.h
@@ -18,7 +18,7 @@
 #ifndef __GTK_SWITCH_ACCESSIBLE_H__
 #define __GTK_SWITCH_ACCESSIBLE_H__
 
-#include "gtkwidgetaccessible.h"
+#include <gtk/a11y/gtkwidgetaccessible.h>
 
 G_BEGIN_DECLS
 
diff --git a/gtk/a11y/gtktextcellaccessible.h b/gtk/a11y/gtktextcellaccessible.h
index ef66cc7a43..21c1ffa173 100644
--- a/gtk/a11y/gtktextcellaccessible.h
+++ b/gtk/a11y/gtktextcellaccessible.h
@@ -19,7 +19,7 @@
 #define __GTK_TEXT_CELL_ACCESSIBLE_H__
 
 #include <atk/atk.h>
-#include "gtkrenderercellaccessible.h"
+#include <gtk/a11y/gtkrenderercellaccessible.h>
 
 G_BEGIN_DECLS
 
diff --git a/gtk/a11y/gtktextviewaccessible.h b/gtk/a11y/gtktextviewaccessible.h
index c90141f742..c13d58f1cc 100644
--- a/gtk/a11y/gtktextviewaccessible.h
+++ b/gtk/a11y/gtktextviewaccessible.h
@@ -18,7 +18,7 @@
 #ifndef __GTK_TEXT_VIEW_ACCESSIBLE_H__
 #define __GTK_TEXT_VIEW_ACCESSIBLE_H__
 
-#include "gtkcontaineraccessible.h"
+#include <gtk/a11y/gtkcontaineraccessible.h>
 
 G_BEGIN_DECLS
 
diff --git a/gtk/a11y/gtktextviewaccessibleprivate.h b/gtk/a11y/gtktextviewaccessibleprivate.h
index 9417780244..9fe9b1b585 100644
--- a/gtk/a11y/gtktextviewaccessibleprivate.h
+++ b/gtk/a11y/gtktextviewaccessibleprivate.h
@@ -18,7 +18,7 @@
 #ifndef __GTK_TEXT_VIEW_ACCESSIBLE_PRIVATE_H__
 #define __GTK_TEXT_VIEW_ACCESSIBLE_PRIVATE_H__
 
-#include "gtktextviewaccessible.h"
+#include <gtk/a11y/gtktextviewaccessible.h>
 
 G_BEGIN_DECLS
 
diff --git a/gtk/a11y/gtktogglebuttonaccessible.h b/gtk/a11y/gtktogglebuttonaccessible.h
index 719dfa17ab..328e10796c 100644
--- a/gtk/a11y/gtktogglebuttonaccessible.h
+++ b/gtk/a11y/gtktogglebuttonaccessible.h
@@ -18,7 +18,7 @@
 #ifndef __GTK_TOGGLE_BUTTON_ACCESSIBLE_H__
 #define __GTK_TOGGLE_BUTTON_ACCESSIBLE_H__
 
-#include "gtkbuttonaccessible.h"
+#include <gtk/a11y/gtkbuttonaccessible.h>
 
 G_BEGIN_DECLS
 
diff --git a/gtk/a11y/gtktreeviewaccessible.h b/gtk/a11y/gtktreeviewaccessible.h
index 2bde13b699..4c8730fc54 100644
--- a/gtk/a11y/gtktreeviewaccessible.h
+++ b/gtk/a11y/gtktreeviewaccessible.h
@@ -18,7 +18,7 @@
 #ifndef __GTK_TREE_VIEW_ACCESSIBLE_H__
 #define __GTK_TREE_VIEW_ACCESSIBLE_H__
 
-#include "gtkcontaineraccessible.h"
+#include <gtk/a11y/gtkcontaineraccessible.h>
 
 G_BEGIN_DECLS
 
diff --git a/gtk/a11y/gtktreeviewaccessibleprivate.h b/gtk/a11y/gtktreeviewaccessibleprivate.h
index eca1820584..3c91009bac 100644
--- a/gtk/a11y/gtktreeviewaccessibleprivate.h
+++ b/gtk/a11y/gtktreeviewaccessibleprivate.h
@@ -18,7 +18,7 @@
 #ifndef __GTK_TREE_VIEW_ACCESSIBLE_PRIVATE_H__
 #define __GTK_TREE_VIEW_ACCESSIBLE_PRIVATE_H__
 
-#include "gtktreeviewaccessible.h"
+#include <gtk/a11y/gtktreeviewaccessible.h>
 
 G_BEGIN_DECLS
 
diff --git a/gtk/a11y/gtkwidgetaccessible.h b/gtk/a11y/gtkwidgetaccessible.h
index fdf2af4ae5..003d2fbe5d 100644
--- a/gtk/a11y/gtkwidgetaccessible.h
+++ b/gtk/a11y/gtkwidgetaccessible.h
@@ -18,8 +18,7 @@
 #ifndef __GTK_WIDGET_ACCESSIBLE_H__
 #define __GTK_WIDGET_ACCESSIBLE_H__
 
-#include "gtk/gtkaccessible.h"
-#include "gtk/gtkwidget.h"
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
diff --git a/gtk/a11y/gtkwidgetaccessibleprivate.h b/gtk/a11y/gtkwidgetaccessibleprivate.h
index e493f22d55..9623429501 100644
--- a/gtk/a11y/gtkwidgetaccessibleprivate.h
+++ b/gtk/a11y/gtkwidgetaccessibleprivate.h
@@ -18,7 +18,7 @@
 #ifndef __GTK_WIDGET_ACCESSIBLE_PRIVATE_H__
 #define __GTK_WIDGET_ACCESSIBLE_PRIVATE_H__
 
-#include "gtkwidgetaccessible.h"
+#include <gtk/a11y/gtkwidgetaccessible.h>
 
 G_BEGIN_DECLS
 
diff --git a/gtk/a11y/gtkwindowaccessible.h b/gtk/a11y/gtkwindowaccessible.h
index 843a6d6772..5933b87ddc 100644
--- a/gtk/a11y/gtkwindowaccessible.h
+++ b/gtk/a11y/gtkwindowaccessible.h
@@ -18,7 +18,7 @@
 #ifndef __GTK_WINDOW_ACCESSIBLE_H__
 #define __GTK_WINDOW_ACCESSIBLE_H__
 
-#include "gtkcontaineraccessible.h"
+#include <gtk/a11y/gtkcontaineraccessible.h>
 
 G_BEGIN_DECLS