gtk: Don't include gtkstylecontext.h from gtkcsstypesprivate.h

And make sure it's included everywhere it's needed.

gtk/gtkassistant.c

@@ -74,14 +74,15 @@
 #include "gtkintl.h"
 #include "gtkimage.h"
 #include "gtklabel.h"
-#include "gtkstack.h"
+#include "gtklistlistmodelprivate.h"
+#include "gtkmaplistmodel.h"
 #include "gtkprivate.h"
 #include "gtksettings.h"
 #include "gtksizegroup.h"
 #include "gtksizerequest.h"
+#include "gtkstack.h"
+#include "gtkstylecontext.h"
 #include "gtktypebuiltins.h"
-#include "gtklistlistmodelprivate.h"
-#include "gtkmaplistmodel.h"
 
 #include "a11y/gtkwindowaccessible.h"
 

gtk/gtkbutton.c

@@ -66,6 +66,7 @@
 #include "gtkmain.h"
 #include "gtkmarshalers.h"
 #include "gtkprivate.h"
+#include "gtkstylecontext.h"
 #include "gtktypebuiltins.h"
 
 #include "a11y/gtkbuttonaccessible.h"

gtk/gtkcellarea.c

@@ -352,6 +352,7 @@
 #include "gtkmarshalers.h"
 #include "gtkprivate.h"
 #include "gtksnapshot.h"
+#include "gtkstylecontext.h"
 
 #include <gobject/gvaluecollector.h>
 

gtk/gtkcellrenderer.c

@@ -23,6 +23,7 @@
 #include "gtkmarshalers.h"
 #include "gtkprivate.h"
 #include "gtksnapshot.h"
+#include "gtkstylecontext.h"
 #include "gtktreeprivate.h"
 #include "gtktypebuiltins.h"
 

gtk/gtkcellrendererprogress.c

@@ -31,6 +31,7 @@
 #include "gtkorientable.h"
 #include "gtkprivate.h"
 #include "gtksnapshot.h"
