a11y: Remove gtk.h include from container accessible

gtk/a11y/gtkcontaineraccessible.h

@@ -22,7 +22,7 @@
 #error "Only <gtk/gtk-a11y.h> can be included directly."
 #endif
 
-#include <gtk/gtk.h>
+#include <gtk/gtkcontainer.h>
 #include <gtk/a11y/gtkwidgetaccessible.h>
 
 G_BEGIN_DECLS

gtk/gtkassistant.c

@@ -58,23 +58,24 @@
 
 #include "config.h"
 
-#include <atk/atk.h>
-
 #include "gtkassistant.h"
 
-#include "gtkbutton.h"
+#include "gtkbindings.h"
 #include "gtkbox.h"
+#include "gtkbuildable.h"
+#include "gtkbutton.h"
 #include "gtkframe.h"
-#include "gtknotebook.h"
+#include "gtkheaderbar.h"
+#include "gtkintl.h"
 #include "gtkimage.h"
 #include "gtklabel.h"
+#include "gtknotebook.h"
+#include "gtkprivate.h"
 #include "gtksettings.h"
 #include "gtksizegroup.h"
 #include "gtksizerequest.h"
 #include "gtktypebuiltins.h"
-#include "gtkintl.h"
+
-#include "gtkprivate.h"
-#include "gtkbuildable.h"
 #include "a11y/gtkwindowaccessible.h"
 
 

gtk/gtkbutton.c

@@ -53,24 +53,27 @@
 
 #include "config.h"
 
-#include "gtkbutton.h"
 #include "gtkbuttonprivate.h"
 
-#include <string.h>
+#include "gtkactionhelperprivate.h"
+#include "gtkapplicationprivate.h"
+#include "gtkbox.h"
+#include "gtkcheckbutton.h"
+#include "gtkcontainerprivate.h"
+#include "gtkgesturemultipress.h"
+#include "gtkimage.h"
+#include "gtkintl.h"
 #include "gtklabel.h"
 #include "gtkmain.h"
 #include "gtkmarshalers.h"
-#include "gtkimage.h"
+#include "gtkprivate.h"
-#include "gtkbox.h"
 #include "gtksizerequest.h"
 #include "gtktypebuiltins.h"
 #include "gtkwidgetprivate.h"
-#include "gtkprivate.h"
+
-#include "gtkintl.h"
 #include "a11y/gtkbuttonaccessible.h"
