diff --git a/gtk/a11y/gtkcontaineraccessible.h b/gtk/a11y/gtkcontaineraccessible.h
index 639ff5d5a7..1f21933439 100644
--- a/gtk/a11y/gtkcontaineraccessible.h
+++ b/gtk/a11y/gtkcontaineraccessible.h
@@ -20,6 +20,7 @@
 #ifndef __GTK_CONTAINER_ACCESSIBLE_H__
 #define __GTK_CONTAINER_ACCESSIBLE_H__
 
+#include "gtkcontainer.h"
 #include "gtkwidgetaccessible.h"
 
 G_BEGIN_DECLS
diff --git a/gtk/a11y/gtkmenuaccessible.c b/gtk/a11y/gtkmenuaccessible.c
index df30d987ca..542ce98c0c 100644
--- a/gtk/a11y/gtkmenuaccessible.c
+++ b/gtk/a11y/gtkmenuaccessible.c
@@ -21,6 +21,7 @@
 
 #include "gtkmenuaccessible.h"
 
+#include <gtk/gtk.h>
 
 G_DEFINE_TYPE (GtkMenuAccessible, _gtk_menu_accessible, GTK_TYPE_MENU_SHELL_ACCESSIBLE)
 
diff --git a/gtk/a11y/gtkmenuaccessible.h b/gtk/a11y/gtkmenuaccessible.h
index 59f29469e8..cb3da491fc 100644
--- a/gtk/a11y/gtkmenuaccessible.h
+++ b/gtk/a11y/gtkmenuaccessible.h
@@ -20,6 +20,7 @@
 #ifndef __GTK_MENU_ACCESSIBLE_H__
 #define __GTK_MENU_ACCESSIBLE_H__
 
+#include "gtkmenu.h"
 #include "gtkmenushellaccessible.h"
 
 G_BEGIN_DECLS
diff --git a/gtk/a11y/gtkscalebuttonaccessible.h b/gtk/a11y/gtkscalebuttonaccessible.h
index affa380554..1e3e4abc87 100644
--- a/gtk/a11y/gtkscalebuttonaccessible.h
+++ b/gtk/a11y/gtkscalebuttonaccessible.h
@@ -20,7 +20,6 @@
 #ifndef __GTK_SCALE_BUTTON_ACCESSIBLE_H__
 #define __GTK_SCALE_BUTTON_ACCESSIBLE_H__
 
-#include <gtk/gtk.h>
 #include "gtkbuttonaccessible.h"
 
 G_BEGIN_DECLS
diff --git a/gtk/a11y/gtktreeviewaccessible.h b/gtk/a11y/gtktreeviewaccessible.h
index 5de261905d..38b739d880 100644
--- a/gtk/a11y/gtktreeviewaccessible.h
+++ b/gtk/a11y/gtktreeviewaccessible.h
@@ -20,7 +20,6 @@
 #ifndef __GTK_TREE_VIEW_ACCESSIBLE_H__
 #define __GTK_TREE_VIEW_ACCESSIBLE_H__
 
-#include <gtk/gtk.h>
 #include "gtkcontaineraccessible.h"
 
 G_BEGIN_DECLS
diff --git a/gtk/a11y/gtkwidgetaccessible.h b/gtk/a11y/gtkwidgetaccessible.h
index 3f9d4cab3e..cd9009cf85 100644
--- a/gtk/a11y/gtkwidgetaccessible.h
+++ b/gtk/a11y/gtkwidgetaccessible.h
@@ -20,7 +20,8 @@
 #ifndef __GTK_WIDGET_ACCESSIBLE_H__
 #define __GTK_WIDGET_ACCESSIBLE_H__
 
-#include <gtk/gtk.h>
+#include "gtk/gtkaccessible.h"
+#include "gtk/gtkwidget.h"
 
 G_BEGIN_DECLS