Drop some unnecessary includes

gtk/deprecated/gtkcellrendererpixbuf.c

@@ -20,7 +20,6 @@
 #include "gtkcellrendererpixbuf.h"
 
 #include "gtkiconhelperprivate.h"
-#include "gtkicontheme.h"
 #include "gtkprivate.h"
 #include "gtksnapshot.h"
 #include "gtkstylecontextprivate.h"

gtk/gtkaboutdialog.c

@@ -36,22 +36,15 @@
 #include "gtkbutton.h"
 #include "gtkgrid.h"
 #include "gtkbox.h"
-#include "gtkicontheme.h"
 #include "gtkimage.h"
 #include "gtklabel.h"
 #include "gtkmarshalers.h"
 #include "gtkstack.h"
-#include "gtkorientable.h"
-#include "gtkscrolledwindow.h"
 #include "gtktextview.h"
-#include "gtkmain.h"
-#include "gtktogglebutton.h"
 #include "gtktypebuiltins.h"
 #include "gtkstack.h"
-#include "gtkstackswitcher.h"
 #include "gtksettings.h"
 #include "gtkurilauncher.h"
-#include "gtkheaderbar.h"
 #include "gtkprivate.h"
 #include <glib/gi18n-lib.h>
 #include "gtkeventcontrollermotion.h"

gtk/gtkapplication.c

@@ -23,10 +23,6 @@
 #include "gtkapplication.h"
 #include "gdkprofilerprivate.h"
 
-#ifdef G_OS_UNIX
-#include <gio/gunixfdlist.h>
-#endif
-
 #include <stdlib.h>
 
 #ifdef HAVE_UNISTD_H
@@ -36,10 +32,8 @@
 #include "gtkapplicationprivate.h"
 #include "gtkmarshalers.h"
 #include "gtkmain.h"
-#include "gtkrecentmanager.h"
 #include "gtkicontheme.h"
 #include "gtkbuilder.h"