-#include "gtkapplicationprivate.h"
+
-#include "gtkactionhelperprivate.h"
+#include <string.h>
-#include "gtkcontainerprivate.h"
 
 /* Time out before giving up on getting a key release when animating
  * the close button.

gtk/gtkbuttonprivate.h

@@ -19,6 +19,8 @@
 #ifndef __GTK_BUTTON_PRIVATE_H__
 #define __GTK_BUTTON_PRIVATE_H__
 
+#include "gtkbutton.h"
+
 #include "gtkactionhelperprivate.h"
 #include "gtkgesturesingle.h"
 

gtk/gtkcombobox.c

@@ -17,36 +17,34 @@
 
 #include "config.h"
 
-#include "gtkcombobox.h"
+#include "gtkcomboboxprivate.h"
 
-#include "gtkcellareabox.h"
-#include "gtktreemenu.h"
 #include "gtkbindings.h"
+#include "gtkbox.h"
+#include "gtkcellareabox.h"
 #include "gtkcelllayout.h"
 #include "gtkcellrenderertext.h"
 #include "gtkcellview.h"
+#include "gtkeventcontrollerscroll.h"
 #include "gtkframe.h"
 #include "gtkiconprivate.h"
-#include "gtkbox.h"
+#include "gtkintl.h"
 #include "gtkliststore.h"
 #include "gtkmain.h"
+#include "gtkmarshalers.h"
+#include "gtkmenuitem.h"
 #include "gtkmenuprivate.h"
 #include "gtkmenushellprivate.h"
-#include "gtktogglebutton.h"
-#include "gtktypebuiltins.h"
 #include "gtkprivate.h"
-#include "gtkcomboboxprivate.h"
+#include "gtktogglebutton.h"
-
+#include "gtktreemenu.h"
-#include <gobject/gvaluecollector.h>
+#include "gtktypebuiltins.h"
-
-#include <string.h>
-#include <stdarg.h>
-
-#include "gtkmarshalers.h"
-#include "gtkintl.h"
 
 #include "a11y/gtkcomboboxaccessible.h"
 
+#include <gobject/gvaluecollector.h>
+#include <string.h>
+#include <stdarg.h>
 
 /**
  * SECTION:gtkcombobox

gtk/gtkcontainer.c

@@ -26,30 +26,29 @@
 
 #include "gtkcontainerprivate.h"
 
-#include <stdarg.h>
+#include "gtkadjustment.h"
-#include <string.h>
+#include "gtkassistant.h"
-#include <stdlib.h>
+#include "gtkbuildable.h"
+#include "gtkbuilderprivate.h"
+#include "gtkintl.h"
+#include "gtkpopovermenu.h"
+#include "gtkprivate.h"
+#include "gtkmarshalers.h"
+#include "gtkshortcutssection.h"
+#include "gtkshortcutswindow.h"
+#include "gtksizerequest.h"
+#include "gtkstylecontextprivate.h"
+#include "gtktypebuiltins.h"
+#include "gtkwidgetprivate.h"
+#include "gtkwindow.h"
+
+#include "a11y/gtkcontaineraccessibleprivate.h"
 
 #include <gobject/gobjectnotifyqueue.c>
 #include <gobject/gvaluecollector.h>
-
+#include <stdarg.h>
-#include "gtkadjustment.h"
+#include <stdlib.h>
-#include "gtkbuildable.h"
+#include <string.h>
-#include "gtkbuilderprivate.h"
-#include "gtktypebuiltins.h"
-#include "gtkprivate.h"
-#include "gtkmarshalers.h"
-#include "gtksizerequest.h"
-#include "gtkwidgetprivate.h"
-#include "gtkwindow.h"
-#include "gtkassistant.h"
-#include "gtkintl.h"
-#include "gtkstylecontextprivate.h"
-#include "a11y/gtkcontaineraccessible.h"
-#include "a11y/gtkcontaineraccessibleprivate.h"
-#include "gtkpopovermenu.h"
-#include "gtkshortcutswindow.h"
-
 
 /* A handful of containers inside GTK+ are cheating and widgets
  * inside internal structure as direct children for the purpose

gtk/gtkexpander.c

@@ -109,24 +109,27 @@
 
 #include "config.h"
 
-#include <string.h>
-
 #include "gtkexpander.h"
 
-#include "gtklabel.h"
+#include "gtkbox.h"
 #include "gtkbuildable.h"
-#include "gtkcontainer.h"
+#include "gtkcontainerprivate.h"
+#include "gtkdnd.h"
+#include "gtkdragdest.h"
+#include "gtkiconprivate.h"
+#include "gtkgesturemultipress.h"
+#include "gtkgesturesingle.h"
+#include "gtkintl.h"
+#include "gtklabel.h"
 #include "gtkmarshalers.h"
 #include "gtkmain.h"
-#include "gtkintl.h"
 #include "gtkprivate.h"
-#include "gtkdnd.h"
-#include "a11y/gtkexpanderaccessible.h"
 #include "gtkstylecontextprivate.h"
 #include "gtkwidgetprivate.h"
-#include "gtkcontainerprivate.h"
-#include "gtkiconprivate.h"
 
+#include "a11y/gtkexpanderaccessible.h"
+
+#include <string.h>
 
 #define TIMEOUT_EXPAND 500
 

gtk/gtkheaderbar.c

@@ -19,16 +19,24 @@
 
 #include "config.h"
 
-#include "gtkheaderbar.h"
 #include "gtkheaderbarprivate.h"
+
+#include "gtkbox.h"
+#include "gtkbutton.h"
+#include "gtkbuildable.h"
+#include "gtkcontainerprivate.h"
+#include "gtkcssnodeprivate.h"
+#include "gtkimage.h"
 #include "gtkintl.h"
+#include "gtklabel.h"
+#include "gtkmenubutton.h"
 #include "gtkprivate.h"
+#include "gtkseparator.h"
+#include "gtksizerequest.h"
 #include "gtktypebuiltins.h"
 #include "gtkwidgetprivate.h"
-#include "gtkcssnodeprivate.h"
 #include "gtkwindowprivate.h"
-#include "gtkwidgetprivate.h"
+
-#include "gtkcontainerprivate.h"
 #include "a11y/gtkcontaineraccessible.h"
 
 #include <string.h>

gtk/gtkheaderbarprivate.h

@@ -20,6 +20,8 @@
 #ifndef __GTK_HEADER_BAR_PRIVATE_H__
 #define __GTK_HEADER_BAR_PRIVATE_H__
 
+#include "gtkheaderbar.h"
+
 G_BEGIN_DECLS
 
 gboolean     _gtk_header_bar_shows_app_menu        (GtkHeaderBar *bar);

gtk/gtklinkbutton.c

@@ -53,23 +53,25 @@
 
 #include "gtklinkbutton.h"
 
-#include <string.h>
+#include "gtkdragsource.h"
-
+#include "gtkgesturemultipress.h"
-#include "gtkdnd.h"
+#include "gtkgesturesingle.h"
+#include "gtkintl.h"
 #include "gtklabel.h"
 #include "gtkmain.h"
 #include "gtkmarshalers.h"
 #include "gtkmenu.h"
 #include "gtkmenuitem.h"
-#include "gtksizerequest.h"
-#include "gtkshow.h"
-#include "gtktooltip.h"
 #include "gtkprivate.h"
-#include "gtkintl.h"
+#include "gtkshow.h"
+#include "gtksizerequest.h"
+#include "gtktooltip.h"
 #include "gtkwidgetprivate.h"
 
 #include "a11y/gtklinkbuttonaccessible.h"
 
+#include <string.h>
+
 struct _GtkLinkButtonPrivate
 {
   gchar *uri;

gtk/gtkmenushell.c

@@ -57,24 +57,24 @@
  */
 #include "config.h"
 