+#include "gtkstylecontext.h"
 
 
 /**

gtk/gtkcellrenderertext.c

@@ -26,6 +26,7 @@
 #include "gtkprivate.h"
 #include "gtksizerequest.h"
 #include "gtksnapshot.h"
+#include "gtkstylecontext.h"
 #include "gtktreeprivate.h"
 
 #include "a11y/gtktextcellaccessible.h"

gtk/gtkcolorbutton.c

@@ -43,6 +43,7 @@
 #include "gtkmarshalers.h"
 #include "gtkprivate.h"
 #include "gtksnapshot.h"
+#include "gtkstylecontext.h"
 
 
 /**

gtk/gtkcolorchooserwidget.c

@@ -29,6 +29,7 @@
 #include "gtkprivate.h"
 #include "gtkintl.h"
 #include "gtksizegroup.h"
+#include "gtkstylecontext.h"
 
 #include <math.h>
 

gtk/gtkcssboxesprivate.h

@@ -19,6 +19,7 @@
 #define __GTK_CSS_BOXES_PRIVATE_H__
 
 #include "gtkcsstypesprivate.h"
+#include "gtktypes.h"
 
 G_BEGIN_DECLS
 

gtk/gtkcssimageprivate.h

@@ -26,6 +26,7 @@
 #include "gtk/gtkcssparserprivate.h"
 #include "gtk/gtkcsstypesprivate.h"
 #include "gtk/gtksnapshot.h"
+#include "gtk/gtkstyleprovider.h"
 
 G_BEGIN_DECLS
 

gtk/gtkcssnodeprivate.h

@@ -23,6 +23,7 @@
 #include "gtkcssstylechangeprivate.h"
 #include "gtkbitmaskprivate.h"
 #include "gtkcsstypesprivate.h"
+#include "gtkstylecontext.h"
 
 G_BEGIN_DECLS
 

gtk/gtkcssparserprivate.h

@@ -18,7 +18,6 @@
 #ifndef __GTK_CSS_PARSER_PRIVATE_H__
 #define __GTK_CSS_PARSER_PRIVATE_H__
 
-#include "gtk/gtkcsstypesprivate.h"
 #include <gtk/gtkcssprovider.h>
 
 G_BEGIN_DECLS

gtk/gtkcssshadowsvalueprivate.h

@@ -23,6 +23,7 @@
 #include <cairo.h>
 #include <pango/pango.h>
 
+#include "gtkborder.h"
 #include "gtktypes.h"
 #include "gtkcssparserprivate.h"
 #include "gtkcssvalueprivate.h"

gtk/gtkcssshadowvalueprivate.h

@@ -23,6 +23,7 @@
 #include <cairo.h>
 #include <pango/pango.h>
 
+#include "gtkborder.h"
 #include "gtktypes.h"
 #include "gtkcssparserprivate.h"
 #include "gtkcssvalueprivate.h"

gtk/gtkcsstypesprivate.h

@@ -20,7 +20,6 @@
 
 #include <glib-object.h>
 #include <gsk/gsk.h>
-#include <gtk/gtkstylecontext.h>
 
 G_BEGIN_DECLS
 

gtk/gtkcssvalueprivate.h

@@ -21,7 +21,9 @@
 #define __GTK_CSS_VALUE_PRIVATE_H__
 
 #include <glib-object.h>
+
 #include "gtkcsstypesprivate.h"
+#include "gtkstyleprovider.h"
 
 G_BEGIN_DECLS
 

gtk/gtkdialog.c

@@ -44,6 +44,7 @@
 #include "gtksettings.h"
 #include "gtktypebuiltins.h"
 #include "gtksizegroup.h"
+#include "gtkstylecontext.h"
 
 /**
  * SECTION:gtkdialog

gtk/gtkdnd.c

@@ -33,6 +33,7 @@
 #include "gtkpicture.h"
 #include "gtkselectionprivate.h"
 #include "gtksettingsprivate.h"
+#include "gtkstylecontext.h"
 #include "gtktooltipprivate.h"
 #include "gtkwidgetprivate.h"
 #include "gtkwindowgroup.h"

gtk/gtkemojichooser.c

@@ -34,6 +34,7 @@
 #include "gtkintl.h"
 #include "gtkprivate.h"
 #include "gtksearchentryprivate.h"
+#include "gtkstylecontext.h"
 #include "gtktext.h"
 
 #define BOX_SPACE 6

gtk/gtkemojicompletion.c

@@ -32,6 +32,7 @@
 #include "gtkeventcontrollerkey.h"
 #include "gtkflowbox.h"
 #include "gtkstack.h"
+#include "gtkstylecontext.h"
 
 struct _GtkEmojiCompletion
 {

gtk/gtkfontbutton.c

@@ -29,21 +29,20 @@
 
 #include "gtkfontbutton.h"
 
-#include "gtkmain.h"
 #include "gtkbox.h"
-#include "gtklabel.h"
+#include "gtkcssprovider.h"
 #include "gtkfontchooser.h"
 #include "gtkfontchooserdialog.h"
-#include "gtkimage.h"
-#include "gtkmarshalers.h"
-#include "gtkseparator.h"
-#include "gtkprivate.h"
+#include "gtkfontchooserutils.h"
 #include "gtkintl.h"
-#include "gtkcssprovider.h"
+#include "gtklabel.h"
+#include "gtkmarshalers.h"
+#include "gtkprivate.h"
+#include "gtkseparator.h"
+#include "gtkstylecontext.h"
 
 #include <string.h>
 #include <stdio.h>
-#include "gtkfontchooserutils.h"
 
 
 /**

gtk/gtkinfobar.c

@@ -45,6 +45,7 @@
 #include "gtkintl.h"
 #include "gtkprivate.h"
 #include "gtkorientable.h"
+#include "gtkstylecontext.h"
 #include "gtktypebuiltins.h"
 #include "gtkwidgetprivate.h"
 

gtk/gtklinkbutton.c

@@ -65,6 +65,7 @@
 #include "gtkprivate.h"
 #include "gtkshow.h"
 #include "gtksizerequest.h"
+#include "gtkstylecontext.h"
 #include "gtktooltip.h"
 #include "gtkwidgetprivate.h"
 

gtk/gtkmenubutton.c

@@ -110,18 +110,19 @@
 
 #include "config.h"
 
+#include "gtkaccessible.h"
+#include "gtkactionable.h"
+#include "gtkimage.h"
+#include "gtkintl.h"
+#include "gtkmain.h"
 #include "gtkmenubutton.h"
 #include "gtkmenubuttonprivate.h"
-#include "gtktypebuiltins.h"
-#include "gtkimage.h"
-#include "gtkactionable.h"
-#include "gtkmain.h"
-#include "gtkaccessible.h"
 #include "gtkpopover.h"
-#include "a11y/gtkmenubuttonaccessible.h"
-
 #include "gtkprivate.h"
-#include "gtkintl.h"
+#include "gtkstylecontext.h"
+#include "gtktypebuiltins.h"
+
+#include "a11y/gtkmenubuttonaccessible.h"
 
 struct _GtkMenuButtonPrivate
 {

gtk/gtkmessagedialog.c

@@ -25,18 +25,20 @@
 
 #include "config.h"
 
-#include <string.h>
-
 #include "gtkmessagedialog.h"
-#include "gtkdialogprivate.h"
+
 #include "gtkaccessible.h"
-#include "gtkbuildable.h"
-#include "gtklabel.h"
 #include "gtkbox.h"
+#include "gtkbuildable.h"
+#include "gtkdialogprivate.h"
 #include "gtkintl.h"
+#include "gtklabel.h"
 #include "gtkprivate.h"
+#include "gtkstylecontext.h"
 #include "gtktypebuiltins.h"
 
+#include <string.h>
+
 /**
  * SECTION:gtkmessagedialog
  * @Short_description: A convenient message window

gtk/gtkorientable.c

@@ -22,7 +22,9 @@
 #include "config.h"
 
 #include "gtkorientableprivate.h"
+
 #include "gtkprivate.h"
+#include "gtkstylecontext.h"
 #include "gtktypebuiltins.h"
 #include "gtkintl.h"
 

gtk/gtkoverlay.c

@@ -21,14 +21,15 @@
 #include "config.h"
 
 #include "gtkoverlay.h"
-#include "gtkbuildable.h"
-#include "gtkscrolledwindow.h"
-#include "gtkwidgetprivate.h"
-#include "gtkmarshalers.h"
-#include "gtksnapshot.h"
 
-#include "gtkprivate.h"
+#include "gtkbuildable.h"
 #include "gtkintl.h"
+#include "gtkmarshalers.h"
+#include "gtkprivate.h"
+#include "gtkscrolledwindow.h"
+#include "gtksnapshot.h"
+#include "gtkstylecontext.h"
+#include "gtkwidgetprivate.h"
 
 /**
  * SECTION:gtkoverlay

gtk/gtksearchbar.c

@@ -32,12 +32,13 @@
 #include "gtkbutton.h"
 #include "gtkcenterbox.h"
 #include "gtkentryprivate.h"
+#include "gtkeventcontrollerkey.h"
 #include "gtkintl.h"
 #include "gtkprivate.h"
 #include "gtkrevealer.h"
 #include "gtksearchentryprivate.h"
 #include "gtksnapshot.h"
-#include "gtkeventcontrollerkey.h"
+#include "gtkstylecontext.h"
 
 /**
  * SECTION:gtksearchbar

gtk/gtkseparatortoolitem.c

@@ -18,11 +18,14 @@
  */
 
 #include "config.h"
