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

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

37 files changed, 90 insertions, 54 deletions

diff --git a/gtk/gtkassistant.c b/gtk/gtkassistant.c
index 8d3d67cd1d..1306bb4bd2 100644
--- a/gtk/gtkassistant.c
+++ b/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"
 
diff --git a/gtk/gtkbutton.c b/gtk/gtkbutton.c
index 6b2346cdba..8414bec0e3 100644
--- a/gtk/gtkbutton.c
+++ b/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"
diff --git a/gtk/gtkcellarea.c b/gtk/gtkcellarea.c
index 3fc37a3dac..eb4db09263 100644
--- a/gtk/gtkcellarea.c
+++ b/gtk/gtkcellarea.c
@@ -352,6 +352,7 @@
 #include "gtkmarshalers.h"
 #include "gtkprivate.h"
 #include "gtksnapshot.h"
+#include "gtkstylecontext.h"
 
 #include <gobject/gvaluecollector.h>
 
diff --git a/gtk/gtkcellrenderer.c b/gtk/gtkcellrenderer.c
index 7c176b020c..72780c77c9 100644
--- a/gtk/gtkcellrenderer.c
+++ b/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"
 
diff --git a/gtk/gtkcellrendererprogress.c b/gtk/gtkcellrendererprogress.c
index 43f4b138b6..1bacf77757 100644
--- a/gtk/gtkcellrendererprogress.c
+++ b/gtk/gtkcellrendererprogress.c
@@ -31,6 +31,7 @@
 #include "gtkorientable.h"
 #include "gtkprivate.h"
 #include "gtksnapshot.h"