+#include "gtkmenushellprivate.h"
+
 #include "gtkbindings.h"
+#include "gtkintl.h"
 #include "gtkkeyhash.h"
-#include "gtklabel.h"
+#include "gtklabelprivate.h"
 #include "gtkmain.h"
 #include "gtkmarshalers.h"
 #include "gtkmenubar.h"
 #include "gtkmenuitemprivate.h"
-#include "gtkmenushellprivate.h"
 #include "gtkmnemonichash.h"
+#include "gtkmodelmenuitem.h"
+#include "gtkprivate.h"
+#include "gtkseparatormenuitem.h"
+#include "gtktypebuiltins.h"
+#include "gtkwidgetprivate.h"
 #include "gtkwindow.h"
 #include "gtkwindowprivate.h"
-#include "gtkprivate.h"
-#include "gtkmain.h"
-#include "gtkintl.h"
-#include "gtktypebuiltins.h"
-#include "gtkmodelmenuitem.h"
-#include "gtkwidgetprivate.h"
-#include "gtklabelprivate.h"
 
 #include "a11y/gtkmenushellaccessible.h"
 

gtk/gtknotebook.c

@@ -25,33 +25,40 @@
 
 #include "config.h"
 
+#include "gtknotebook.h"
+
+#include "gtkbindings.h"
+#include "gtkbox.h"
+#include "gtkbuildable.h"
+#include "gtkbutton.h"
+#include "gtkcssstylepropertyprivate.h"
+#include "gtkdnd.h"
+#include "gtkdragdest.h"
+#include "gtkeventcontrollermotion.h"
+#include "gtkgesturemultipress.h"
+#include "gtkgizmoprivate.h"
+#include "gtkiconprivate.h"
+#include "gtkintl.h"
+#include "gtklabel.h"
+#include "gtkmain.h"
+#include "gtkmarshalers.h"
+#include "gtkmenu.h"
+#include "gtkmenuitem.h"
+#include "gtkorientable.h"
+#include "gtksizerequest.h"
+#include "gtkstylecontextprivate.h"
+#include "gtkprivate.h"
+#include "gtkstack.h"
+#include "gtktypebuiltins.h"
+#include "gtkwidgetpath.h"
+#include "gtkwidgetprivate.h"
+
+#include "a11y/gtknotebookaccessible.h"
+
 #include <stdio.h>
 #include <string.h>
 #include <math.h>
 