-#include "gtkshortcutswindow.h"
 #include "gtkprivate.h"
 
 /* NB: please do not add backend-specific GDK headers here.  This should

gtk/gtkapplicationwindow.c

@@ -24,16 +24,11 @@
 #include "gtkapplicationprivate.h"
 #include "gtkwidgetprivate.h"
 #include "gtkwindowprivate.h"
-#include "gtkheaderbar.h"
 #include "gtkpopovermenubar.h"
 #include "gtksettings.h"
 #include "gtkshortcutswindowprivate.h"
 #include "gtktooltipprivate.h"
 
-#if defined(HAVE_GIO_UNIX) && !defined(__APPLE__)
-#include <gio/gdesktopappinfo.h>
-#endif
-
 /**
  * GtkApplicationWindow:
  *

gtk/gtkbox.c

@@ -67,7 +67,6 @@
 #include "gtkorientable.h"
 #include "gtkprivate.h"
 #include "gtktypebuiltins.h"
-#include "gtksizerequest.h"
 #include "gtkwidgetprivate.h"
 
 

gtk/gtkbuilder.c

@@ -216,13 +216,10 @@
 #include "gtkdebug.h"
 #include "gtkexpression.h"
 #include "gtkmain.h"
-#include "gtkicontheme.h"
 #include "gtkprivate.h"
 #include "gtkshortcutactionprivate.h"
 #include "gtkshortcuttrigger.h"
-#include "gtktestutils.h"
 #include "gtktypebuiltins.h"
-#include "gtkicontheme.h"
 #include "gtkiconthemeprivate.h"
 #include "gtkdebug.h"
 

gtk/gtkbutton.c

@@ -69,7 +69,6 @@
 #include "gtkbinlayout.h"
 #include "gtkimage.h"
 #include "gtklabel.h"
-#include "gtkmain.h"
 #include "gtkmarshalers.h"
 #include "gtkprivate.h"
 #include "gtktypebuiltins.h"

gtk/gtkcalendar.c

@@ -114,7 +114,6 @@
 #include "gtkeventcontrollerfocus.h"
 #include "gtkdragsource.h"
 #include "gtknative.h"
-#include "gtkicontheme.h"
 #include "gtkdragicon.h"
 #include "gtkbutton.h"
 #include "gtkbox.h"

gtk/gtkcheckbutton.c

@@ -29,7 +29,6 @@
 #include "gtkactionhelperprivate.h"
 #include "gtkboxlayout.h"
 #include "gtkbuiltiniconprivate.h"
-#include "gtkcssnumbervalueprivate.h"
 #include "gtkgestureclick.h"
 #include <glib/gi18n-lib.h>
 #include "gtklabel.h"
@@ -37,7 +36,6 @@
 #include "gtkshortcuttrigger.h"
 #include "gtkcssnodeprivate.h"
 #include "gtkwidgetprivate.h"
-#include "gtkmodelbuttonprivate.h"
 
 /**
  * GtkCheckButton:

gtk/gtkcolorswatch.c

@@ -26,7 +26,6 @@
 #include "gtkgesturelongpress.h"
 #include "gtkgestureclick.h"
 #include "gtkgesturesingle.h"
-#include "gtkicontheme.h"
 #include "gtkimage.h"
 #include <glib/gi18n-lib.h>
 #include "gtkmain.h"

gtk/gtkcssimagerecolor.c

@@ -23,7 +23,6 @@
 #include "gtkcssimageprivate.h"
 #include "gtkcsspalettevalueprivate.h"
 #include "gtkcsscolorvalueprivate.h"
-#include "gtkiconthemeprivate.h"
 #include "gdkpixbufutilsprivate.h"
 
 #include "gtkstyleproviderprivate.h"

gtk/gtkdragsource.c

@@ -35,7 +35,6 @@
 #include "gtkdragicon.h"
 #include "gtkprivate.h"
 #include "gtkmarshalers.h"
-#include "gtkicontheme.h"
 #include "gtkpicture.h"
 #include "gtksettingsprivate.h"
 #include "gtkgesturesingle.h"

gtk/gtkentry.c

@@ -32,8 +32,6 @@
 
 #include "gtkaccessibleprivate.h"
 #include "gtkadjustment.h"
-#include "gtkbox.h"
-#include "gtkbutton.h"
 #include "deprecated/gtkcelleditable.h"
 #include "gtkdebug.h"
 #include "gtkeditable.h"
@@ -41,25 +39,19 @@
 #include "gtkemojicompletion.h"
 #include "gtkentrybuffer.h"
 #include "gtkgesturedrag.h"
-#include "gtkimageprivate.h"
-#include "gtkimcontextsimple.h"
 #include <glib/gi18n-lib.h>
 #include "gtklabel.h"
 #include "gtkmain.h"
 #include "gtkmarshalers.h"
 #include "gtkpangoprivate.h"
-#include "gtkpopover.h"
 #include "gtkprivate.h"
 #include "gtkprogressbar.h"
-#include "gtksettings.h"
 #include "gtksnapshot.h"
 #include "gtktextprivate.h"
-#include "gtktexthandleprivate.h"
 #include "gtktextutilprivate.h"
 #include "gtktooltip.h"
 #include "gtktypebuiltins.h"
 #include "gtkwidgetprivate.h"
-#include "gtkwindow.h"
 #include "gtknative.h"
 #include "gtkgestureclick.h"
 #include "gtkdragsourceprivate.h"

gtk/gtkfilechooserwidget.c

@@ -60,10 +60,8 @@
 #include "gtksizegroup.h"
 #include "gtksizerequest.h"
 #include "gtkstack.h"
-#include "gtktooltip.h"
 #include "gtkbox.h"
 #include "gtkcheckbutton.h"
-#include "gtkwindowgroup.h"
 #include <glib/gi18n-lib.h>
 #include "gtkfilelauncher.h"
 #include "gtkmain.h"
@@ -71,8 +69,6 @@
 #include "gtkpopover.h"
 #include "gtkrevealer.h"
 #include "gtkspinner.h"
-#include "gtkseparator.h"
-#include "gtkmodelbuttonprivate.h"
 #include "gtkeventcontrollerkey.h"
 #include "gtkdebug.h"
 #include "gtkfilechoosererrorstackprivate.h"
@@ -86,7 +82,6 @@
 #include "gtkshortcuttrigger.h"
 #include "gtkshortcutaction.h"
 #include "gtkshortcut.h"
-#include "gtkstringlist.h"
 #include "gtkfilterlistmodel.h"
 #include "gtkcustomfilter.h"
 #include "gtkcustomsorter.h"

gtk/gtkfontchooserdialog.c

@@ -26,7 +26,6 @@
 #include "deprecated/gtkfontchooserwidget.h"
 #include "gtkfontchooserwidgetprivate.h"
 #include "gtkfontchooserutils.h"
-#include "gtkbox.h"
 #include <glib/gi18n-lib.h>
 #include "gtkbuildable.h"
 #include "gtkprivate.h"

gtk/gtkheaderbar.c

@@ -26,9 +26,7 @@
 #include "gtkbuildable.h"
 #include "gtkcenterbox.h"
 #include "gtklabel.h"
-#include "gtknative.h"
 #include "gtkprivate.h"
-#include "gtksizerequest.h"
 #include "gtktypebuiltins.h"
 #include "gtkwidgetprivate.h"
 #include "gtkwindowcontrols.h"

gtk/gtkimage.c

@@ -27,7 +27,6 @@
 #include "gtkimageprivate.h"
 
 #include "gtkiconhelperprivate.h"
-#include "gtkicontheme.h"
 #include "gtkprivate.h"
 #include "gtksnapshot.h"
 #include "gtktypebuiltins.h"

gtk/gtkmain.c

@@ -52,7 +52,6 @@
 
 #include <glib/gi18n-lib.h>
 
-#include "gtkbox.h"
 #include "gtkdebug.h"
 #include "gtkdropprivate.h"
 #include "gtkmain.h"
@@ -60,7 +59,6 @@
 #include "gtkmodulesprivate.h"
 #include "gtkprivate.h"
 #include "gtkrecentmanager.h"
-#include "gtksettingsprivate.h"
 #include "gtktooltipprivate.h"
 #include "gtkwidgetprivate.h"
 #include "gtkwindowprivate.h"

gtk/gtkmountoperation-x11.c

@@ -32,7 +32,6 @@
 #include <gio/gio.h>
 #include "x11/gdkx.h"
 #include <X11/Xatom.h>
-#include <gtk/gtkicontheme.h>
 #include <glib/gi18n-lib.h>
 
 /* for the kill(2) system call and errno - POSIX.1-2001 and later */