+#include "gtkstylecontext.h"
 
 
 /**
diff --git a/gtk/gtkcellrenderertext.c b/gtk/gtkcellrenderertext.c
index ddacdc4e3c..9e6f238aa5 100644
--- a/gtk/gtkcellrenderertext.c
+++ b/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"
diff --git a/gtk/gtkcolorbutton.c b/gtk/gtkcolorbutton.c
index 0c8abded61..7e10a78abc 100644
--- a/gtk/gtkcolorbutton.c
+++ b/gtk/gtkcolorbutton.c
@@ -43,6 +43,7 @@
 #include "gtkmarshalers.h"
 #include "gtkprivate.h"
 #include "gtksnapshot.h"
+#include "gtkstylecontext.h"
 
 
 /**
diff --git a/gtk/gtkcolorchooserwidget.c b/gtk/gtkcolorchooserwidget.c
index 9f2d286017..8ba5df0d17 100644
--- a/gtk/gtkcolorchooserwidget.c
+++ b/gtk/gtkcolorchooserwidget.c
@@ -29,6 +29,7 @@
 #include "gtkprivate.h"
 #include "gtkintl.h"
 #include "gtksizegroup.h"
+#include "gtkstylecontext.h"
 
 #include <math.h>
 
diff --git a/gtk/gtkcssboxesprivate.h b/gtk/gtkcssboxesprivate.h
index d90ba1e598..24a38ff0de 100644
--- a/gtk/gtkcssboxesprivate.h
+++ b/gtk/gtkcssboxesprivate.h
@@ -19,6 +19,7 @@
 #define __GTK_CSS_BOXES_PRIVATE_H__
 
 #include "gtkcsstypesprivate.h"
+#include "gtktypes.h"
 
 G_BEGIN_DECLS
 
diff --git a/gtk/gtkcssimageprivate.h b/gtk/gtkcssimageprivate.h
index 7bdfc23823..f39d73ae8d 100644
--- a/gtk/gtkcssimageprivate.h
+++ b/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
 
diff --git a/gtk/gtkcssnodeprivate.h b/gtk/gtkcssnodeprivate.h
index 7335fb30da..20ef434e7e 100644
--- a/gtk/gtkcssnodeprivate.h
+++ b/gtk/gtkcssnodeprivate.h
@@ -23,6 +23,7 @@
 #include "gtkcssstylechangeprivate.h"
 #include "gtkbitmaskprivate.h"
 #include "gtkcsstypesprivate.h"
+#include "gtkstylecontext.h"
 
 G_BEGIN_DECLS
 
diff --git a/gtk/gtkcssparserprivate.h b/gtk/gtkcssparserprivate.h
index 3fb30f9136..8dd99ff9c5 100644
--- a/gtk/gtkcssparserprivate.h
+++ b/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
diff --git a/gtk/gtkcssshadowsvalueprivate.h b/gtk/gtkcssshadowsvalueprivate.h
index e79a131a1f..fe1cc65816 100644
--- a/gtk/gtkcssshadowsvalueprivate.h
+++ b/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"
diff --git a/gtk/gtkcssshadowvalueprivate.h b/gtk/gtkcssshadowvalueprivate.h
index 4633c8abed..78d6eacc97 100644
--- a/gtk/gtkcssshadowvalueprivate.h
+++ b/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"
diff --git a/gtk/gtkcsstypesprivate.h b/gtk/gtkcsstypesprivate.h
index 0c9ae190d2..ece3703208 100644
--- a/gtk/gtkcsstypesprivate.h
+++ b/gtk/gtkcsstypesprivate.h
@@ -20,7 +20,6 @@
 
 #include <glib-object.h>
 #include <gsk/gsk.h>
-#include <gtk/gtkstylecontext.h>
 
 G_BEGIN_DECLS
 
diff --git a/gtk/gtkcssvalueprivate.h b/gtk/gtkcssvalueprivate.h
index 53ba739bce..7aba6b023c 100644
--- a/gtk/gtkcssvalueprivate.h
+++ b/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
 
diff --git a/gtk/gtkdialog.c b/gtk/gtkdialog.c
index db6cbac56e..11b4d7be9b 100644
--- a/gtk/gtkdialog.c
+++ b/gtk/gtkdialog.c
@@ -44,6 +44,7 @@
 #include "gtksettings.h"
 #include "gtktypebuiltins.h"
 #include "gtksizegroup.h"
+#include "gtkstylecontext.h"
 
 /**
  * SECTION:gtkdialog
diff --git a/gtk/gtkdnd.c b/gtk/gtkdnd.c
index 0313566573..46aeba742a 100644
--- a/gtk/gtkdnd.c
+++ b/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"
diff --git a/gtk/gtkemojichooser.c b/gtk/gtkemojichooser.c
index d59ca4f5cc..26fdfb3584 100644
--- a/gtk/gtkemojichooser.c
+++ b/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
diff --git a/gtk/gtkemojicompletion.c b/gtk/gtkemojicompletion.c
index 3c8796f920..e432128ee7 100644
--- a/gtk/gtkemojicompletion.c
+++ b/gtk/gtkemojicompletion.c
@@ -32,6 +32,7 @@
 #include "gtkeventcontrollerkey.h"
 #include "gtkflowbox.h"
 #include "gtkstack.h"
+#include "gtkstylecontext.h"
 
 struct _GtkEmojiCompletion
 {
diff --git a/gtk/gtkfontbutton.c b/gtk/gtkfontbutton.c
index 3d87ffb103..6e12768c2f 100644
--- a/gtk/gtkfontbutton.c
+++ b/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 "gtkfontchooserutils.h"
+#include "gtkintl.h"
+#include "gtklabel.h"
 #include "gtkmarshalers.h"
-#include "gtkseparator.h"
 #include "gtkprivate.h"
-#include "gtkintl.h"
-#include "gtkcssprovider.h"
+#include "gtkseparator.h"
+#include "gtkstylecontext.h"
 
 #include <string.h>
 #include <stdio.h>
-#include "gtkfontchooserutils.h"
 
 
 /**
diff --git a/gtk/gtkinfobar.c b/gtk/gtkinfobar.c
index 2631fbc624..a396264e89 100644
--- a/gtk/gtkinfobar.c
+++ b/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"
 
diff --git a/gtk/gtklinkbutton.c b/gtk/gtklinkbutton.c
index ee5468aa55..50f4dfb6da 100644
--- a/gtk/gtklinkbutton.c
+++ b/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"
 
diff --git a/gtk/gtkmenubutton.c b/gtk/gtkmenubutton.c
index 68eaa1c50b..60b5a2b034 100644
--- a/gtk/gtkmenubutton.c
+++ b/gtk/gtkmenubutton.c
@@ -110,18 +110,19 @@
 
 #include "config.h"
 
-#include "gtkmenubutton.h"
-#include "gtkmenubuttonprivate.h"
-#include "gtktypebuiltins.h"
-#include "gtkimage.h"
+#include "gtkaccessible.h"
 #include "gtkactionable.h"
+#include "gtkimage.h"
+#include "gtkintl.h"
 #include "gtkmain.h"
-#include "gtkaccessible.h"
+#include "gtkmenubutton.h"
+#include "gtkmenubuttonprivate.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
 {
diff --git a/gtk/gtkmessagedialog.c b/gtk/gtkmessagedialog.c
index e98a0ffb99..153616831f 100644
--- a/gtk/gtkmessagedialog.c
+++ b/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
diff --git a/gtk/gtkorientable.c b/gtk/gtkorientable.c
index 9612e544e5..70b8e60ff7 100644
--- a/gtk/gtkorientable.c
+++ b/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"
 
diff --git a/gtk/gtkoverlay.c b/gtk/gtkoverlay.c
index 643ca00d2e..0b3c8932c3 100644
--- a/gtk/gtkoverlay.c
+++ b/gtk/gtkoverlay.c
@@ -21,14 +21,15 @@
 #include "config.h"
 
 #include "gtkoverlay.h"
+
 #include "gtkbuildable.h"
-#include "gtkscrolledwindow.h"
-#include "gtkwidgetprivate.h"
+#include "gtkintl.h"
 #include "gtkmarshalers.h"
-#include "gtksnapshot.h"
-
 #include "gtkprivate.h"
-#include "gtkintl.h"
+#include "gtkscrolledwindow.h"
+#include "gtksnapshot.h"
+#include "gtkstylecontext.h"
+#include "gtkwidgetprivate.h"
 
 /**
  * SECTION:gtkoverlay
diff --git a/gtk/gtksearchbar.c b/gtk/gtksearchbar.c
index 7c0222ef60..e774955d3f 100644
--- a/gtk/gtksearchbar.c
+++ b/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
diff --git a/gtk/gtkseparatortoolitem.c b/gtk/gtkseparatortoolitem.c
index 3cdc517c19..86cb818fd2 100644
--- a/gtk/gtkseparatortoolitem.c
+++ b/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"
 
 /**
diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c
index 0b70835bbf..354e70a083 100644
--- a/gtk/gtksettings.c
+++ b/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>
diff --git a/gtk/gtkshortcutsshortcut.c b/gtk/gtkshortcutsshortcut.c
index 3e923a34e1..1cbd8e0bf8 100644
--- a/gtk/gtkshortcutsshortcut.c
+++ b/gtk/gtkshortcutsshortcut.c
@@ -27,6 +27,7 @@
 #include "gtkshortcutlabel.h"
 #include "gtkshortcutswindowprivate.h"
 #include "gtksizegroup.h"
+#include "gtkstylecontext.h"
 #include "gtktypebuiltins.h"
 
 /**
diff --git a/gtk/gtkshortcutswindow.c b/gtk/gtkshortcutswindow.c
index 77f7d297e7..1728736541 100644
--- a/gtk/gtkshortcutswindow.c
+++ b/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
diff --git a/gtk/gtkstackswitcher.c b/gtk/gtkstackswitcher.c
index e088ba1cca..b2fa29307d 100644
--- a/gtk/gtkstackswitcher.c
+++ b/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
diff --git a/gtk/gtktogglebutton.c b/gtk/gtktogglebutton.c
index 2f3b0900b7..c482a19da0 100644
--- a/gtk/gtktogglebutton.c
+++ b/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"
 
 
diff --git a/gtk/gtkviewport.c b/gtk/gtkviewport.c
index 8a8f7e032a..123227405d 100644
--- a/gtk/gtkviewport.c
+++ b/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"
 
diff --git a/gtk/gtkwin32themeprivate.h b/gtk/gtkwin32themeprivate.h
index 9ea7777366..056e098062 100644
--- a/gtk/gtkwin32themeprivate.h
+++ b/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
diff --git a/gtk/inspector/size-groups.c b/gtk/inspector/size-groups.c
index 59ef51e7e6..0537edba00 100644
--- a/gtk/inspector/size-groups.c
+++ b/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"