-#include "gtknotebook.h"
-
-#include "gtkmain.h"
-#include "gtkmenu.h"
-#include "gtkmenuitem.h"
-#include "gtklabel.h"
-#include "gtkintl.h"
-#include "gtkmarshalers.h"
-#include "gtkbindings.h"
-#include "gtkprivate.h"
-#include "gtkdnd.h"
-#include "gtkbuildable.h"
-#include "gtktypebuiltins.h"
-#include "gtkwidgetpath.h"
-#include "gtkcssstylepropertyprivate.h"
-#include "gtksizerequest.h"
-#include "gtkstylecontextprivate.h"
-#include "gtkwidgetprivate.h"
-#include "gtkiconprivate.h"
-#include "gtkgizmoprivate.h"
-#include "a11y/gtknotebookaccessible.h"
-
-
 /**
  * SECTION:gtknotebook
  * @Short_description: A tabbed notebook container

gtk/gtkpaned.c

@@ -27,23 +27,26 @@
 #include "gtkpaned.h"
 
 #include "gtkbindings.h"
+#include "gtkcontainerprivate.h"
+#include "gtkcssnodeprivate.h"
+#include "gtkcssstylepropertyprivate.h"
+#include "gtkeventcontrollermotion.h"
+#include "gtkgesturepan.h"
+#include "gtkgesturesingle.h"
+#include "gtkgizmoprivate.h"
+#include "gtkintl.h"
 #include "gtkmain.h"
 #include "gtkmarshalers.h"
-#include "gtkorientable.h"
-#include "gtkwindow.h"
-#include "gtktypebuiltins.h"
 #include "gtkorientableprivate.h"
 #include "gtkprivate.h"
-#include "gtkintl.h"
-#include "gtkwidgetprivate.h"
-#include "gtkcontainerprivate.h"
-#include "a11y/gtkpanedaccessible.h"
-#include "gtkcssnodeprivate.h"
-#include "gtkstylecontextprivate.h"
-#include "gtkcssstylepropertyprivate.h"
 #include "gtkrendericonprivate.h"
-#include "gtkgizmoprivate.h"
+#include "gtksnapshot.h"
-#include "gtkeventcontrollermotion.h"
+#include "gtkstylecontextprivate.h"
+#include "gtktypebuiltins.h"
+#include "gtkwidgetprivate.h"
+#include "gtkwindow.h"
+
+#include "a11y/gtkpanedaccessible.h"
 
 #include <math.h>
 

gtk/gtkpopover.c

@@ -102,35 +102,37 @@
  */
 
 #include "config.h"
-#include <gdk/gdk.h>
+
-#include "gtkpopover.h"
 #include "gtkpopoverprivate.h"
-#include "gtktypebuiltins.h"
+
-#include "gtkmain.h"
-#include "gtkwindowprivate.h"
-#include "gtkscrollable.h"
 #include "gtkadjustment.h"
-#include "gtkprivate.h"
-#include "gtkintl.h"
-#include "gtklabel.h"
 #include "gtkbox.h"
 #include "gtkbutton.h"
 #include "gtkcontainerprivate.h"