-#include "gtkseparatormenuitem.h"
+
 #include "gtkseparatortoolitem.h"
+
 #include "gtkintl.h"
-#include "gtktoolbarprivate.h"
 #include "gtkprivate.h"
+#include "gtkseparatormenuitem.h"
+#include "gtkstylecontext.h"
+#include "gtktoolbarprivate.h"
 #include "gtkwidgetprivate.h"
 
 /**

gtk/gtksettings.c

@@ -18,22 +18,23 @@
 
 #include "config.h"
 
-#include <string.h>
-
-#include "gtksettings.h"
-
 #include "gtksettingsprivate.h"
-#include "gtkintl.h"
-#include "gtkwidget.h"
-#include "gtkprivate.h"
+
 #include "gtkcssproviderprivate.h"
 #include "gtkhslaprivate.h"
+#include "gtkintl.h"
+#include "gtkprivate.h"
+#include "gtkscrolledwindow.h"
+#include "gtkstylecontext.h"
 #include "gtkstyleproviderprivate.h"
 #include "gtktypebuiltins.h"
 #include "gtkversion.h"
-#include "gtkscrolledwindow.h"
+#include "gtkwidget.h"
+
 #include "gdk/gdk-private.h"
 
+#include <string.h>
+
 #ifdef GDK_WINDOWING_X11
 #include "x11/gdkx.h"
 #include <pango/pangofc-fontmap.h>

gtk/gtkshortcutsshortcut.c

@@ -27,6 +27,7 @@
 #include "gtkshortcutlabel.h"
 #include "gtkshortcutswindowprivate.h"
 #include "gtksizegroup.h"
+#include "gtkstylecontext.h"
 #include "gtktypebuiltins.h"
 
 /**

gtk/gtkshortcutswindow.c

@@ -22,11 +22,13 @@
 
 #include "gtkbindings.h"
 #include "gtkbox.h"
+#include "gtkeventcontrollerkey.h"
 #include "gtkgrid.h"
 #include "gtkheaderbar.h"
 #include "gtkintl.h"
 #include "gtklabel.h"
 #include "gtklistbox.h"
+#include "gtkmain.h"
 #include "gtkmenubutton.h"
 #include "gtkpopover.h"
 #include "gtkprivate.h"
@@ -38,13 +40,10 @@
 #include "gtkshortcutsshortcutprivate.h"
 #include "gtksizegroup.h"
 #include "gtkstack.h"
+#include "gtkstylecontext.h"
 #include "gtktogglebutton.h"
 #include "gtktypebuiltins.h"
 #include "gtkwidgetprivate.h"
-#include "gtkeventcontrollerkey.h"
-#include "gtkprivate.h"
-#include "gtkintl.h"
-#include "gtkmain.h"
 
 /**
  * SECTION:gtkshortcutswindow

gtk/gtkstackswitcher.c

@@ -18,18 +18,21 @@
  */
 
 #include "config.h"