gtk/gtkpasswordentry.c

@@ -27,8 +27,6 @@
 #include "gtkeditable.h"
 #include "gtkeventcontrollerkey.h"
 #include "gtkgestureclick.h"
-#include "gtkbox.h"
-#include "gtkimage.h"
 #include <glib/gi18n-lib.h>
 #include "gtkmarshalers.h"
 #include "gtkpasswordentrybuffer.h"

gtk/gtkpathbar.c

@@ -25,7 +25,6 @@
 #include "gtkbinlayout.h"
 #include "gtkbox.h"
 #include "gtkdragsource.h"
-#include "gtkicontheme.h"
 #include "gtkimage.h"
 #include <glib/gi18n-lib.h>
 #include "gtklabel.h"

gtk/gtkplacessidebar.c

@@ -33,7 +33,6 @@
 #include "gdk/gdkkeysyms.h"
 #include "gtkbookmarksmanagerprivate.h"
 #include "gtkfilechooserutils.h"
-#include "gtkicontheme.h"
 #include <glib/gi18n-lib.h>
 #include "gtkmain.h"
 #include "gtkmarshalers.h"

gtk/gtkscale.c

@@ -31,7 +31,6 @@
 #include "gtkbuildable.h"
 #include "gtkbuilderprivate.h"
 #include "gtkgizmoprivate.h"
-#include "gtkicontheme.h"
 #include "gtklabel.h"
 #include "gtkmarshalers.h"
 #include "gtkorientable.h"

gtk/gtkspinbutton.c

@@ -34,12 +34,10 @@
 #include "gtkaccessibleprivate.h"
 #include "gtkaccessiblerange.h"
 #include "gtkadjustment.h"
-#include "gtkbox.h"
 #include "gtkbutton.h"
 #include "gtkbuttonprivate.h"
 #include "gtkeditable.h"
 #include "deprecated/gtkcelleditable.h"
-#include "gtkimage.h"
 #include "gtktext.h"
 #include "gtkeventcontrollerkey.h"
 #include "gtkeventcontrollerfocus.h"
@@ -47,7 +45,6 @@
 #include "gtkeventcontrollerscroll.h"
 #include "gtkgestureclick.h"
 #include "gtkgestureswipe.h"
-#include "gtkicontheme.h"
 #include "gtkmarshalers.h"
 #include "gtkorientable.h"
 #include "gtkprivate.h"

gtk/gtkwidget.c

@@ -42,10 +42,6 @@
 #include "gtkcssnumbervalueprivate.h"
 #include "gtkcsswidgetnodeprivate.h"
 #include "gtkdebug.h"
-#include "gtkgesturedrag.h"
-#include "gtkgestureprivate.h"
-#include "gtkgesturesingle.h"
-#include "gtkgestureswipe.h"
 #include "gtkgestureprivate.h"
 #include "gtklayoutmanagerprivate.h"
 #include "gtkmain.h"
@@ -70,7 +66,6 @@
 #include "gtktooltipprivate.h"
 #include "gsktransformprivate.h"
 #include "gtktypebuiltins.h"
-#include "gtkversion.h"
 #include "gtkwidgetpaintableprivate.h"
 #include "gtkwindowgroup.h"
 #include "gtkwindowprivate.h"

gtk/gtkwindow.c

@@ -27,15 +27,10 @@
 #include "gtkwindowprivate.h"
 
 #include "gtkaccessibleprivate.h"
-#include "gtkaccelgroupprivate.h"
-#include "gtkactionable.h"
 #include "gtkapplicationprivate.h"
 #include "gtkbox.h"
 #include "gtkbuildable.h"
-#include "gtkbuilderprivate.h"
 #include "gtkcheckbutton.h"
-#include "gtkcsscornervalueprivate.h"
-#include "gtkcsscolorvalueprivate.h"
 #include "gtkcssshadowvalueprivate.h"
 #include "gtkdroptargetasync.h"
 #include "gtkeventcontrollerlegacy.h"

gtk/gtkwindowhandle.c

@@ -20,7 +20,6 @@
 
 #include "gtkwindowhandle.h"
 
-#include "gtkactionmuxerprivate.h"
 #include "gtkbinlayout.h"
 #include "gtkbox.h"
 #include "gtkbuildable.h"