-#include "gtkseparator.h"
-#include "gtkmodelbutton.h"
-#include "gtkwidgetprivate.h"
-#include "gtkactionmuxerprivate.h"
-#include "gtkmenutracker.h"
-#include "gtkstack.h"
-#include "gtksizegroup.h"
-#include "a11y/gtkpopoveraccessible.h"
-#include "gtkmenusectionbox.h"
-#include "gtkroundedboxprivate.h"
-#include "gtkstylecontextprivate.h"
-#include "gtkprogresstrackerprivate.h"
-#include "gtksettingsprivate.h"
-#include "gtkgizmoprivate.h"
 #include "gtkcssnodeprivate.h"
+#include "gtkentry.h"
+#include "gtkgizmoprivate.h"
+#include "gtkintl.h"
+#include "gtklabel.h"
+#include "gtkmain.h"
+#include "gtkmenusectionbox.h"
+#include "gtkmenutracker.h"
+#include "gtkmodelbutton.h"
+#include "gtkprivate.h"
+#include "gtkprogresstrackerprivate.h"
+#include "gtkrender.h"
+#include "gtkroundedboxprivate.h"
+#include "gtkscrollable.h"
+#include "gtksettingsprivate.h"
+#include "gtksizegroup.h"
+#include "gtksnapshot.h"
+#include "gtkstack.h"
+#include "gtkstylecontextprivate.h"
+#include "gtktypebuiltins.h"
+#include "gtkwidgetprivate.h"
+#include "gtkwindowprivate.h"
+
+#include "a11y/gtkpopoveraccessible.h"
 
 #include "gsk/gskroundedrectprivate.h"
 

gtk/gtkscalebutton.c

@@ -36,29 +36,31 @@
 
 #include "gtkscalebutton.h"
 
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
-
 #include "gtkadjustment.h"
 #include "gtkbindings.h"
+#include "gtkbox.h"
+#include "gtkbuttonprivate.h"
+#include "gtkeventcontrollerscroll.h"
 #include "gtkframe.h"
+#include "gtkgesture.h"
+#include "gtkintl.h"
 #include "gtkmain.h"
 #include "gtkmarshalers.h"
 #include "gtkorientable.h"
 #include "gtkpopover.h"
 #include "gtkprivate.h"
-#include "gtkscale.h"
 #include "gtkrangeprivate.h"
-#include "gtkbox.h"
+#include "gtkscale.h"
+#include "gtktypebuiltins.h"
 #include "gtkwindow.h"
 #include "gtkwindowprivate.h"
-#include "gtktypebuiltins.h"
+
-#include "gtkgesture.h"
-#include "gtkbuttonprivate.h"
-#include "gtkintl.h"
 #include "a11y/gtkscalebuttonaccessible.h"
 