+
 #include "gtkstackswitcher.h"
-#include "gtkradiobutton.h"
-#include "gtklabel.h"
+
 #include "gtkdnd.h"
 #include "gtkdragdest.h"
+#include "gtkimage.h"
+#include "gtkintl.h"
+#include "gtklabel.h"
 #include "gtkorientable.h"
 #include "gtkprivate.h"
-#include "gtkintl.h"
-#include "gtkwidgetprivate.h"
-#include "gtktypebuiltins.h"
-#include "gtkimage.h"
+#include "gtkradiobutton.h"
 #include "gtkselectionmodel.h"
+#include "gtkstylecontext.h"
+#include "gtktypebuiltins.h"
+#include "gtkwidgetprivate.h"
 
 /**
  * SECTION:gtkstackswitcher

gtk/gtktogglebutton.c

@@ -24,15 +24,16 @@
 
 #include "config.h"
 
-#include "gtktogglebutton.h"
+#include "gtktogglebuttonprivate.h"
 
 #include "gtkbuttonprivate.h"
-#include "gtktogglebuttonprivate.h"
+#include "gtkintl.h"
 #include "gtklabel.h"
 #include "gtkmain.h"
 #include "gtkmarshalers.h"
 #include "gtkprivate.h"
-#include "gtkintl.h"
+#include "gtkstylecontext.h"
+
 #include "a11y/gtktogglebuttonaccessible.h"
 
 

gtk/gtkviewport.c

@@ -31,6 +31,7 @@
 #include "gtkmarshalers.h"
 #include "gtkprivate.h"
 #include "gtkscrollable.h"
+#include "gtkstylecontext.h"
 #include "gtktypebuiltins.h"
 #include "gtkwidgetprivate.h"
 

gtk/gtkwin32themeprivate.h

@@ -20,6 +20,7 @@
 #ifndef __GTK_WIN32_THEME_PART_H__
 #define __GTK_WIN32_THEME_PART_H__
 
+#include "gtkborder.h"
 #include "gtkcssparserprivate.h"
 
 G_BEGIN_DECLS

gtk/inspector/size-groups.c

@@ -28,6 +28,7 @@
 #include "gtklabel.h"
 #include "gtklistbox.h"
 #include "gtksizegroup.h"
+#include "gtkstylecontext.h"
 #include "gtkswitch.h"
 #include "gtkwidgetprivate.h"