+#include <math.h>
+#include <stdlib.h>
+#include <string.h>
+
 /**
  * SECTION:gtkscalebutton
  * @Short_description: A button which pops up a scale

gtk/gtkscrolledwindow.c

@@ -30,21 +30,30 @@
 #include "gtkadjustmentprivate.h"
 #include "gtkbindings.h"
 #include "gtkdnd.h"
+#include "gtkeventcontrollermotion.h"
+#include "gtkeventcontrollerscroll.h"
+#include "gtkgesturedrag.h"
+#include "gtkgesturelongpress.h"
+#include "gtkgesturepan.h"
+#include "gtkgesturesingle.h"
+#include "gtkgestureswipe.h"
 #include "gtkintl.h"
+#include "gtkkineticscrolling.h"
 #include "gtkmain.h"
 #include "gtkmarshalers.h"
 #include "gtkprivate.h"
+#include "gtkprogresstrackerprivate.h"
 #include "gtkscrollable.h"
 #include "gtkscrollbar.h"
+#include "gtksettingsprivate.h"
+#include "gtksnapshot.h"
+#include "gtkstylecontextprivate.h"
 #include "gtktypebuiltins.h"
 #include "gtkviewport.h"
 #include "gtkwidgetprivate.h"
 #include "gtkwindow.h"
-#include "gtkkineticscrolling.h"
+
 #include "a11y/gtkscrolledwindowaccessible.h"
-#include "gtkstylecontextprivate.h"
-#include "gtkprogresstrackerprivate.h"
-#include "gtksettingsprivate.h"
 
 #include <math.h>
 

gtk/gtktreeview.c

@@ -18,50 +18,54 @@
 
 #include "config.h"
 
-#include <math.h>
-#include <string.h>
-
-#define GDK_COMPILATION
-#include "gdkeventsprivate.h"
-
 #include "gtktreeview.h"
 
 #include "gtkadjustmentprivate.h"
-#include "gtkcssnumbervalueprivate.h"
+#include "gtkbox.h"
-#include "gtkrbtreeprivate.h"
+#include "gtkbindings.h"
-#include "gtktreednd.h"
-#include "gtktreeprivate.h"
-#include "gtkcellrenderer.h"
-#include "gtkmarshalers.h"
 #include "gtkbuildable.h"
 #include "gtkbutton.h"
-#include "gtklabel.h"
-#include "gtkbox.h"
-#include "gtkintl.h"
-#include "gtkbindings.h"
-#include "gtkcontainer.h"
-#include "gtkentry.h"
-#include "gtkframe.h"
-#include "gtkmain.h"
-#include "gtktreemodelsort.h"
-#include "gtktooltip.h"
-#include "gtkscrollable.h"
 #include "gtkcelllayout.h"
-#include "gtkprivate.h"
+#include "gtkcellrenderer.h"
-#include "gtkwidgetprivate.h"
+#include "gtkcontainer.h"
-#include "gtkentryprivate.h"
+#include "gtkcssnumbervalueprivate.h"
-#include "gtkstylecontextprivate.h"
-#include "gtkcssstylepropertyprivate.h"
 #include "gtkcssrgbavalueprivate.h"
-#include "gtkrendericonprivate.h"
+#include "gtkcssstylepropertyprivate.h"
-#include "gtktypebuiltins.h"
+#include "gtkdragdest.h"
+#include "gtkdragsource.h"
+#include "gtkentryprivate.h"
+#include "gtkeventcontrollermotion.h"
+#include "gtkeventcontrollerscroll.h"
+#include "gtkframe.h"
+#include "gtkgesturedrag.h"
+#include "gtkgesturemultipress.h"
+#include "gtkgesturesingle.h"
+#include "gtkintl.h"
+#include "gtklabel.h"
 #include "gtkmain.h"
+#include "gtkmarshalers.h"
+#include "gtkprivate.h"
+#include "gtkrbtreeprivate.h"
+#include "gtkrendericonprivate.h"
+#include "gtkscrollable.h"
 #include "gtksettingsprivate.h"
 #include "gtksnapshotprivate.h"
+#include "gtkstylecontextprivate.h"
+#include "gtktooltip.h"
+#include "gtktreednd.h"
+#include "gtktreemodelsort.h"
+#include "gtktreeprivate.h"
+#include "gtktypebuiltins.h"
 #include "gtkwidgetpath.h"
-#include "gtkeventcontrollermotion.h"
+#include "gtkwidgetprivate.h"
+#include "gtkwindowgroup.h"
+
 #include "a11y/gtktreeviewaccessibleprivate.h"
 
+#include "gdk/gdkeventsprivate.h"
+
+#include <math.h>
+#include <string.h>
 
 /**
  * SECTION:gtktreeview

gtk/gtktreeviewcolumn.c

@@ -19,24 +19,26 @@
 
 #include "gtktreeviewcolumn.h"
 
-#include <string.h>
-
-#include "gtktreeview.h"
-#include "gtktreeprivate.h"
-#include "gtkcelllayout.h"
-#include "gtkbutton.h"
-#include "gtklabel.h"
 #include "gtkbox.h"
-#include "gtkmarshalers.h"
+#include "gtkbutton.h"
-#include "gtkimage.h"
-#include "gtkcellareacontext.h"
 #include "gtkcellareabox.h"
-#include "gtkprivate.h"
+#include "gtkcellareacontext.h"
+#include "gtkcelllayout.h"
+#include "gtkframe.h"
+#include "gtkimage.h"
 #include "gtkintl.h"
+#include "gtklabel.h"
+#include "gtkmarshalers.h"
+#include "gtkprivate.h"
+#include "gtktreeprivate.h"
+#include "gtktreeview.h"
 #include "gtktypebuiltins.h"
-#include "a11y/gtktreeviewaccessibleprivate.h"
 #include "gtkwidgetprivate.h"
 
+#include "a11y/gtktreeviewaccessibleprivate.h"
+
+#include <string.h>
+
 
 /**
  * SECTION:gtktreeviewcolumn

gtk/gtkwindow.c

@@ -24,56 +24,64 @@
 
 #include "config.h"
 
-#include <cairo-gobject.h>
-
-#include "gtkwindow.h"
-
-#include <string.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <limits.h>
-#include <graphene.h>
-
-#include "gtkprivate.h"
 #include "gtkwindowprivate.h"
+
 #include "gtkaccelgroupprivate.h"
+#include "gtkapplicationprivate.h"
 #include "gtkbindings.h"
+#include "gtkbox.h"
+#include "gtkbuildable.h"
+#include "gtkbuilderprivate.h"
+#include "gtkbutton.h"
+#include "gtkcheckbutton.h"
+#include "gtkcheckmenuitem.h"
 #include "gtkcontainerprivate.h"
 #include "gtkcsscornervalueprivate.h"
 #include "gtkcssiconthemevalueprivate.h"
 #include "gtkcssrgbavalueprivate.h"
 #include "gtkcssshadowsvalueprivate.h"
+#include "gtkcssstylepropertyprivate.h"
 #include "gtkdebugupdatesprivate.h"
+#include "gtkdragdest.h"
+#include "gtkgesturedrag.h"
+#include "gtkgesturemultipress.h"
+#include "gtkgestureprivate.h"
+#include "gtkheaderbarprivate.h"
+#include "gtkicontheme.h"
+#include "gtkintl.h"
 #include "gtkkeyhash.h"
 #include "gtkmain.h"
+#include "gtkmarshalers.h"
+#include "gtkmessagedialog.h"
 #include "gtkmnemonichash.h"
+#include "gtkmenu.h"
 #include "gtkmenubar.h"
 #include "gtkmenushellprivate.h"
-#include "gtkicontheme.h"
+#include "gtkpointerfocusprivate.h"
-#include "gtkmarshalers.h"
+#include "gtkpopoverprivate.h"
-#include "gtkbuildable.h"
+#include "gtkprivate.h"
-#include "gtkbuilderprivate.h"
+#include "gtkseparatormenuitem.h"
-#include "gtkwidgetprivate.h"
+#include "gtksettings.h"
-#include "gtkcontainerprivate.h"
+#include "gtksnapshot.h"
-#include "gtkintl.h"
 #include "gtkstylecontextprivate.h"
 #include "gtktypebuiltins.h"
-#include "gtkbox.h"
+#include "gtkwidgetprivate.h"
-#include "gtkbutton.h"
+#include "gtkwindowgroup.h"
-#include "gtkheaderbar.h"
+
-#include "gtkheaderbarprivate.h"
-#include "gtkpopoverprivate.h"
 #include "a11y/gtkwindowaccessible.h"
 #include "a11y/gtkcontaineraccessibleprivate.h"
-#include "gtkapplicationprivate.h"
-#include "gtkgestureprivate.h"
 #include "inspector/init.h"
 #include "inspector/window.h"
-#include "gtkcssstylepropertyprivate.h"
-#include "gtkpointerfocusprivate.h"
 
 #include "gdk/gdk-private.h"
 
+#include <cairo-gobject.h>
+#include <errno.h>
+#include <graphene.h>
+#include <limits.h>
+#include <string.h>
+#include <stdlib.h>
+
 #ifdef GDK_WINDOWING_X11
 #include "x11/gdkx.h"
 #endif