Drop gtkintl.h

Include gtkprivate.h for I_() and glib-i18n.h for gettext macros.
author: Matthias Clasen <mclasen@redhat.com> 2022-09-24 09:07:56 -0400
committer: Matthias Clasen <mclasen@redhat.com> 2022-09-24 10:03:37 -0400
commit: e499a097590372b3b9f7f9907a9a06b69a2b0daa (patch)
tree: b1138567bd9c4257b69efe7008d6c749388653fc
parent: 4aabc456854069b4b2ad5044250f493359956716 (diff)
download: gtk+-e499a097590372b3b9f7f9907a9a06b69a2b0daa.tar.gz
304 files changed, 104 insertions, 314 deletions
diff --git a/gtk/css/gtkcssdataurl.c b/gtk/css/gtkcssdataurl.c
index 6b9afb4834..f5eebe06f1 100644
--- a/gtk/css/gtkcssdataurl.c
+++ b/gtk/css/gtkcssdataurl.c
@@ -29,7 +29,7 @@
 
 #include "gtkcssdataurlprivate.h"
 
-#include "../gtkintl.h"
+#include <glib/gi18n-lib.h>
 
 #include <string.h>
 
diff --git a/gtk/gtkaboutdialog.c b/gtk/gtkaboutdialog.c
index a5a980402b..5908e14638 100644
--- a/gtk/gtkaboutdialog.c
+++ b/gtk/gtkaboutdialog.c
@@ -53,7 +53,7 @@
 #include "gtksettings.h"
 #include "gtkheaderbar.h"
 #include "gtkprivate.h"
-#include "gtkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gtkeventcontrollermotion.h"
 #include "gtkeventcontrollerkey.h"
 #include "gtkgestureclick.h"
diff --git a/gtk/gtkaccelgroup.c b/gtk/gtkaccelgroup.c
index 69afc38724..181433aa25 100644
--- a/gtk/gtkaccelgroup.c
+++ b/gtk/gtkaccelgroup.c
@@ -28,7 +28,7 @@
 
 #include "gtkaccelgroup.h"
 #include "gtkaccelgroupprivate.h"
-#include "gtkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gtkmarshalers.h"
 #include "gtkprivate.h"
 
diff --git a/gtk/gtkactionable.c b/gtk/gtkactionable.c
index e27ed4b638..7c59e25e63 100644
--- a/gtk/gtkactionable.c
+++ b/gtk/gtkactionable.c
@@ -22,7 +22,6 @@
 #include "gtkactionable.h"
 
 #include "gtkwidget.h"
-#include "gtkintl.h"
 
 /**
  * GtkActionable:
diff --git a/gtk/gtkactionbar.c b/gtk/gtkactionbar.c
index 5405315029..032e44bc3b 100644
--- a/gtk/gtkactionbar.c
+++ b/gtk/gtkactionbar.c
@@ -20,7 +20,6 @@
 #include "config.h"
 
 #include "gtkactionbar.h"
-#include "gtkintl.h"
 #include "gtkbuildable.h"
 #include "gtktypebuiltins.h"
 #include "gtkbox.h"
diff --git a/gtk/gtkactionmuxer.c b/gtk/gtkactionmuxer.c
index ac28adcb5c..d118fdae39 100644
--- a/gtk/gtkactionmuxer.c
+++ b/gtk/gtkactionmuxer.c
@@ -24,7 +24,6 @@
 #include "gtkactionobservableprivate.h"
 #include "gtkactionobserverprivate.h"
 #include "gtkbitmaskprivate.h"
-#include "gtkintl.h"
 #include "gtkmarshalers.h"
 #include "gtkwidgetprivate.h"
 #include "gsettings-mapping.h"
diff --git a/gtk/gtkadjustment.c b/gtk/gtkadjustment.c
index 9737ef21b5..1e0bae6f6b 100644
--- a/gtk/gtkadjustment.c
+++ b/gtk/gtkadjustment.c
@@ -27,7 +27,6 @@
 #include "gtkadjustmentprivate.h"
 #include "gtkmarshalers.h"
 #include "gtkprivate.h"
-#include "gtkintl.h"
 
 
 /**
diff --git a/gtk/gtkappchooser.c b/gtk/gtkappchooser.c
index be55124894..51b50f9749 100644
--- a/gtk/gtkappchooser.c
+++ b/gtk/gtkappchooser.c
@@ -47,7 +47,6 @@
 
 #include "gtkappchooser.h"
 
-#include "gtkintl.h"
 #include "gtkappchooserprivate.h"
 #include "gtkwidget.h"
 
diff --git a/gtk/gtkappchooserbutton.c b/gtk/gtkappchooserbutton.c
index bec256da6c..fb820513e1 100644
--- a/gtk/gtkappchooserbutton.c
+++ b/gtk/gtkappchooserbutton.c
@@ -62,9 +62,10 @@
 #include "gtkcombobox.h"
 #include "gtkwidgetprivate.h"
 #include "gtkdialog.h"
-#include "gtkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gtkmarshalers.h"
 #include "gtkliststore.h"
+#include "gtkprivate.h"
 
 enum {
   PROP_SHOW_DIALOG_ITEM = 1,
diff --git a/gtk/gtkappchooserdialog.c b/gtk/gtkappchooserdialog.c
index 62b4d858bc..3d1669dbf2 100644
--- a/gtk/gtkappchooserdialog.c
+++ b/gtk/gtkappchooserdialog.c
@@ -42,7 +42,6 @@
 
 #include "gtkappchooserdialog.h"
 
-#include "gtkintl.h"
 #include "gtkappchooser.h"
 #include "gtkappchooserprivate.h"
 
diff --git a/gtk/gtkappchooserwidget.c b/gtk/gtkappchooserwidget.c
index 7769f30ba9..90915f06bf 100644
--- a/gtk/gtkappchooserwidget.c
+++ b/gtk/gtkappchooserwidget.c
@@ -26,7 +26,6 @@
 
 #include "gtkappchooserwidget.h"
 
-#include "gtkintl.h"
 #include "gtkmarshalers.h"
 #include "gtkappchooserwidget.h"
 #include "gtkappchooserprivate.h"
@@ -39,6 +38,7 @@
 #include "gtklabel.h"
 #include "gtkgestureclick.h"
 #include "gtkwidgetprivate.h"
+#include "gtkprivate.h"
 
 #include <string.h>
 #include <glib/gi18n-lib.h>
diff --git a/gtk/gtkapplication-dbus.c b/gtk/gtkapplication-dbus.c
index ba5de34e83..5077475d55 100644
--- a/gtk/gtkapplication-dbus.c
+++ b/gtk/gtkapplication-dbus.c
@@ -25,7 +25,7 @@
 #include "gtkapplicationprivate.h"
 #include "gtksettings.h"
 #include "gtkprivate.h"
-#include "gtkintl.h"
+#include <glib/gi18n-lib.h>
 
 #include "gdk/gdkconstructorprivate.h"
 
diff --git a/gtk/gtkapplication.c b/gtk/gtkapplication.c
index 11cf333db1..d48e49d13a 100644
--- a/gtk/gtkapplication.c
+++ b/gtk/gtkapplication.c
@@ -40,7 +40,6 @@
 #include "gtkicontheme.h"
 #include "gtkbuilder.h"
 #include "gtkshortcutswindow.h"
-#include "gtkintl.h"
 #include "gtkprivate.h"
 
 /* NB: please do not add backend-specific GDK headers here.  This should
diff --git a/gtk/gtkapplicationwindow.c b/gtk/gtkapplicationwindow.c
index 20b4977445..152d3fbbf1 100644
--- a/gtk/gtkapplicationwindow.c
+++ b/gtk/gtkapplicationwindow.c
@@ -26,7 +26,6 @@
 #include "gtkwindowprivate.h"
 #include "gtkheaderbar.h"
 #include "gtkpopovermenubar.h"
-#include "gtkintl.h"
 #include "gtksettings.h"
 #include "gtkshortcutswindowprivate.h"
 #include "gtktooltipprivate.h"
diff --git a/gtk/gtkaspectframe.c b/gtk/gtkaspectframe.c
index 29b09492d8..363dc5feb6 100644
--- a/gtk/gtkaspectframe.c
+++ b/gtk/gtkaspectframe.c
@@ -50,7 +50,6 @@
 
 #include "gtkwidgetprivate.h"
 #include "gtkprivate.h"
-#include "gtkintl.h"
 
 
 typedef struct _GtkAspectFrameClass GtkAspectFrameClass;
diff --git a/gtk/gtkassistant.c b/gtk/gtkassistant.c
index f1bdefb711..b9a702bb6d 100644
--- a/gtk/gtkassistant.c
+++ b/gtk/gtkassistant.c
@@ -77,7 +77,6 @@
 #include "gtkbutton.h"
 #include "gtkframe.h"
 #include "gtkheaderbar.h"
-#include "gtkintl.h"
 #include "gtkimage.h"
 #include "gtklabel.h"
 #include "gtklistlistmodelprivate.h"
diff --git a/gtk/gtkbookmarklist.c b/gtk/gtkbookmarklist.c
index fbddda7a79..7d3e6ba2c5 100644
--- a/gtk/gtkbookmarklist.c
+++ b/gtk/gtkbookmarklist.c
@@ -22,7 +22,6 @@
 #include "gtkbookmarklist.h"
 
 #include "gtksettings.h"
-#include "gtkintl.h"
 #include "gtkprivate.h"
 
 /**
diff --git a/gtk/gtkboolfilter.c b/gtk/gtkboolfilter.c
index 0bdb29ea47..f67066a9f1 100644
--- a/gtk/gtkboolfilter.c
+++ b/gtk/gtkboolfilter.c
@@ -21,7 +21,6 @@
 
 #include "gtkboolfilter.h"
 
-#include "gtkintl.h"
 #include "gtktypebuiltins.h"
 
 /**
diff --git a/gtk/gtkbox.c b/gtk/gtkbox.c
index bd106fd308..2fe78c1320 100644
--- a/gtk/gtkbox.c
+++ b/gtk/gtkbox.c
@@ -64,7 +64,6 @@
 #include "gtkbox.h"
 #include "gtkboxlayout.h"
 #include "gtkbuildable.h"
-#include "gtkintl.h"
 #include "gtkorientable.h"
 #include "gtkprivate.h"
 #include "gtktypebuiltins.h"
diff --git a/gtk/gtkboxlayout.c b/gtk/gtkboxlayout.c
index 275e0371c9..615189c44a 100644
--- a/gtk/gtkboxlayout.c
+++ b/gtk/gtkboxlayout.c
@@ -21,7 +21,6 @@
 #include "gtkboxlayout.h"
 
 #include "gtkcsspositionvalueprivate.h"
-#include "gtkintl.h"
 #include "gtkorientable.h"
 #include "gtkprivate.h"
 #include "gtksizerequest.h"
diff --git a/gtk/gtkbuildable.c b/gtk/gtkbuildable.c
index bcd88171ad..6dfde21f69 100644
--- a/gtk/gtkbuildable.c
+++ b/gtk/gtkbuildable.c
@@ -36,7 +36,6 @@
 
 #include "config.h"
 #include "gtkbuildableprivate.h"
-#include "gtkintl.h"
 
 
 typedef GtkBuildableIface GtkBuildableInterface;
diff --git a/gtk/gtkbuilder-menus.c b/gtk/gtkbuilder-menus.c
index 0bc7c1ed78..fcf8731802 100644
--- a/gtk/gtkbuilder-menus.c
+++ b/gtk/gtkbuilder-menus.c
@@ -21,7 +21,7 @@
 
 #include "gtkbuilderprivate.h"
 #include "gtkbuildableprivate.h"
-#include "gtkintl.h"
+#include <glib/gi18n-lib.h>
 
 #include <gio/gio.h>
 #include <string.h>
diff --git a/gtk/gtkbuilder.c b/gtk/gtkbuilder.c
index ee546191d7..71d251377b 100644
--- a/gtk/gtkbuilder.c
+++ b/gtk/gtkbuilder.c
@@ -217,7 +217,6 @@
 #include "gtkexpression.h"
 #include "gtkmain.h"
 #include "gtkicontheme.h"
-#include "gtkintl.h"
 #include "gtkprivate.h"
 #include "gtkshortcutactionprivate.h"
 #include "gtkshortcuttrigger.h"
diff --git a/gtk/gtkbuilderlistitemfactory.c b/gtk/gtkbuilderlistitemfactory.c
index b28cf7197a..cf3f59abaf 100644
--- a/gtk/gtkbuilderlistitemfactory.c
+++ b/gtk/gtkbuilderlistitemfactory.c
@@ -23,7 +23,6 @@
 
 #include "gtkbuilder.h"
 #include "gtkbuilderprivate.h"
-#include "gtkintl.h"
 #include "gtklistitemfactoryprivate.h"
 #include "gtklistitemprivate.h"
 
diff --git a/gtk/gtkbuilderparser.c b/gtk/gtkbuilderparser.c
index 6f41b61943..9658ea226e 100644
--- a/gtk/gtkbuilderparser.c
+++ b/gtk/gtkbuilderparser.c
@@ -23,7 +23,6 @@
 #include "gtkbuildableprivate.h"
 #include "gtkbuilderscopeprivate.h"
 #include "gtkdebug.h"
-#include "gtkintl.h"
 #include "gtktypebuiltins.h"
 #include "gtkversion.h"
 #include "gdkprofilerprivate.h"
diff --git a/gtk/gtkbutton.c b/gtk/gtkbutton.c
index 2e4b8b75c9..65df53cc70 100644
--- a/gtk/gtkbutton.c
+++ b/gtk/gtkbutton.c
@@ -68,7 +68,6 @@
 #include "gtkeventcontrollerkey.h"
 #include "gtkbinlayout.h"
 #include "gtkimage.h"
-#include "gtkintl.h"
 #include "gtklabel.h"
 #include "gtkmain.h"
 #include "gtkmarshalers.h"
diff --git a/gtk/gtkcalendar.c b/gtk/gtkcalendar.c
index 8f93da1311..724bb8a6bd 100644
--- a/gtk/gtkcalendar.c
+++ b/gtk/gtkcalendar.c
@@ -99,7 +99,7 @@
 
 #include "gtkcalendar.h"
 #include "gtkdroptarget.h"
-#include "gtkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gtkmain.h"
 #include "gtkmarshalers.h"
 #include "gtktooltip.h"
diff --git a/gtk/gtkcellarea.c b/gtk/gtkcellarea.c
index cdd0ca852d..5d4f0c3eaf 100644
--- a/gtk/gtkcellarea.c
+++ b/gtk/gtkcellarea.c
@@ -343,7 +343,6 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "gtkintl.h"
 #include "gtkcelllayout.h"
 #include "gtkcellarea.h"
 #include "gtkcellareacontext.h"
diff --git a/gtk/gtkcellareabox.c b/gtk/gtkcellareabox.c
index 626502cb18..cfacb38866 100644
--- a/gtk/gtkcellareabox.c
+++ b/gtk/gtkcellareabox.c
@@ -45,7 +45,6 @@
  */
 
 #include "config.h"
-#include "gtkintl.h"
 #include "gtkorientable.h"
 #include "gtkcelllayout.h"
 #include "gtkcellareabox.h"
diff --git a/gtk/gtkcellareaboxcontext.c b/gtk/gtkcellareaboxcontext.c
index 19020041b2..f56f857c22 100644
--- a/gtk/gtkcellareaboxcontext.c
+++ b/gtk/gtkcellareaboxcontext.c
@@ -20,7 +20,6 @@
  */
 
 #include "config.h"
-#include "gtkintl.h"
 #include "gtkcellareabox.h"
 #include "gtkcellareaboxcontextprivate.h"
 #include "gtkorientable.h"
diff --git a/gtk/gtkcellareacontext.c b/gtk/gtkcellareacontext.c
index 9886bccabc..d562400142 100644
--- a/gtk/gtkcellareacontext.c
+++ b/gtk/gtkcellareacontext.c
@@ -37,7 +37,6 @@
  */
 
 #include "config.h"
-#include "gtkintl.h"
 #include "gtkmarshalers.h"
 #include "gtkcellareacontext.h"
 #include "gtkprivate.h"
diff --git a/gtk/gtkcelleditable.c b/gtk/gtkcelleditable.c
index b80ee1e762..facd4e85bb 100644
--- a/gtk/gtkcelleditable.c
+++ b/gtk/gtkcelleditable.c
@@ -29,7 +29,6 @@
 #include "gtkcelleditable.h"
 #include "gtkmarshalers.h"
 #include "gtkprivate.h"
-#include "gtkintl.h"
 
 
 typedef GtkCellEditableIface GtkCellEditableInterface;
diff --git a/gtk/gtkcelllayout.c b/gtk/gtkcelllayout.c
index 5563874618..158c20b240 100644
--- a/gtk/gtkcelllayout.c
+++ b/gtk/gtkcelllayout.c
@@ -134,7 +134,6 @@
 #include <errno.h>
 #include "gtkcelllayout.h"
 #include "gtkbuilderprivate.h"
-#include "gtkintl.h"
 
 #define warn_no_cell_area(func)					\
   g_critical ("%s: Called but no GtkCellArea is available yet", func)
diff --git a/gtk/gtkcellrenderer.c b/gtk/gtkcellrenderer.c
index ece9c4657a..80937d571e 100644
--- a/gtk/gtkcellrenderer.c
+++ b/gtk/gtkcellrenderer.c
@@ -19,7 +19,6 @@
 
 #include "gtkcellrenderer.h"
 
-#include "gtkintl.h"
 #include "gtkmarshalers.h"
 #include "gtkprivate.h"
 #include "gtksnapshot.h"
diff --git a/gtk/gtkcellrendereraccel.c b/gtk/gtkcellrendereraccel.c
index 911b407672..f6286337a7 100644
--- a/gtk/gtkcellrendereraccel.c
+++ b/gtk/gtkcellrendereraccel.c
@@ -19,7 +19,7 @@
 
 #include "gtkcellrendereraccel.h"
 
-#include "gtkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gtkaccelgroup.h"
 #include "gtkmarshalers.h"
 #include "gtklabel.h"
diff --git a/gtk/gtkcellrenderercombo.c b/gtk/gtkcellrenderercombo.c
index 1cad6653fd..399721065b 100644
--- a/gtk/gtkcellrenderercombo.c
+++ b/gtk/gtkcellrenderercombo.c
@@ -18,7 +18,6 @@
 #include "config.h"
 #include <string.h>
 
-#include "gtkintl.h"
 #include "gtkentry.h"
 #include "gtkcelllayout.h"
 #include "gtkcellrenderercombo.h"
diff --git a/gtk/gtkcellrendererpixbuf.c b/gtk/gtkcellrendererpixbuf.c
index 8c3f4c9161..b0c541123c 100644
--- a/gtk/gtkcellrendererpixbuf.c
+++ b/gtk/gtkcellrendererpixbuf.c
@@ -21,7 +21,6 @@
 
 #include "gtkiconhelperprivate.h"
 #include "gtkicontheme.h"
-#include "gtkintl.h"
 #include "gtkprivate.h"
 #include "gtksnapshot.h"
 #include "gtkstylecontextprivate.h"
diff --git a/gtk/gtkcellrendererprogress.c b/gtk/gtkcellrendererprogress.c
index a836abe093..6bee958e69 100644
--- a/gtk/gtkcellrendererprogress.c
+++ b/gtk/gtkcellrendererprogress.c
@@ -27,7 +27,7 @@
 #include <stdlib.h>
 
 #include "gtkcellrendererprogress.h"
-#include "gtkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gtkorientable.h"
 #include "gtkprivate.h"
 #include "gtksnapshot.h"
diff --git a/gtk/gtkcellrendererspin.c b/gtk/gtkcellrendererspin.c
index 6b4cbeaefd..92a12e6010 100644
--- a/gtk/gtkcellrendererspin.c
+++ b/gtk/gtkcellrendererspin.c
@@ -23,7 +23,6 @@
 #include "gtkcellrendererspin.h"
 
 #include "gtkadjustment.h"
-#include "gtkintl.h"
 #include "gtkprivate.h"
 #include "gtkspinbutton.h"
 #include "gtkentry.h"
diff --git a/gtk/gtkcellrendererspinner.c b/gtk/gtkcellrendererspinner.c
index 52559f83a0..c7d0d12822 100644
--- a/gtk/gtkcellrendererspinner.c
+++ b/gtk/gtkcellrendererspinner.c
@@ -29,7 +29,6 @@
 
 #include "gtkcellrendererspinner.h"
 #include "gtkiconhelperprivate.h"
-#include "gtkintl.h"
 #include "gtksettings.h"
 #include "gtksnapshot.h"
 #include "gtktypebuiltins.h"
diff --git a/gtk/gtkcellrenderertext.c b/gtk/gtkcellrenderertext.c
index 2b673e963e..d2dedcd491 100644
--- a/gtk/gtkcellrenderertext.c
+++ b/gtk/gtkcellrenderertext.c
@@ -23,7 +23,6 @@
 #include "gtkeditable.h"
 #include "gtkentry.h"
 #include "gtkentryprivate.h"
-#include "gtkintl.h"
 #include "gtkmarshalers.h"
 #include "gtkprivate.h"
 #include "gtksizerequest.h"
diff --git a/gtk/gtkcellrenderertoggle.c b/gtk/gtkcellrenderertoggle.c
index 2a4c9669a9..02778c5bf6 100644
--- a/gtk/gtkcellrenderertoggle.c
+++ b/gtk/gtkcellrenderertoggle.c
@@ -21,7 +21,6 @@
 
 #include "gtkcssnumbervalueprivate.h"
 #include "gtkcsstransientnodeprivate.h"
-#include "gtkintl.h"
 #include "gtkmarshalers.h"
 #include "gtkprivate.h"
 #include "gtkrendericonprivate.h"
diff --git a/gtk/gtkcellview.c b/gtk/gtkcellview.c
index 60860c3293..3cb455c120 100644
--- a/gtk/gtkcellview.c
+++ b/gtk/gtkcellview.c
@@ -24,7 +24,6 @@
 #include "gtkcellareabox.h"
 #include "gtkcellrendererpixbuf.h"
 #include "gtkcellrenderertext.h"
-#include "gtkintl.h"
 #include "gtkorientable.h"
 #include "gtkprivate.h"
 #include "gtkwidgetprivate.h"
diff --git a/gtk/gtkcenterbox.c b/gtk/gtkcenterbox.c
index 6b7046f356..9730f28e6e 100644
--- a/gtk/gtkcenterbox.c
+++ b/gtk/gtkcenterbox.c
@@ -64,7 +64,6 @@
 #include "gtksizerequest.h"
 #include "gtktypebuiltins.h"
 #include "gtkprivate.h"
-#include "gtkintl.h"
 
 struct _GtkCenterBox
 {
diff --git a/gtk/gtkcenterlayout.c b/gtk/gtkcenterlayout.c
index 72db233550..8862cc9ce0 100644
--- a/gtk/gtkcenterlayout.c
+++ b/gtk/gtkcenterlayout.c
@@ -19,7 +19,6 @@
 #include "gtkcenterlayout.h"
 
 #include "gtkcsspositionvalueprivate.h"
-#include "gtkintl.h"
 #include "gtklayoutchild.h"
 #include "gtkprivate.h"
 #include "gtksizerequest.h"
diff --git a/gtk/gtkcheckbutton.c b/gtk/gtkcheckbutton.c
index 12a08b4452..d909032d81 100644
--- a/gtk/gtkcheckbutton.c
+++ b/gtk/gtkcheckbutton.c
@@ -31,7 +31,7 @@
 #include "gtkbuiltiniconprivate.h"
 #include "gtkcssnumbervalueprivate.h"
 #include "gtkgestureclick.h"
-#include "gtkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gtklabel.h"
 #include "gtkprivate.h"
 #include "gtkshortcuttrigger.h"
diff --git a/gtk/gtkcolorbutton.c b/gtk/gtkcolorbutton.c
index bb00ab50bb..8d1e4ceb30 100644
--- a/gtk/gtkcolorbutton.c
+++ b/gtk/gtkcolorbutton.c
@@ -38,7 +38,7 @@
 #include "gtkcolorswatchprivate.h"
 #include "gtkdragsource.h"
 #include "gtkdroptarget.h"
-#include "gtkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gtkmain.h"
 #include "gtkmarshalers.h"
 #include "gtkprivate.h"
diff --git a/gtk/gtkcolorchooser.c b/gtk/gtkcolorchooser.c
index b11a673b41..3e89cd6bc2 100644
--- a/gtk/gtkcolorchooser.c
+++ b/gtk/gtkcolorchooser.c
@@ -20,7 +20,6 @@
 
 #include "gtkcolorchooser.h"
 #include "gtkcolorchooserprivate.h"
-#include "gtkintl.h"
 #include "gtktypebuiltins.h"
 #include "gtkprivate.h"
 #include "gtksnapshot.h"
diff --git a/gtk/gtkcolorchooserdialog.c b/gtk/gtkcolorchooserdialog.c
index 3ea3fdba79..81ac261880 100644
--- a/gtk/gtkcolorchooserdialog.c
+++ b/gtk/gtkcolorchooserdialog.c
@@ -22,7 +22,6 @@
 #include "gtkbutton.h"
 #include "gtkbox.h"
 #include "gtkprivate.h"
-#include "gtkintl.h"
 #include "gtksettings.h"
 
 #include "gtkcolorchooserprivate.h"
diff --git a/gtk/gtkcolorchooserwidget.c b/gtk/gtkcolorchooserwidget.c
index 3f1c3fee47..c6b1a445f1 100644
--- a/gtk/gtkcolorchooserwidget.c
+++ b/gtk/gtkcolorchooserwidget.c
@@ -26,7 +26,7 @@
 #include "gtklabel.h"
 #include "gtkorientable.h"
 #include "gtkprivate.h"
-#include "gtkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gtksizegroup.h"
 #include "gtkboxlayout.h"
 #include "gtkwidgetprivate.h"
diff --git a/gtk/gtkcoloreditor.c b/gtk/gtkcoloreditor.c
index 5f7faa5e03..a2b03db605 100644
--- a/gtk/gtkcoloreditor.c
+++ b/gtk/gtkcoloreditor.c
@@ -27,7 +27,6 @@
 #include "gtkcolorpickerprivate.h"
 #include "gtkgrid.h"
 #include "gtkbutton.h"
-#include "gtkintl.h"
 #include "gtkorientable.h"
 #include "gtkentry.h"
 #include "gtkoverlay.h"
diff --git a/gtk/gtkcolorplane.c b/gtk/gtkcolorplane.c
index 93b9ff0594..cda170735b 100644
--- a/gtk/gtkcolorplane.c
+++ b/gtk/gtkcolorplane.c
@@ -23,7 +23,6 @@
 #include "gtkcolorutils.h"
 #include "gtkgesturedrag.h"
 #include "gtkgesturelongpress.h"
-#include "gtkintl.h"
 #include "gtksnapshot.h"
 #include "gtkprivate.h"
 #include "gtkeventcontrollerkey.h"
diff --git a/gtk/gtkcolorscale.c b/gtk/gtkcolorscale.c
index 824516aaef..c0456193fd 100644
--- a/gtk/gtkcolorscale.c
+++ b/gtk/gtkcolorscale.c
@@ -26,7 +26,6 @@
 #include "gtkorientable.h"
 #include "gtkrangeprivate.h"
 #include "gtkprivate.h"
-#include "gtkintl.h"
 #include "gtksnapshot.h"
 #include "gtkshortcutcontroller.h"
 #include "gtkshortcuttrigger.h"
diff --git a/gtk/gtkcolorswatch.c b/gtk/gtkcolorswatch.c
index 66b65946cc..9f1b7d056c 100644
--- a/gtk/gtkcolorswatch.c
+++ b/gtk/gtkcolorswatch.c
@@ -28,7 +28,7 @@
 #include "gtkgesturesingle.h"
 #include "gtkicontheme.h"
 #include "gtkimage.h"
-#include "gtkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gtkmain.h"
 #include "gtkmodelbuttonprivate.h"
 #include "gtkpopovermenu.h"
diff --git a/gtk/gtkcolumnview.c b/gtk/gtkcolumnview.c
index c46b7d8309..1e7299ed47 100644
--- a/gtk/gtkcolumnview.c
+++ b/gtk/gtkcolumnview.c
@@ -29,7 +29,6 @@
 #include "gtkcolumnviewsorterprivate.h"
 #include "gtkcssnodeprivate.h"
 #include "gtkdropcontrollermotion.h"
-#include "gtkintl.h"
 #include "gtklistviewprivate.h"
 #include "gtkmain.h"
 #include "gtkprivate.h"
diff --git a/gtk/gtkcolumnviewcell.c b/gtk/gtkcolumnviewcell.c
index 1ada1b4292..3eb39c4db3 100644
--- a/gtk/gtkcolumnviewcell.c
+++ b/gtk/gtkcolumnviewcell.c
@@ -22,7 +22,7 @@
 #include "gtkcolumnviewcellprivate.h"
 
 #include "gtkcolumnviewcolumnprivate.h"
-#include "gtkintl.h"
+#include "gtkprivate.h"
 #include "gtklistitemwidgetprivate.h"
 #include "gtkwidgetprivate.h"
 #include "gtkcssnodeprivate.h"
diff --git a/gtk/gtkcolumnviewcolumn.c b/gtk/gtkcolumnviewcolumn.c
index 2876e92b0b..74c89c0c8d 100644
--- a/gtk/gtkcolumnviewcolumn.c
+++ b/gtk/gtkcolumnviewcolumn.c
@@ -24,7 +24,6 @@
 
 #include "gtkcolumnviewprivate.h"
 #include "gtkcolumnviewtitleprivate.h"
-#include "gtkintl.h"
 #include "gtklistbaseprivate.h"
 #include "gtklistitemwidgetprivate.h"
 #include "gtkmain.h"
diff --git a/gtk/gtkcolumnviewsorter.c b/gtk/gtkcolumnviewsorter.c
index 28f2e7e677..a90a14a292 100644
--- a/gtk/gtkcolumnviewsorter.c
+++ b/gtk/gtkcolumnviewsorter.c
@@ -22,7 +22,6 @@
 #include "gtkcolumnviewsorterprivate.h"
 
 #include "gtkcolumnviewcolumnprivate.h"
-#include "gtkintl.h"
 #include "gtktypebuiltins.h"
 
 typedef struct
diff --git a/gtk/gtkcolumnviewtitle.c b/gtk/gtkcolumnviewtitle.c
index e2e57b29fa..cb75bc1d74 100644
--- a/gtk/gtkcolumnviewtitle.c
+++ b/gtk/gtkcolumnviewtitle.c
@@ -24,7 +24,7 @@
 #include "gtkcolumnviewprivate.h"
 #include "gtkcolumnviewcolumnprivate.h"
 #include "gtkcolumnviewsorterprivate.h"
-#include "gtkintl.h"
+#include "gtkprivate.h"
 #include "gtklabel.h"
 #include "gtkwidgetprivate.h"
 #include "gtkbox.h"
diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
index 60209822e1..09a36bfa1e 100644
--- a/gtk/gtkcombobox.c
+++ b/gtk/gtkcombobox.c
@@ -28,7 +28,6 @@
 #include "gtkeventcontrollerscroll.h"
 #include "gtkframe.h"
 #include "gtkbuiltiniconprivate.h"
-#include "gtkintl.h"
 #include "gtkliststore.h"
 #include "gtkmain.h"
 #include "gtkmarshalers.h"
diff --git a/gtk/gtkconstraint.c b/gtk/gtkconstraint.c
index 48ba6f146a..4832120709 100644
--- a/gtk/gtkconstraint.c
+++ b/gtk/gtkconstraint.c
@@ -41,7 +41,6 @@
 
 #include "gtkconstraintprivate.h"
 #include "gtkconstraintsolverprivate.h"
-#include "gtkintl.h"
 #include "gtktypebuiltins.h"
 #include "gtkwidget.h"
 
diff --git a/gtk/gtkconstraintguide.c b/gtk/gtkconstraintguide.c
index d032af4691..b623fae9f6 100644
--- a/gtk/gtkconstraintguide.c
+++ b/gtk/gtkconstraintguide.c
@@ -44,7 +44,6 @@
 #include "gtkconstraintsolverprivate.h"
 
 #include "gtkdebug.h"
-#include "gtkintl.h"
 #include "gtkprivate.h"
 
 
diff --git a/gtk/gtkconstraintlayout.c b/gtk/gtkconstraintlayout.c
index bcf33dd310..3263e562a2 100644
--- a/gtk/gtkconstraintlayout.c
+++ b/gtk/gtkconstraintlayout.c
@@ -206,7 +206,6 @@
 #include "gtkbuilderprivate.h"
 #include "gtkdebug.h"
 #include "gtklayoutchild.h"
-#include "gtkintl.h"
 #include "gtkprivate.h"
 #include "gtksizerequest.h"
 #include "gtkwidgetprivate.h"
diff --git a/gtk/gtkcssnode.c b/gtk/gtkcssnode.c
index 071c1f5f98..b092da15a8 100644
--- a/gtk/gtkcssnode.c
+++ b/gtk/gtkcssnode.c
@@ -22,7 +22,6 @@
 #include "gtkcssstaticstyleprivate.h"
 #include "gtkcssanimatedstyleprivate.h"
 #include "gtkcssstylepropertyprivate.h"
-#include "gtkintl.h"
 #include "gtkmarshalers.h"
 #include "gtksettingsprivate.h"
 #include "gtktypebuiltins.h"
diff --git a/gtk/gtkcssprovider.c b/gtk/gtkcssprovider.c
index 13644f5d82..1cd3f4c12b 100644
--- a/gtk/gtkcssprovider.c
+++ b/gtk/gtkcssprovider.c
@@ -34,7 +34,6 @@
 #include "gtkstyleproviderprivate.h"
 #include "gtkmarshalers.h"
 #include "gtkprivate.h"
-#include "gtkintl.h"
 #include "gtkversion.h"
 
 #include <string.h>
diff --git a/gtk/gtkcssshorthandproperty.c b/gtk/gtkcssshorthandproperty.c
index 6f66423030..d62283d17c 100644
--- a/gtk/gtkcssshorthandproperty.c
+++ b/gtk/gtkcssshorthandproperty.c
@@ -25,7 +25,6 @@
 #include "gtkcssinheritvalueprivate.h"
 #include "gtkcssinitialvalueprivate.h"
 #include "gtkcssunsetvalueprivate.h"
-#include "gtkintl.h"
 
 enum {
   PROP_0,
diff --git a/gtk/gtkcssstaticstyle.c b/gtk/gtkcssstaticstyle.c
index ba7d2ff958..71a10bc552 100644
--- a/gtk/gtkcssstaticstyle.c
+++ b/gtk/gtkcssstaticstyle.c
@@ -32,7 +32,6 @@
 #include "gtkcssstylepropertyprivate.h"
 #include "gtkcsstransitionprivate.h"
 #include "gtkprivate.h"
-#include "gtkintl.h"
 #include "gtksettings.h"
 #include "gtkstyleanimationprivate.h"
 #include "gtkstylepropertyprivate.h"
diff --git a/gtk/gtkcssstyleproperty.c b/gtk/gtkcssstyleproperty.c
index e049d5e355..d2510dd70d 100644
--- a/gtk/gtkcssstyleproperty.c
+++ b/gtk/gtkcssstyleproperty.c
@@ -26,7 +26,6 @@
 #include "gtkcssinitialvalueprivate.h"
 #include "gtkcsstypesprivate.h"
 #include "gtkcssunsetvalueprivate.h"
-#include "gtkintl.h"
 #include "gtkprivatetypebuiltins.h"
 #include "gtkprivate.h"
 
diff --git a/gtk/gtkcssstylepropertyimpl.c b/gtk/gtkcssstylepropertyimpl.c
index 4ee8a200ef..c06b31ddfb 100644
--- a/gtk/gtkcssstylepropertyimpl.c
+++ b/gtk/gtkcssstylepropertyimpl.c
@@ -28,7 +28,6 @@
 #include "gtk/css/gtkcssparserprivate.h"
 #include "gtkcssstylepropertyprivate.h"
 #include "gtkcsstypesprivate.h"
-#include "gtkintl.h"
 #include "gtkprivatetypebuiltins.h"
 
 /* the actual parsers we have */
diff --git a/gtk/gtkcustomfilter.c b/gtk/gtkcustomfilter.c
index 97c86e2470..4dbd4a6276 100644
--- a/gtk/gtkcustomfilter.c
+++ b/gtk/gtkcustomfilter.c
@@ -21,7 +21,6 @@
 
 #include "gtkcustomfilter.h"
 
-#include "gtkintl.h"
 #include "gtktypebuiltins.h"
 
 /**
diff --git a/gtk/gtkcustompaperunixdialog.c b/gtk/gtkcustompaperunixdialog.c
index 62218142f6..3ed3949ecf 100644
--- a/gtk/gtkcustompaperunixdialog.c
+++ b/gtk/gtkcustompaperunixdialog.c
@@ -25,7 +25,7 @@
 #include <langinfo.h>
 #endif
 
-#include "gtkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gtkprivate.h"
 
 #include "gtkliststore.h"
diff --git a/gtk/gtkcustomsorter.c b/gtk/gtkcustomsorter.c
index 4ee526aa2c..309711ed7e 100644
--- a/gtk/gtkcustomsorter.c
+++ b/gtk/gtkcustomsorter.c
@@ -21,7 +21,6 @@
 
 #include "gtkcustomsorter.h"
 
-#include "gtkintl.h"
 #include "gtktypebuiltins.h"
 
 /**
diff --git a/gtk/gtkdialog.c b/gtk/gtkdialog.c
index 0e745acbea..d824222b0d 100644
--- a/gtk/gtkdialog.c
+++ b/gtk/gtkdialog.c
@@ -36,7 +36,6 @@
 #include "gtkmarshalers.h"
 #include "gtkbox.h"
 #include "gtkmain.h"
-#include "gtkintl.h"
 #include "gtkprivate.h"
 #include "gtkbuildable.h"
 #include "gtkbuilderprivate.h"
diff --git a/gtk/gtkdirectorylist.c b/gtk/gtkdirectorylist.c
index 1c381b051b..61d6876cf9 100644
--- a/gtk/gtkdirectorylist.c
+++ b/gtk/gtkdirectorylist.c
@@ -21,7 +21,6 @@
 
 #include "gtkdirectorylist.h"
 
-#include "gtkintl.h"
 #include "gtkprivate.h"
 
 /**
diff --git a/gtk/gtkdragicon.c b/gtk/gtkdragicon.c
index 9d199fa015..f82dbb6aeb 100644
--- a/gtk/gtkdragicon.c
+++ b/gtk/gtkdragicon.c
@@ -19,7 +19,6 @@
 
 #include "gtkdragicon.h"
 
-#include "gtkintl.h"
 #include "gtkwidgetprivate.h"
 #include "gtkcssstyleprivate.h"
 #include "gtkcsstypesprivate.h"
diff --git a/gtk/gtkdragsource.c b/gtk/gtkdragsource.c
index 94bb8c54aa..857abdacc2 100644
--- a/gtk/gtkdragsource.c
+++ b/gtk/gtkdragsource.c
@@ -31,7 +31,6 @@
 #include "gtkimagedefinitionprivate.h"
 #include "gtknative.h"
 #include "gtkwidgetprivate.h"
-#include "gtkintl.h"
 #include "gtkimageprivate.h"
 #include "gtkdragicon.h"
 #include "gtkprivate.h"
diff --git a/gtk/gtkdrawingarea.c b/gtk/gtkdrawingarea.c
index f4ef3ced6b..0b39bbe905 100644
--- a/gtk/gtkdrawingarea.c
+++ b/gtk/gtkdrawingarea.c
@@ -24,7 +24,6 @@
 
 #include "config.h"
 #include "gtkdrawingarea.h"
-#include "gtkintl.h"
 #include "gtkmarshalers.h"
 #include "gtkprivate.h"
 #include "gtksnapshot.h"
diff --git a/gtk/gtkdropcontrollermotion.c b/gtk/gtkdropcontrollermotion.c
index 86f419b589..2dfa313faf 100644
--- a/gtk/gtkdropcontrollermotion.c
+++ b/gtk/gtkdropcontrollermotion.c
@@ -34,7 +34,6 @@
 
 #include "gtkdropcontrollermotion.h"
 
-#include "gtkintl.h"
 #include "gtkprivate.h"
 #include "gtkwidgetprivate.h"
 #include "gtkmarshalers.h"
diff --git a/gtk/gtkdropdown.c b/gtk/gtkdropdown.c
index e7f8bf856e..3441e67ea1 100644
--- a/gtk/gtkdropdown.c
+++ b/gtk/gtkdropdown.c
@@ -22,7 +22,6 @@
 #include "gtkdropdown.h"
 
 #include "gtkbuiltiniconprivate.h"
-#include "gtkintl.h"
 #include "gtklistview.h"
 #include "gtklistitemfactory.h"
 #include "gtksignallistitemfactory.h"
diff --git a/gtk/gtkdroptarget.c b/gtk/gtkdroptarget.c
index ab606d9414..31ca55f950 100644
--- a/gtk/gtkdroptarget.c
+++ b/gtk/gtkdroptarget.c
@@ -28,7 +28,6 @@
 
 #include "gtkdropprivate.h"
 #include "gtkeventcontrollerprivate.h"
-#include "gtkintl.h"
 #include "gtkmarshalers.h"
 #include "gtknative.h"
 #include "gtkprivate.h"
diff --git a/gtk/gtkdroptargetasync.c b/gtk/gtkdroptargetasync.c
index c2b7da5196..ad94c64979 100644
--- a/gtk/gtkdroptargetasync.c
+++ b/gtk/gtkdroptargetasync.c
@@ -28,10 +28,10 @@
 
 #include "gtkdropprivate.h"
 #include "gtkeventcontrollerprivate.h"
-#include "gtkintl.h"
 #include "gtkmarshalers.h"
 #include "gtknative.h"
 #include "gtktypebuiltins.h"
+#include "gtkprivate.h"
 
 
 /**
diff --git a/gtk/gtkeditable.c b/gtk/gtkeditable.c
index fb45d7d013..8818bcdd4d 100644
--- a/gtk/gtkeditable.c
+++ b/gtk/gtkeditable.c
@@ -161,7 +161,6 @@
 #include "gtkeditable.h"
 #include "gtkentrybuffer.h"
 #include "gtkmarshalers.h"
-#include "gtkintl.h"
 #include "gtkprivate.h"
 
 G_DEFINE_INTERFACE (GtkEditable, gtk_editable, GTK_TYPE_WIDGET)
diff --git a/gtk/gtkeditablelabel.c b/gtk/gtkeditablelabel.c
index d14642089f..e107121ad9 100644
--- a/gtk/gtkeditablelabel.c
+++ b/gtk/gtkeditablelabel.c
@@ -31,7 +31,6 @@
 #include "gtkshortcuttrigger.h"
 #include "gtkwidgetprivate.h"
 #include "gtkeventcontrollerfocus.h"
-#include "gtkintl.h"
 
 /**
  * GtkEditableLabel:
diff --git a/gtk/gtkemojichooser.c b/gtk/gtkemojichooser.c
index 103b2cc4f5..accc32ca9e 100644
--- a/gtk/gtkemojichooser.c
+++ b/gtk/gtkemojichooser.c
@@ -30,7 +30,6 @@
 #include "gtkgesturelongpress.h"
 #include "gtkpopover.h"
 #include "gtkscrolledwindow.h"
-#include "gtkintl.h"
 #include "gtksearchentryprivate.h"
 #include "gtktext.h"
 #include "gtknative.h"
diff --git a/gtk/gtkemojicompletion.c b/gtk/gtkemojicompletion.c
index 31669c85d5..a991f058a4 100644
--- a/gtk/gtkemojicompletion.c
+++ b/gtk/gtkemojicompletion.c
@@ -26,7 +26,6 @@
 #include "gtklistbox.h"
 #include "gtklabel.h"
 #include "gtkpopover.h"
-#include "gtkintl.h"
 #include "gtkprivate.h"
 #include "gtkgesturelongpress.h"
 #include "gtkeventcontrollerkey.h"
diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index b0cee37e4c..3a73675052 100644
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -44,7 +44,7 @@
 #include "gtkgesturedrag.h"
 #include "gtkimageprivate.h"
 #include "gtkimcontextsimple.h"
-#include "gtkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gtklabel.h"
 #include "gtkmain.h"
 #include "gtkmarshalers.h"
diff --git a/gtk/gtkentrybuffer.c b/gtk/gtkentrybuffer.c
index a693b876bd..dd4d47b2c7 100644
--- a/gtk/gtkentrybuffer.c
+++ b/gtk/gtkentrybuffer.c
@@ -18,7 +18,6 @@
 #include "config.h"
 
 #include "gtkentrybuffer.h"
-#include "gtkintl.h"
 #include "gtkmarshalers.h"
 #include "gtkprivate.h"
 #include "gtkwidget.h"
diff --git a/gtk/gtkentrycompletion.c b/gtk/gtkentrycompletion.c
index 8d1bf57269..bc37fe9ab1 100644
--- a/gtk/gtkentrycompletion.c
+++ b/gtk/gtkentrycompletion.c
@@ -67,7 +67,6 @@
 #include "gtkcelllayout.h"
 #include "gtkcellareabox.h"
 
-#include "gtkintl.h"
 #include "gtkcellrenderertext.h"
 #include "gtktreeselection.h"
 #include "gtktreeview.h"
diff --git a/gtk/gtkeventcontroller.c b/gtk/gtkeventcontroller.c
index df6a9eebcc..a6d110fad0 100644
--- a/gtk/gtkeventcontroller.c
+++ b/gtk/gtkeventcontroller.c
@@ -43,7 +43,6 @@
 #include "gtktypebuiltins.h"
 #include "gtkmarshalers.h"
 #include "gtkprivate.h"
-#include "gtkintl.h"
 #include "gtknative.h"
 
 typedef struct _GtkEventControllerPrivate GtkEventControllerPrivate;
diff --git a/gtk/gtkeventcontrollerfocus.c b/gtk/gtkeventcontrollerfocus.c
index 6261420e9a..531bb4c97f 100644
--- a/gtk/gtkeventcontrollerfocus.c
+++ b/gtk/gtkeventcontrollerfocus.c
@@ -33,7 +33,6 @@
 
 #include "config.h"
 
-#include "gtkintl.h"
 #include "gtkmarshalers.h"
 #include "gtkprivate.h"
 #include "gtkwidgetprivate.h"
diff --git a/gtk/gtkeventcontrollerkey.c b/gtk/gtkeventcontrollerkey.c
index 49a149668b..f3ab6e8a50 100644
--- a/gtk/gtkeventcontrollerkey.c
+++ b/gtk/gtkeventcontrollerkey.c
@@ -26,7 +26,6 @@
 
 #include "config.h"
 
-#include "gtkintl.h"
 #include "gtkmarshalers.h"
 #include "gtkprivate.h"
 #include "gtkwidgetprivate.h"
diff --git a/gtk/gtkeventcontrollerlegacy.c b/gtk/gtkeventcontrollerlegacy.c
index 63f7c385ea..46ddee24d6 100644
--- a/gtk/gtkeventcontrollerlegacy.c
+++ b/gtk/gtkeventcontrollerlegacy.c
@@ -32,7 +32,6 @@
 #include "gtkeventcontrollerlegacy.h"
 #include "gtkeventcontrollerprivate.h"
 #include "gtkmarshalers.h"
-#include "gtkintl.h"
 #include "gtkprivate.h"
 
 struct _GtkEventControllerLegacy
diff --git a/gtk/gtkeventcontrollermotion.c b/gtk/gtkeventcontrollermotion.c
index f2a8d5e877..c61de1a8bf 100644
--- a/gtk/gtkeventcontrollermotion.c
+++ b/gtk/gtkeventcontrollermotion.c
@@ -32,7 +32,6 @@
  */
 #include "config.h"
 
-#include "gtkintl.h"
 #include "gtkprivate.h"
 #include "gtkwidgetprivate.h"
 #include "gtkmarshalers.h"
diff --git a/gtk/gtkeventcontrollerscroll.c b/gtk/gtkeventcontrollerscroll.c
index 197574dca8..6d1e8734e9 100644
--- a/gtk/gtkeventcontrollerscroll.c
+++ b/gtk/gtkeventcontrollerscroll.c
@@ -57,7 +57,6 @@
  */
 #include "config.h"
 
-#include "gtkintl.h"
 #include "gtkwidget.h"
 #include "gtkeventcontrollerprivate.h"
 #include "gtkeventcontrollerscroll.h"
diff --git a/gtk/gtkexpander.c b/gtk/gtkexpander.c
index b06d1b112c..cd614843f4 100644
--- a/gtk/gtkexpander.c
+++ b/gtk/gtkexpander.c
@@ -125,7 +125,6 @@
 #include "gtkbuiltiniconprivate.h"
 #include "gtkgestureclick.h"
 #include "gtkgesturesingle.h"
-#include "gtkintl.h"
 #include "gtklabel.h"
 #include "gtkmarshalers.h"
 #include "gtkmain.h"
diff --git a/gtk/gtkfilechooser.c b/gtk/gtkfilechooser.c
index ce153c243b..847854307b 100644
--- a/gtk/gtkfilechooser.c
+++ b/gtk/gtkfilechooser.c
@@ -19,7 +19,6 @@
 #include "config.h"
 #include "gtkfilechooser.h"
 #include "gtkfilechooserprivate.h"
-#include "gtkintl.h"
 #include "gtktypebuiltins.h"
 #include "gtkprivate.h"
 #include "gtkmarshalers.h"
diff --git a/gtk/gtkfilechooserdialog.c b/gtk/gtkfilechooserdialog.c
index 56b070a65a..853d304952 100644
--- a/gtk/gtkfilechooserdialog.c
+++ b/gtk/gtkfilechooserdialog.c
@@ -27,7 +27,7 @@
 #include "gtkfilechooserutils.h"
 #include "gtksizerequest.h"
 #include "gtktypebuiltins.h"
-#include "gtkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gtksettings.h"
 #include "gtktogglebutton.h"
 #include "gtkheaderbar.h"
diff --git a/gtk/gtkfilechooserentry.c b/gtk/gtkfilechooserentry.c
index 2bf47a067e..468dfd5a79 100644
--- a/gtk/gtkfilechooserentry.c
+++ b/gtk/gtkfilechooserentry.c
@@ -30,11 +30,11 @@
 #include "gtkmain.h"
 #include "gtksizerequest.h"
 #include "gtkwindow.h"
-#include "gtkintl.h"
 #include "gtkmarshalers.h"
 #include "gtkfilefilterprivate.h"
 #include "gtkfilter.h"
 #include "gtkeventcontrollerfocus.h"
+#include "gtkprivate.h"
 
 typedef struct _GtkFileChooserEntryClass GtkFileChooserEntryClass;
 
diff --git a/gtk/gtkfilechoosererrorstack.c b/gtk/gtkfilechoosererrorstack.c
index 6f9cf89d22..d6a9f04da8 100644
--- a/gtk/gtkfilechoosererrorstack.c
+++ b/gtk/gtkfilechoosererrorstack.c
@@ -15,7 +15,7 @@
 #include "gtkfilechoosererrorstackprivate.h"
 #include "gtkstack.h"
 #include "gtklabel.h"
-#include "gtkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gtkbinlayout.h"
 
 G_DEFINE_TYPE (GtkFileChooserErrorStack, gtk_file_chooser_error_stack, GTK_TYPE_WIDGET)
diff --git a/gtk/gtkfilechoosernative.c b/gtk/gtkfilechoosernative.c
index ea3d2a9cfd..43418cdce9 100644
--- a/gtk/gtkfilechoosernative.c
+++ b/gtk/gtkfilechoosernative.c
@@ -30,7 +30,7 @@
 #include "gtkfilechooserutils.h"
 #include "gtksizerequest.h"
 #include "gtktypebuiltins.h"
-#include "gtkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gtksettings.h"
 #include "gtktogglebutton.h"
 #include "gtkheaderbar.h"
diff --git a/gtk/gtkfilechoosernativeportal.c b/gtk/gtkfilechoosernativeportal.c
index 00b28e5597..c2b0e0f0e9 100644
--- a/gtk/gtkfilechoosernativeportal.c
+++ b/gtk/gtkfilechoosernativeportal.c
@@ -30,7 +30,6 @@
 #include "gtkfilechooserutils.h"
 #include "gtksizerequest.h"
 #include "gtktypebuiltins.h"
-#include "gtkintl.h"
 #include "gtksettings.h"
 #include "gtktogglebutton.h"
 #include "gtkheaderbar.h"
diff --git a/gtk/gtkfilechoosernativequartz.c b/gtk/gtkfilechoosernativequartz.c
index 05ff830b9c..9a0b0da33d 100644
--- a/gtk/gtkfilechoosernativequartz.c
+++ b/gtk/gtkfilechoosernativequartz.c
@@ -22,6 +22,7 @@
 #include "gtkfilechoosernativeprivate.h"
 #include "gtknativedialogprivate.h"
 
+#include <glib/gi18n-lib.h>
 #include "gtkprivate.h"
 #include "gtkfilechooserdialog.h"
 #include "gtkfilechooserprivate.h"
@@ -30,7 +31,6 @@
 #include "gtkfilechooserutils.h"
 #include "gtksizerequest.h"
 #include "gtktypebuiltins.h"
-#include "gtkintl.h"
 #include "gtksettings.h"
 #include "gtktogglebutton.h"
 #include "gtkheaderbar.h"
diff --git a/gtk/gtkfilechoosernativewin32.c b/gtk/gtkfilechoosernativewin32.c
index bd08939e86..1f449c96f6 100644
--- a/gtk/gtkfilechoosernativewin32.c
+++ b/gtk/gtkfilechoosernativewin32.c
@@ -36,7 +36,6 @@
 #include "gtkfilechooserutils.h"
 #include "gtksizerequest.h"
 #include "gtktypebuiltins.h"
-#include "gtkintl.h"
 #include "gtksettings.h"
 #include "gtktogglebutton.h"
 #include "gtkheaderbar.h"
diff --git a/gtk/gtkfilechooserutils.c b/gtk/gtkfilechooserutils.c
index 556859a4a1..1722ced87b 100644
--- a/gtk/gtkfilechooserutils.c
+++ b/gtk/gtkfilechooserutils.c
@@ -21,7 +21,8 @@
 #include "gtkfilechooserutils.h"
 #include "gtkfilechooser.h"
 #include "gtktypebuiltins.h"
-#include "gtkintl.h"
+#include "gtkprivate.h"
+#include <glib/gi18n-lib.h>
 
 
 static gboolean       delegate_set_current_folder     (GtkFileChooser    *chooser,
diff --git a/gtk/gtkfilechooserwidget.c b/gtk/gtkfilechooserwidget.c
index 886c96c738..6cba423a55 100644
--- a/gtk/gtkfilechooserwidget.c
+++ b/gtk/gtkfilechooserwidget.c
@@ -62,7 +62,7 @@
 #include "gtkbox.h"
 #include "gtkcheckbutton.h"
 #include "gtkwindowgroup.h"
-#include "gtkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gtkshow.h"
 #include "gtkmain.h"
 #include "gtkscrollable.h"
diff --git a/gtk/gtkfilefilter.c b/gtk/gtkfilefilter.c
index 0fb16d7b5e..9e3a11dea6 100644
--- a/gtk/gtkfilefilter.c
+++ b/gtk/gtkfilefilter.c
@@ -75,7 +75,6 @@
 #include "gtkfilefilterprivate.h"
 #include "gtkbuildable.h"
 #include "gtkbuilderprivate.h"
-#include "gtkintl.h"
 #include "gtkprivate.h"
 #include "gtkfilter.h"
 
diff --git a/gtk/gtkfilesystemmodel.c b/gtk/gtkfilesystemmodel.c
index 9269f88541..10fe1ec5e5 100644
--- a/gtk/gtkfilesystemmodel.c
+++ b/gtk/gtkfilesystemmodel.c
@@ -24,7 +24,6 @@
 #include <string.h>
 
 #include "gtkfilechooserutils.h"
-#include "gtkintl.h"
 #include "gtkmarshalers.h"
 #include "gtktreedatalist.h"
 #include "gtktreednd.h"
diff --git a/gtk/gtkfilter.c b/gtk/gtkfilter.c
index 92f2ad46c8..f88cee38bb 100644
--- a/gtk/gtkfilter.c
+++ b/gtk/gtkfilter.c
@@ -21,8 +21,8 @@
 
 #include "gtkfilter.h"
 
-#include "gtkintl.h"
 #include "gtktypebuiltins.h"
+#include "gtkprivate.h"
 
 /**
  * GtkFilter:
diff --git a/gtk/gtkfilterlistmodel.c b/gtk/gtkfilterlistmodel.c
index 17074a7025..1804b7d12a 100644
--- a/gtk/gtkfilterlistmodel.c
+++ b/gtk/gtkfilterlistmodel.c
@@ -22,7 +22,6 @@
 #include "gtkfilterlistmodel.h"
 
 #include "gtkbitset.h"
-#include "gtkintl.h"
 #include "gtkprivate.h"
 
 /**
diff --git a/gtk/gtkfixed.c b/gtk/gtkfixed.c
index 2231bdd780..76184c8830 100644
--- a/gtk/gtkfixed.c
+++ b/gtk/gtkfixed.c
@@ -69,7 +69,6 @@
 #include "gtkfixed.h"
 
 #include "gtkfixedlayout.h"
-#include "gtkintl.h"
 #include "gtkprivate.h"
 #include "gtkwidgetprivate.h"
 #include "gtkbuildable.h"
diff --git a/gtk/gtkfixedlayout.c b/gtk/gtkfixedlayout.c
index 63ea38f3ea..b41a612508 100644
--- a/gtk/gtkfixedlayout.c
+++ b/gtk/gtkfixedlayout.c
@@ -64,7 +64,6 @@
 
 #include "gtkfixedlayout.h"
 
-#include "gtkintl.h"
 #include "gtklayoutchild.h"
 #include "gtkprivate.h"
 #include "gtkwidgetprivate.h"
diff --git a/gtk/gtkflattenlistmodel.c b/gtk/gtkflattenlistmodel.c
index 22bb2282d3..04cf04c6fd 100644
--- a/gtk/gtkflattenlistmodel.c
+++ b/gtk/gtkflattenlistmodel.c
@@ -22,7 +22,6 @@
 #include "gtkflattenlistmodel.h"
 
 #include "gtkrbtreeprivate.h"
-#include "gtkintl.h"
 #include "gtkprivate.h"
 
 /**
diff --git a/gtk/gtkflowbox.c b/gtk/gtkflowbox.c
index 2d9e9d9e70..16ae39cfb5 100644
--- a/gtk/gtkflowbox.c
+++ b/gtk/gtkflowbox.c
@@ -92,7 +92,6 @@
 #include "gtkeventcontrollerkey.h"
 #include "gtkgestureclick.h"
 #include "gtkgesturedrag.h"
-#include "gtkintl.h"
 #include "gtkmain.h"
 #include "gtkmarshalers.h"
 #include "gtkorientable.h"
diff --git a/gtk/gtkfontbutton.c b/gtk/gtkfontbutton.c
index 4b80b9fe22..0edf9de4fc 100644
--- a/gtk/gtkfontbutton.c
+++ b/gtk/gtkfontbutton.c
@@ -35,7 +35,7 @@
 #include "gtkfontchooser.h"
 #include "gtkfontchooserdialog.h"
 #include "gtkfontchooserutils.h"
-#include "gtkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gtklabel.h"
 #include "gtkmarshalers.h"
 #include "gtkprivate.h"
diff --git a/gtk/gtkfontchooser.c b/gtk/gtkfontchooser.c
index 413124d3d3..bf79f229c5 100644
--- a/gtk/gtkfontchooser.c
+++ b/gtk/gtkfontchooser.c
@@ -22,7 +22,6 @@
 
 #include "gtkfontchooser.h"
 #include "gtkfontchooserprivate.h"
-#include "gtkintl.h"
 #include "gtktypebuiltins.h"
 #include "gtkprivate.h"
 
diff --git a/gtk/gtkfontchooserdialog.c b/gtk/gtkfontchooserdialog.c
index 44ea27b526..147cff8bca 100644
--- a/gtk/gtkfontchooserdialog.c
+++ b/gtk/gtkfontchooserdialog.c
@@ -27,7 +27,7 @@
 #include "gtkfontchooserwidgetprivate.h"
 #include "gtkfontchooserutils.h"
 #include "gtkbox.h"
-#include "gtkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gtkbuildable.h"
 #include "gtkprivate.h"
 #include "gtkwidget.h"
diff --git a/gtk/gtkfontchooserwidget.c b/gtk/gtkfontchooserwidget.c
index 036804f675..e35b961dff 100644
--- a/gtk/gtkfontchooserwidget.c
+++ b/gtk/gtkfontchooserwidget.c
@@ -36,7 +36,7 @@
 #include "gtkgrid.h"
 #include "gtkfontchooser.h"
 #include "gtkfontchooserutils.h"
-#include "gtkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gtklabel.h"
 #include "gtksingleselection.h"
 #include "gtkstack.h"
diff --git a/gtk/gtkframe.c b/gtk/gtkframe.c
index 1b9b3ef0c1..85c272a441 100644
--- a/gtk/gtkframe.c
+++ b/gtk/gtkframe.c
@@ -28,7 +28,6 @@
 #include "gtklabel.h"
 #include "gtkprivate.h"
 #include "gtktypebuiltins.h"
-#include "gtkintl.h"
 #include "gtkbuildable.h"
 #include "gtkwidgetprivate.h"
 #include "gtklabel.h"
diff --git a/gtk/gtkgesture.c b/gtk/gtkgesture.c
index c9da02950b..3cf4d2dbca 100644
--- a/gtk/gtkgesture.c
+++ b/gtk/gtkgesture.c
@@ -120,7 +120,6 @@
 #include "gtktypebuiltins.h"
 #include "gtkprivate.h"
 #include "gtkmain.h"
-#include "gtkintl.h"
 #include "gtkmarshalers.h"
 #include "gtknative.h"
 
diff --git a/gtk/gtkgestureclick.c b/gtk/gtkgestureclick.c
index f980d024e5..cc5fec25af 100644
--- a/gtk/gtkgestureclick.c
+++ b/gtk/gtkgestureclick.c
@@ -34,7 +34,6 @@
 #include "gtkgestureclick.h"
 #include "gtkgestureclickprivate.h"
 #include "gtkprivate.h"
-#include "gtkintl.h"
 #include "gtkmarshalers.h"
 
 typedef struct _GtkGestureClickPrivate GtkGestureClickPrivate;
diff --git a/gtk/gtkgesturedrag.c b/gtk/gtkgesturedrag.c
index 629d8bb255..9f4d502c53 100644
--- a/gtk/gtkgesturedrag.c
+++ b/gtk/gtkgesturedrag.c
@@ -33,8 +33,8 @@
 #include "config.h"
 #include "gtkgesturedrag.h"
 #include "gtkgesturedragprivate.h"
-#include "gtkintl.h"
 #include "gtkmarshalers.h"
+#include "gtkprivate.h"
 
 typedef struct _GtkGestureDragPrivate GtkGestureDragPrivate;
 typedef struct _EventData EventData;
diff --git a/gtk/gtkgesturelongpress.c b/gtk/gtkgesturelongpress.c
index 679a09b55f..47003b857d 100644
--- a/gtk/gtkgesturelongpress.c
+++ b/gtk/gtkgesturelongpress.c
@@ -45,7 +45,6 @@
 #include "gtkmarshalers.h"
 #include "gtkdragsourceprivate.h"
 #include "gtkprivate.h"
-#include "gtkintl.h"
 #include "gtkmarshalers.h"
 
 typedef struct _GtkGestureLongPressPrivate GtkGestureLongPressPrivate;
diff --git a/gtk/gtkgesturepan.c b/gtk/gtkgesturepan.c
index 0c9e7699b3..d115dfae91 100644
--- a/gtk/gtkgesturepan.c
+++ b/gtk/gtkgesturepan.c
@@ -41,7 +41,6 @@
 #include "gtkgesturepanprivate.h"
 #include "gtktypebuiltins.h"
 #include "gtkprivate.h"
-#include "gtkintl.h"
 #include "gtkmarshalers.h"
 
 typedef struct _GtkGesturePanPrivate GtkGesturePanPrivate;
diff --git a/gtk/gtkgesturerotate.c b/gtk/gtkgesturerotate.c
index 8bbbede5ae..37130eb06f 100644
--- a/gtk/gtkgesturerotate.c
+++ b/gtk/gtkgesturerotate.c
@@ -32,7 +32,7 @@
 #include "gtkgesturerotate.h"
 #include "gtkgesturerotateprivate.h"
 #include "gtkmarshalers.h"
-#include "gtkintl.h"
+#include "gtkprivate.h"
 
 typedef struct _GtkGestureRotatePrivate GtkGestureRotatePrivate;
 
diff --git a/gtk/gtkgesturesingle.c b/gtk/gtkgesturesingle.c
index 52340b74c8..4db0fd5d14 100644
--- a/gtk/gtkgesturesingle.c
+++ b/gtk/gtkgesturesingle.c
@@ -41,7 +41,6 @@
 #include "gtkgesturesingle.h"
 #include "gtkgesturesingleprivate.h"
 #include "gtkprivate.h"
-#include "gtkintl.h"
 #include "gtkdebug.h"
 
 typedef struct _GtkGestureSinglePrivate GtkGestureSinglePrivate;
diff --git a/gtk/gtkgesturestylus.c b/gtk/gtkgesturestylus.c
index eba6848759..d10dfe1a05 100644
--- a/gtk/gtkgesturestylus.c
+++ b/gtk/gtkgesturestylus.c
@@ -30,7 +30,6 @@
 #include "gtkgesturestylus.h"
 #include "gtkgesturestylusprivate.h"
 #include "gtkprivate.h"
-#include "gtkintl.h"
 #include "gtkmarshalers.h"
 #include "gtkmain.h"
 #include "gtknative.h"
diff --git a/gtk/gtkgestureswipe.c b/gtk/gtkgestureswipe.c
index e168aa84a3..5ec7370495 100644
--- a/gtk/gtkgestureswipe.c
+++ b/gtk/gtkgestureswipe.c
@@ -40,8 +40,7 @@
 #include "gtkgestureswipeprivate.h"
 #include "gtkgestureprivate.h"
 #include "gtkmarshalers.h"
-#include "gtkintl.h"
-#include "gtkmarshalers.h"
+#include "gtkprivate.h"
 
 #define CAPTURE_THRESHOLD_MS 150
 
diff --git a/gtk/gtkgesturezoom.c b/gtk/gtkgesturezoom.c
index e60ea3ace8..ea90ae16c2 100644
--- a/gtk/gtkgesturezoom.c
+++ b/gtk/gtkgesturezoom.c
@@ -32,7 +32,7 @@
 #include <math.h>
 #include "gtkgesturezoom.h"
 #include "gtkgesturezoomprivate.h"
-#include "gtkintl.h"
+#include "gtkprivate.h"
 
 typedef struct _GtkGestureZoomPrivate GtkGestureZoomPrivate;
 
diff --git a/gtk/gtkglarea.c b/gtk/gtkglarea.c
index c70de8b036..1806021be3 100644
--- a/gtk/gtkglarea.c
+++ b/gtk/gtkglarea.c
@@ -22,7 +22,7 @@
 
 #include "config.h"
 #include "gtkglarea.h"
-#include "gtkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gtkmarshalers.h"
 #include "gtkmarshalers.h"
 #include "gtkprivate.h"
diff --git a/gtk/gtkgrid.c b/gtk/gtkgrid.c
index f5f48da9a5..5bb43ea943 100644
--- a/gtk/gtkgrid.c
+++ b/gtk/gtkgrid.c
@@ -25,7 +25,6 @@
 #include "gtkbuildable.h"
 #include "gtkcsspositionvalueprivate.h"
 #include "gtkgridlayout.h"
-#include "gtkintl.h"
 #include "gtkorientable.h"
 #include "gtkprivate.h"
 #include "gtksizerequest.h"
diff --git a/gtk/gtkgridlayout.c b/gtk/gtkgridlayout.c
index d449f43da1..1659eb1cb7 100644
--- a/gtk/gtkgridlayout.c
+++ b/gtk/gtkgridlayout.c
@@ -47,7 +47,6 @@
 
 #include "gtkcsspositionvalueprivate.h"
 #include "gtkdebug.h"
-#include "gtkintl.h"
 #include "gtklayoutchild.h"
 #include "gtkorientable.h"
 #include "gtkprivate.h"
diff --git a/gtk/gtkgridview.c b/gtk/gtkgridview.c
index 33c3bb7638..13bc1578c7 100644
--- a/gtk/gtkgridview.c
+++ b/gtk/gtkgridview.c
@@ -22,7 +22,6 @@
 #include "gtkgridview.h"
 
 #include "gtkbitset.h"
-#include "gtkintl.h"
 #include "gtklistbaseprivate.h"
 #include "gtklistitemfactory.h"
 #include "gtklistitemmanagerprivate.h"
diff --git a/gtk/gtkheaderbar.c b/gtk/gtkheaderbar.c
index ec66d392bc..a6438a99aa 100644
--- a/gtk/gtkheaderbar.c
+++ b/gtk/gtkheaderbar.c
@@ -25,7 +25,6 @@
 #include "gtkbox.h"
 #include "gtkbuildable.h"
 #include "gtkcenterbox.h"
-#include "gtkintl.h"
 #include "gtklabel.h"
 #include "gtknative.h"
 #include "gtkprivate.h"
diff --git a/gtk/gtkicontheme.c b/gtk/gtkicontheme.c
index 159c841a5f..2c66e54ea8 100644
--- a/gtk/gtkicontheme.c
+++ b/gtk/gtkicontheme.c
@@ -44,7 +44,6 @@
 #include "gtkcsscolorvalueprivate.h"
 #include "gtkdebug.h"
 #include "gtkiconcacheprivate.h"
-#include "gtkintl.h"
 #include "gtkmain.h"
 #include "gtkprivate.h"
 #include "gtksettingsprivate.h"
diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c
index 1e194744a2..2def92cd4a 100644
--- a/gtk/gtkiconview.c
+++ b/gtk/gtkiconview.c
@@ -28,7 +28,6 @@
 #include "gtkcellrenderertext.h"
 #include "gtkdragsourceprivate.h"
 #include "gtkentry.h"
-#include "gtkintl.h"
 #include "gtkmain.h"
 #include "gtkmarshalers.h"
 #include "gtkorientable.h"
diff --git a/gtk/gtkimage.c b/gtk/gtkimage.c
index 74d8a0b52f..db99d57713 100644
--- a/gtk/gtkimage.c
+++ b/gtk/gtkimage.c
@@ -28,7 +28,6 @@
 
 #include "gtkiconhelperprivate.h"
 #include "gtkicontheme.h"
-#include "gtkintl.h"
 #include "gtkprivate.h"
 #include "gtksnapshot.h"
 #include "gtktypebuiltins.h"
diff --git a/gtk/gtkimcontext.c b/gtk/gtkimcontext.c
index a46f5d7571..3772d58db4 100644
--- a/gtk/gtkimcontext.c
+++ b/gtk/gtkimcontext.c
@@ -21,7 +21,6 @@
 #include "gtkprivate.h"
 #include "gtktypebuiltins.h"
 #include "gtkmarshalers.h"
-#include "gtkintl.h"
 
 #include "gdk/gdkeventsprivate.h"
 
diff --git a/gtk/gtkimcontextbroadway.c b/gtk/gtkimcontextbroadway.c
index 8006081d60..88fcf19472 100644
--- a/gtk/gtkimcontextbroadway.c
+++ b/gtk/gtkimcontextbroadway.c
@@ -22,7 +22,6 @@
 #include <string.h>
 
 #include "gtk/gtkimcontextbroadway.h"
-#include "gtk/gtkintl.h"
 #include "gtk/gtkimmoduleprivate.h"
 
 #include "gdk/broadway/gdkbroadway.h"
diff --git a/gtk/gtkimcontextquartz.c b/gtk/gtkimcontextquartz.c
index 5ad4ea6a66..5ed3a7d785 100644
--- a/gtk/gtkimcontextquartz.c
+++ b/gtk/gtkimcontextquartz.c
@@ -22,7 +22,6 @@
 #include <string.h>
 
 #include "gtk/gtkimcontextquartz.h"
-#include "gtk/gtkintl.h"
 #include "gtk/gtkimmoduleprivate.h"
 #include "gtk/gtkprivate.h"
 
diff --git a/gtk/gtkimcontextsimple.c b/gtk/gtkimcontextsimple.c
index 85f307a343..a0682bd617 100644
--- a/gtk/gtkimcontextsimple.c
+++ b/gtk/gtkimcontextsimple.c
@@ -28,7 +28,6 @@
 #include "gtksettings.h"
 #include "gtkwidget.h"
 #include "gtkdebug.h"
-#include "gtkintl.h"
 #include "gtkcomposetable.h"
 #include "gtkimmoduleprivate.h"
 
diff --git a/gtk/gtkimcontextwayland.c b/gtk/gtkimcontextwayland.c
index b5195e28d7..c801b40e67 100644
--- a/gtk/gtkimcontextwayland.c
+++ b/gtk/gtkimcontextwayland.c
@@ -23,7 +23,6 @@
 
 #include "gtk/gtkdragsourceprivate.h"
 #include "gtk/gtkimcontextwayland.h"
-#include "gtk/gtkintl.h"
 #include "gtk/gtkimmoduleprivate.h"
 
 #include "gdk/wayland/gdkwayland.h"
diff --git a/gtk/gtkimmodule.c b/gtk/gtkimmodule.c
index 4c36cbe251..6ef4a3a179 100644
--- a/gtk/gtkimmodule.c
+++ b/gtk/gtkimmodule.c
@@ -37,7 +37,6 @@
 #include "gtkmodulesprivate.h"
 #include "gtksettings.h"
 #include "gtkprivate.h"
-#include "gtkintl.h"
 
 #ifdef GDK_WINDOWING_X11
 #include "x11/gdkx.h"
diff --git a/gtk/gtkimmulticontext.c b/gtk/gtkimmulticontext.c
index 0a5ef9a5a6..69ba6453a4 100644
--- a/gtk/gtkimmulticontext.c
+++ b/gtk/gtkimmulticontext.c
@@ -22,7 +22,6 @@
 
 #include "gtkimmulticontext.h"
 #include "gtkimmoduleprivate.h"
-#include "gtkintl.h"
 #include "gtklabel.h"
 #include "gtkmain.h"
 #include "gtkprivate.h"
diff --git a/gtk/gtkinfobar.c b/gtk/gtkinfobar.c
index 2cbfc328f6..788077305e 100644
--- a/gtk/gtkinfobar.c
+++ b/gtk/gtkinfobar.c
@@ -40,7 +40,6 @@
 #include "gtkenums.h"
 #include "gtkdialog.h"
 #include "gtkrevealer.h"
-#include "gtkintl.h"
 #include "gtkprivate.h"
 #include "gtktypebuiltins.h"
 #include "gtkwidgetprivate.h"
diff --git a/gtk/gtkintl.h b/gtk/gtkintl.h
deleted file mode 100644
index a1a6f87817..0000000000
--- a/gtk/gtkintl.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef __GTKINTL_H__
-#define __GTKINTL_H__
-
-#include <glib/gi18n-lib.h>
-
-/* not really I18N-related, but also a string marker macro */
-#define I_(string) g_intern_static_string (string)
-
-#endif
diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
index 3a9828e9f0..7602401d3c 100644
--- a/gtk/gtklabel.c
+++ b/gtk/gtklabel.c
@@ -32,7 +32,7 @@
 #include "gtkgesturedrag.h"
 #include "gtkgestureclick.h"
 #include "gtkgesturesingle.h"
-#include "gtkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gtkmarshalers.h"
 #include "gtknotebook.h"
 #include "gtkpango.h"
diff --git a/gtk/gtklevelbar.c b/gtk/gtklevelbar.c
index a8ce9564fd..326abc9491 100644
--- a/gtk/gtklevelbar.c
+++ b/gtk/gtklevelbar.c
@@ -125,13 +125,13 @@
 #include "gtkbuildable.h"
 #include "gtkbuilderprivate.h"
 #include "gtkgizmoprivate.h"
-#include "gtkintl.h"
 #include "gtklevelbar.h"
 #include "gtkmarshalers.h"
 #include "gtkorientable.h"
 #include "gtkcssnodeprivate.h"
 #include "gtktypebuiltins.h"
 #include "gtkwidgetprivate.h"
+#include "gtkprivate.h"
 
 #include <math.h>
 #include <stdlib.h>
diff --git a/gtk/gtklinkbutton.c b/gtk/gtklinkbutton.c
index b6c91aaf8a..f2794e1258 100644
--- a/gtk/gtklinkbutton.c
+++ b/gtk/gtklinkbutton.c
@@ -59,7 +59,7 @@
 #include "gtkdragsource.h"
 #include "gtkgestureclick.h"
 #include "gtkgesturesingle.h"
-#include "gtkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gtklabel.h"
 #include "gtkmain.h"
 #include "gtkmarshalers.h"
diff --git a/gtk/gtklistbase.c b/gtk/gtklistbase.c
index 86f408a562..0d09c8d26c 100644
--- a/gtk/gtklistbase.c
+++ b/gtk/gtklistbase.c
@@ -27,7 +27,6 @@
 #include "gtkdropcontrollermotion.h"
 #include "gtkgesturedrag.h"
 #include "gtkgizmoprivate.h"
-#include "gtkintl.h"
 #include "gtklistitemwidgetprivate.h"
 #include "gtkmultiselection.h"
 #include "gtkorientable.h"
diff --git a/gtk/gtklistbox.c b/gtk/gtklistbox.c
index e27533087a..62b1d56612 100644
--- a/gtk/gtklistbox.c
+++ b/gtk/gtklistbox.c
@@ -25,7 +25,6 @@
 #include "gtkbinlayout.h"
 #include "gtkbuildable.h"
 #include "gtkgestureclick.h"
-#include "gtkintl.h"
 #include "gtkmain.h"
 #include "gtkmarshalers.h"
 #include "gtkprivate.h"
diff --git a/gtk/gtklistitem.c b/gtk/gtklistitem.c
index df818be758..28614b62f8 100644
--- a/gtk/gtklistitem.c
+++ b/gtk/gtklistitem.c
@@ -21,7 +21,6 @@
 
 #include "gtklistitemprivate.h"
 
-#include "gtkintl.h"
 
 /**
  * GtkListItem:
diff --git a/gtk/gtklistitemwidget.c b/gtk/gtklistitemwidget.c
index 8681265db6..2fb5e1633c 100644
--- a/gtk/gtklistitemwidget.c
+++ b/gtk/gtklistitemwidget.c
@@ -25,7 +25,6 @@
 #include "gtkeventcontrollerfocus.h"
 #include "gtkeventcontrollermotion.h"
 #include "gtkgestureclick.h"
-#include "gtkintl.h"
 #include "gtklistitemfactoryprivate.h"
 #include "gtklistitemprivate.h"
 #include "gtklistbaseprivate.h"
diff --git a/gtk/gtkliststore.c b/gtk/gtkliststore.c
index d121696a2c..acf7b8942f 100644
--- a/gtk/gtkliststore.c
+++ b/gtk/gtkliststore.c
@@ -24,7 +24,6 @@
 #include "gtkliststore.h"
 #include "gtktreedatalist.h"
 #include "gtktreednd.h"
-#include "gtkintl.h"
 #include "gtkbuildable.h"
 #include "gtkbuilderprivate.h"
 
diff --git a/gtk/gtklistview.c b/gtk/gtklistview.c
index b81ad3f23a..792c9d5a6e 100644
--- a/gtk/gtklistview.c
+++ b/gtk/gtklistview.c
@@ -22,7 +22,6 @@
 #include "gtklistviewprivate.h"
 
 #include "gtkbitset.h"
-#include "gtkintl.h"
 #include "gtklistbaseprivate.h"
 #include "gtklistitemmanagerprivate.h"
 #include "gtkmain.h"
diff --git a/gtk/gtklockbutton.c b/gtk/gtklockbutton.c
index 03a68d3077..5f94cfa372 100644
--- a/gtk/gtklockbutton.c
+++ b/gtk/gtklockbutton.c
@@ -22,10 +22,11 @@
 
 #include "gtkbox.h"
 #include "gtkimage.h"
-#include "gtkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gtklabel.h"
 #include "gtksizegroup.h"
 #include "gtkstack.h"
+#include "gtkprivate.h"
 
 /**
  * GtkLockButton:
diff --git a/gtk/gtkmagnifier.c b/gtk/gtkmagnifier.c
index 7bf8b886d7..a70bdf1c90 100644
--- a/gtk/gtkmagnifier.c
+++ b/gtk/gtkmagnifier.c
@@ -20,7 +20,6 @@
 #include "gtkmagnifierprivate.h"
 #include "gtkwidgetprivate.h"
 #include "gtksnapshot.h"
-#include "gtkintl.h"
 
 enum {
   PROP_INSPECTED = 1,
diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index 14fb06fdc9..7ea84d4878 100644
--- a/gtk/gtkmain.c
+++ b/gtk/gtkmain.c
@@ -47,7 +47,7 @@
 #undef STRICT
 #endif
 
-#include "gtkintl.h"
+#include <glib/gi18n-lib.h>
 
 #include "gtkbox.h"
 #include "gtkdebug.h"
diff --git a/gtk/gtkmaplistmodel.c b/gtk/gtkmaplistmodel.c
index de4cd27dbe..32ebf54801 100644
--- a/gtk/gtkmaplistmodel.c
+++ b/gtk/gtkmaplistmodel.c
@@ -22,7 +22,6 @@
 #include "gtkmaplistmodel.h"
 
 #include "gtkrbtreeprivate.h"
-#include "gtkintl.h"
 #include "gtkprivate.h"
 
 /**
diff --git a/gtk/gtkmediacontrols.c b/gtk/gtkmediacontrols.c
index 4dc8888e15..20935aa69d 100644
--- a/gtk/gtkmediacontrols.c
+++ b/gtk/gtkmediacontrols.c
@@ -23,9 +23,10 @@
 
 #include "gtkadjustment.h"
 #include "gtkbutton.h"
-#include "gtkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gtklabel.h"
 #include "gtkwidgetprivate.h"
+#include "gtkprivate.h"
 
 /**
  * GtkMediaControls:
diff --git a/gtk/gtkmediafile.c b/gtk/gtkmediafile.c
index ea6df0560b..9620220ab8 100644
--- a/gtk/gtkmediafile.c
+++ b/gtk/gtkmediafile.c
@@ -23,7 +23,7 @@
 
 #include "gtkdebug.h"
 #include "gtkprivate.h"
-#include "gtkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gtkmodulesprivate.h"
 #include "gtknomediafileprivate.h"
 
diff --git a/gtk/gtkmediastream.c b/gtk/gtkmediastream.c
index 6b5a7d524f..a2c1dc67e2 100644
--- a/gtk/gtkmediastream.c
+++ b/gtk/gtkmediastream.c
@@ -21,7 +21,6 @@
 
 #include "gtkmediastream.h"
 
-#include "gtkintl.h"
 
 /**
  * GtkMediaStream:
diff --git a/gtk/gtkmenubutton.c b/gtk/gtkmenubutton.c
index 0aea0131d7..107ec1c8a2 100644
--- a/gtk/gtkmenubutton.c
+++ b/gtk/gtkmenubutton.c
@@ -90,7 +90,6 @@
 #include "gtkactionable.h"
 #include "gtkbuildable.h"
 #include "gtkbuiltiniconprivate.h"
-#include "gtkintl.h"
 #include "gtkimage.h"
 #include "gtkmain.h"
 #include "gtkmenubutton.h"
diff --git a/gtk/gtkmenutrackeritem.c b/gtk/gtkmenutrackeritem.c
index f938b3fe1d..141c1ca0d6 100644
--- a/gtk/gtkmenutrackeritem.c
+++ b/gtk/gtkmenutrackeritem.c
@@ -22,7 +22,6 @@
 #include "gtkmenutrackeritemprivate.h"
 #include "gtkactionmuxerprivate.h"
 #include "gtkdebug.h"
-#include "gtkintl.h"
 #include "gtkprivate.h"
 
 #include <string.h>
diff --git a/gtk/gtkmessagedialog.c b/gtk/gtkmessagedialog.c
index 9e2be08d3c..88b6485bb8 100644
--- a/gtk/gtkmessagedialog.c
+++ b/gtk/gtkmessagedialog.c
@@ -30,7 +30,7 @@
 #include "gtkbox.h"
 #include "gtkbuildable.h"
 #include "gtkdialogprivate.h"
-#include "gtkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gtklabel.h"
 #include "gtkprivate.h"
 #include "gtktypebuiltins.h"
diff --git a/gtk/gtkmodelbutton.c b/gtk/gtkmodelbutton.c
index 624f94a305..c24115dd1a 100644
--- a/gtk/gtkmodelbutton.c
+++ b/gtk/gtkmodelbutton.c
@@ -32,7 +32,6 @@
 #include "gtktypebuiltins.h"
 #include "gtkstack.h"
 #include "gtkpopovermenuprivate.h"
-#include "gtkintl.h"
 #include "gtkcssnodeprivate.h"
 #include "gtkcsstypesprivate.h"
 #include "gtkbuiltiniconprivate.h"
diff --git a/gtk/gtkmodules.c b/gtk/gtkmodules.c
index aace5dcbc9..e505790cb4 100644
--- a/gtk/gtkmodules.c
+++ b/gtk/gtkmodules.c
@@ -24,7 +24,6 @@
 #include "gtkdebug.h"
 #include "gtkprivate.h"
 #include "gtkmodulesprivate.h"
-#include "gtkintl.h"
 
 #include <gmodule.h>
 
diff --git a/gtk/gtkmountoperation-stub.c b/gtk/gtkmountoperation-stub.c
index afcf474440..8972010bf5 100644
--- a/gtk/gtkmountoperation-stub.c
+++ b/gtk/gtkmountoperation-stub.c
@@ -26,8 +26,7 @@
 #include "config.h"
 
 #include <gio/gio.h>
-#include "gtkintl.h"
-
+#include <glib/gi18n-lib.h>
 #include "gtkmountoperationprivate.h"
 
 GtkMountOperationLookupContext *
diff --git a/gtk/gtkmountoperation-x11.c b/gtk/gtkmountoperation-x11.c
index 0dd2ae7480..251263303b 100644
--- a/gtk/gtkmountoperation-x11.c
+++ b/gtk/gtkmountoperation-x11.c
@@ -33,7 +33,7 @@
 #include "x11/gdkx.h"
 #include <X11/Xatom.h>
 #include <gtk/gtkicontheme.h>
-#include "gtkintl.h"
+#include <glib/gi18n-lib.h>
 
 /* for the kill(2) system call and errno - POSIX.1-2001 and later */
 #include <sys/types.h>
diff --git a/gtk/gtkmountoperation.c b/gtk/gtkmountoperation.c
index 90383811a1..22b4af7bbe 100644
--- a/gtk/gtkmountoperation.c
+++ b/gtk/gtkmountoperation.c
@@ -33,7 +33,7 @@
 #include "gtkdbusgenerated.h"
 #include "gtkentry.h"
 #include "gtkbox.h"
-#include "gtkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gtklabel.h"
 #include "gtkmessagedialog.h"
 #include "gtkmountoperation.h"
diff --git a/gtk/gtkmultifilter.c b/gtk/gtkmultifilter.c
index e27bfd648a..da44510a1f 100644
--- a/gtk/gtkmultifilter.c
+++ b/gtk/gtkmultifilter.c
@@ -22,7 +22,6 @@
 #include "gtkmultifilter.h"
 
 #include "gtkbuildable.h"
-#include "gtkintl.h"
 #include "gtktypebuiltins.h"
 
 #define GDK_ARRAY_TYPE_NAME GtkFilters
diff --git a/gtk/gtkmultiselection.c b/gtk/gtkmultiselection.c
index c7ef692191..055472d3d4 100644
--- a/gtk/gtkmultiselection.c
+++ b/gtk/gtkmultiselection.c
@@ -22,7 +22,6 @@
 #include "gtkmultiselection.h"
 
 #include "gtkbitset.h"
-#include "gtkintl.h"
 #include "gtkselectionmodel.h"
 
 /**
diff --git a/gtk/gtkmultisorter.c b/gtk/gtkmultisorter.c
index 38a18819bf..ddbdb440cb 100644
--- a/gtk/gtkmultisorter.c
+++ b/gtk/gtkmultisorter.c
@@ -22,7 +22,6 @@
 #include "gtkmultisorter.h"
 
 #include "gtkbuildable.h"
-#include "gtkintl.h"
 #include "gtksorterprivate.h"
 #include "gtktypebuiltins.h"
 
diff --git a/gtk/gtknative.c b/gtk/gtknative.c
index aafdbb163e..bae5d5297a 100644
--- a/gtk/gtknative.c
+++ b/gtk/gtknative.c
@@ -21,7 +21,6 @@
 
 #include <math.h>
 
-#include "gtkintl.h"
 
 #include "gtkcssboxesimplprivate.h"
 #include "gtkcsscolorvalueprivate.h"
diff --git a/gtk/gtknativedialog.c b/gtk/gtknativedialog.c
index ec389f2e53..449a628ee2 100644
--- a/gtk/gtknativedialog.c
+++ b/gtk/gtknativedialog.c
@@ -29,7 +29,6 @@
 #include "gtkfilechooserutils.h"
 #include "gtksizerequest.h"
 #include "gtktypebuiltins.h"
-#include "gtkintl.h"
 #include "gtksettings.h"
 #include "gtktogglebutton.h"
 #include "gtkheaderbar.h"
diff --git a/gtk/gtknomediafile.c b/gtk/gtknomediafile.c
index 0b2a70d6f9..26b4682278 100644
--- a/gtk/gtknomediafile.c
+++ b/gtk/gtknomediafile.c
@@ -21,7 +21,7 @@
 
 #include "gtknomediafileprivate.h"
 
-#include "gtkintl.h"
+#include <glib/gi18n-lib.h>
 
 struct _GtkNoMediaFile
 {
diff --git a/gtk/gtknoselection.c b/gtk/gtknoselection.c
index d7b5b5b39a..3dded4f814 100644
--- a/gtk/gtknoselection.c
+++ b/gtk/gtknoselection.c
@@ -22,7 +22,6 @@
 #include "gtknoselection.h"
 
 #include "gtkbitset.h"
-#include "gtkintl.h"
 #include "gtkselectionmodel.h"
 
 /**
diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c
index 48774288fe..7e75048ce8 100644
--- a/gtk/gtknotebook.c
+++ b/gtk/gtknotebook.c
@@ -38,7 +38,7 @@
 #include "gtkgestureclick.h"
 #include "gtkgizmoprivate.h"
 #include "gtkbuiltiniconprivate.h"
-#include "gtkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gtklabel.h"
 #include "gtkmain.h"
 #include "gtkmarshalers.h"
diff --git a/gtk/gtknumericsorter.c b/gtk/gtknumericsorter.c
index 966346c54d..4f474ad14d 100644
--- a/gtk/gtknumericsorter.c
+++ b/gtk/gtknumericsorter.c
@@ -21,7 +21,6 @@
 
 #include "gtknumericsorter.h"
 
-#include "gtkintl.h"
 #include "gtksorterprivate.h"
 #include "gtktypebuiltins.h"
 
diff --git a/gtk/gtkorientable.c b/gtk/gtkorientable.c
index d56b182143..034cb18ffe 100644
--- a/gtk/gtkorientable.c
+++ b/gtk/gtkorientable.c
@@ -26,7 +26,6 @@
 #include "gtkprivate.h"
 #include "gtkwidgetprivate.h"
 #include "gtktypebuiltins.h"
-#include "gtkintl.h"
 
 
 /**
diff --git a/gtk/gtkoverlay.c b/gtk/gtkoverlay.c
index e1f4f128b2..4def628f1c 100644
--- a/gtk/gtkoverlay.c
+++ b/gtk/gtkoverlay.c
@@ -24,7 +24,6 @@
 
 #include "gtkoverlaylayout.h"
 #include "gtkbuildable.h"
-#include "gtkintl.h"
 #include "gtkmarshalers.h"
 #include "gtkprivate.h"
 #include "gtkscrolledwindow.h"
diff --git a/gtk/gtkoverlaylayout.c b/gtk/gtkoverlaylayout.c
index 3d75d3082b..204babbf30 100644
--- a/gtk/gtkoverlaylayout.c
+++ b/gtk/gtkoverlaylayout.c
@@ -22,7 +22,6 @@
 
 #include "gtkoverlaylayout.h"
 
-#include "gtkintl.h"
 #include "gtklayoutchild.h"
 #include "gtkoverlay.h"
 #include "gtkprivate.h"
diff --git a/gtk/gtkpadcontroller.c b/gtk/gtkpadcontroller.c
index 6e5700a0a3..57edfdcc64 100644
--- a/gtk/gtkpadcontroller.c
+++ b/gtk/gtkpadcontroller.c
@@ -75,7 +75,6 @@
 #include "gtkpadcontroller.h"
 #include "gtkwindow.h"
 #include "gtkprivate.h"
-#include "gtkintl.h"
 
 #ifdef GDK_WINDOWING_WAYLAND
 #include <gdk/wayland/gdkwayland.h>
diff --git a/gtk/gtkpagesetup.c b/gtk/gtkpagesetup.c
index 97c23beef9..dae688c498 100644
--- a/gtk/gtkpagesetup.c
+++ b/gtk/gtkpagesetup.c
@@ -21,7 +21,7 @@
 #include "gtkpagesetup.h"
 #include "gtkprintutils.h"
 #include "gtkprintoperation.h" /* for GtkPrintError */
-#include "gtkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gtktypebuiltins.h"
 
 /**
diff --git a/gtk/gtkpagesetupunixdialog.c b/gtk/gtkpagesetupunixdialog.c
index 1539d25f3d..80fc561237 100644
--- a/gtk/gtkpagesetupunixdialog.c
+++ b/gtk/gtkpagesetupunixdialog.c
@@ -21,7 +21,7 @@
 #include <string.h>
 #include <locale.h>
 
-#include "gtkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gtkprivate.h"
 
 #include "gtkbutton.h"
diff --git a/gtk/gtkpaned.c b/gtk/gtkpaned.c
index 4dde590724..4360050c43 100644
--- a/gtk/gtkpaned.c
+++ b/gtk/gtkpaned.c
@@ -31,7 +31,6 @@
 #include "gtkgesturepan.h"
 #include "gtkgesturesingle.h"
 #include "gtkpanedhandleprivate.h"
-#include "gtkintl.h"
 #include "gtkmarshalers.h"
 #include "gtkorientable.h"
 #include "gtkprivate.h"
diff --git a/gtk/gtkpanedhandle.c b/gtk/gtkpanedhandle.c
index 2738f0241d..3192b840e1 100644
--- a/gtk/gtkpanedhandle.c
+++ b/gtk/gtkpanedhandle.c
@@ -26,7 +26,7 @@
 #include "gtkcssstyleprivate.h"
 #include "gtkrendericonprivate.h"
 #include "gtkcssboxesprivate.h"
-#include "gtkintl.h"
+#include "gtkprivate.h"
 
 #include "gtkpaned.h"
 
diff --git a/gtk/gtkpango.c b/gtk/gtkpango.c
index 2ef8897c98..3ba6c23aba 100644
--- a/gtk/gtkpango.c
+++ b/gtk/gtkpango.c
@@ -25,7 +25,6 @@
 #include "config.h"
 #include "gtkpango.h"
 #include <pango/pangocairo.h>
-#include "gtkintl.h"
 #include "gtkbuilderprivate.h"
 
 static gboolean
diff --git a/gtk/gtkpapersize.c b/gtk/gtkpapersize.c
index 91d2bb1404..81d13f8633 100644
--- a/gtk/gtkpapersize.c
+++ b/gtk/gtkpapersize.c
@@ -29,7 +29,7 @@
 #include "gtkpapersize.h"
 #include "gtkprintutils.h"
 #include "gtkprintoperation.h"  /* for GtkPrintError */
-#include "gtkintl.h"
+#include <glib/gi18n-lib.h>
 
 /* _gtk_load_custom_papers() only on Unix so far  */
 #ifdef G_OS_UNIX
diff --git a/gtk/gtkpasswordentry.c b/gtk/gtkpasswordentry.c
index 25ae809c3d..e820d57681 100644
--- a/gtk/gtkpasswordentry.c
+++ b/gtk/gtkpasswordentry.c
@@ -29,7 +29,7 @@
 #include "gtkgestureclick.h"
 #include "gtkbox.h"
 #include "gtkimage.h"
-#include "gtkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gtkmarshalers.h"
 #include "gtkpasswordentrybuffer.h"
 #include "gtkprivate.h"
diff --git a/gtk/gtkpathbar.c b/gtk/gtkpathbar.c
index 2317d25686..9e4916d562 100644
--- a/gtk/gtkpathbar.c
+++ b/gtk/gtkpathbar.c
@@ -26,7 +26,7 @@
 #include "gtkdragsource.h"
 #include "gtkicontheme.h"
 #include "gtkimage.h"
-#include "gtkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gtklabel.h"
 #include "gtkmain.h"
 #include "gtkmarshalers.h"
@@ -35,6 +35,7 @@
 #include "gtkwidgetprivate.h"
 #include "gtkeventcontrollerscroll.h"
 #include "gtkdragsource.h"
+#include "gtkprivate.h"
 
 struct _GtkPathBar
 {
diff --git a/gtk/gtkpicture.c b/gtk/gtkpicture.c
index aa8599ebd9..b2dba48d2b 100644
--- a/gtk/gtkpicture.c
+++ b/gtk/gtkpicture.c
@@ -24,7 +24,6 @@
 #include "gtkcssnodeprivate.h"
 #include "gtkcssnumbervalueprivate.h"
 #include "gtkcssstyleprivate.h"
-#include "gtkintl.h"
 #include "gtkprivate.h"
 #include "gtksnapshot.h"
 #include "gtktypebuiltins.h"
diff --git a/gtk/gtkplacessidebar.c b/gtk/gtkplacessidebar.c
index 1f6aab3d18..0e6120c7b8 100644
--- a/gtk/gtkplacessidebar.c
+++ b/gtk/gtkplacessidebar.c
@@ -35,7 +35,7 @@
 #include "gtkcelllayout.h"
 #include "gtkfilechooserutils.h"
 #include "gtkicontheme.h"
-#include "gtkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gtkmain.h"
 #include "gtkmarshalers.h"
 #include "gtkmountoperation.h"
diff --git a/gtk/gtkplacesview.c b/gtk/gtkplacesview.c
index 453b87b417..8ef7f3f5f6 100644
--- a/gtk/gtkplacesview.c
+++ b/gtk/gtkplacesview.c
@@ -23,7 +23,7 @@
 #include <gtk/gtk.h>
 
 #include "gtkprivate.h"
-#include "gtkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gtkmarshalers.h"
 #include "gtkplacesviewprivate.h"
 #include "gtkplacesviewrowprivate.h"
diff --git a/gtk/gtkplacesviewrow.c b/gtk/gtkplacesviewrow.c
index d48a422e26..7197fa572c 100644
--- a/gtk/gtkplacesviewrow.c
+++ b/gtk/gtkplacesviewrow.c
@@ -30,7 +30,7 @@
 #include "gtkbutton.h"
 #include "gtkgesture.h"
 #include "gtkimage.h"
-#include "gtkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gtklabel.h"
 #include "gtkspinner.h"
 #include "gtkstack.h"
diff --git a/gtk/gtkpopover.c b/gtk/gtkpopover.c
index 8ac30372b7..e74dcc2ae8 100644
--- a/gtk/gtkpopover.c
+++ b/gtk/gtkpopover.c
@@ -111,7 +111,6 @@
 #include "gtkenums.h"
 #include "gtktypebuiltins.h"
 #include "gtkpopovercontentprivate.h"
-#include "gtkintl.h"
 #include "gtkprivate.h"
 #include "gtkmain.h"
 #include "gtkstack.h"
diff --git a/gtk/gtkpopovercontent.c b/gtk/gtkpopovercontent.c
index d4969de987..49b0e4a330 100644
--- a/gtk/gtkpopovercontent.c
+++ b/gtk/gtkpopovercontent.c
@@ -24,7 +24,7 @@
 #include "gtkstylecontextprivate.h"
 
 #include "gtkwidgetprivate.h"
-#include "gtkintl.h"
+#include "gtkprivate.h"
 
 /* A private class used as the child of GtkPopover. The only thing
  * special here is that we need to queue a resize on the popover when
diff --git a/gtk/gtkpopovermenu.c b/gtk/gtkpopovermenu.c
index 7b5a02cd7c..dc2ec1284e 100644
--- a/gtk/gtkpopovermenu.c
+++ b/gtk/gtkpopovermenu.c
@@ -20,7 +20,6 @@
 #include "gtkpopovermenuprivate.h"
 
 #include "gtkstack.h"
-#include "gtkintl.h"
 #include "gtkmenusectionboxprivate.h"
 #include "gtkmenubutton.h"
 #include "gtkactionmuxerprivate.h"
diff --git a/gtk/gtkpopovermenubar.c b/gtk/gtkpopovermenubar.c
index 2df1a22858..f754246049 100644
--- a/gtk/gtkpopovermenubar.c
+++ b/gtk/gtkpopovermenubar.c
@@ -63,7 +63,6 @@
 #include "gtkboxlayout.h"
 #include "gtklabel.h"
 #include "gtkmenubutton.h"
-#include "gtkintl.h"
 #include "gtkprivate.h"
 #include "gtkmarshalers.h"
 #include "gtkgestureclick.h"
diff --git a/gtk/gtkprintbackend.c b/gtk/gtkprintbackend.c
index 292e6d7bc9..c24ad6603f 100644
--- a/gtk/gtkprintbackend.c
+++ b/gtk/gtkprintbackend.c
@@ -21,7 +21,7 @@
 
 #include <gmodule.h>
 
-#include "gtkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gtkdebug.h"
 #include "gtkmodulesprivate.h"
 #include "gtkmarshalers.h"
diff --git a/gtk/gtkprinter.c b/gtk/gtkprinter.c
index 0593d1573a..9b16d02463 100644
--- a/gtk/gtkprinter.c
+++ b/gtk/gtkprinter.c
@@ -20,7 +20,6 @@
 #include <string.h>
 #include <stdio.h>
 
-#include "gtkintl.h"
 #include "gtkprivate.h"
 
 #include "gtkprinter.h"
diff --git a/gtk/gtkprinteroption.c b/gtk/gtkprinteroption.c
index 7140c1f737..d81981eaf3 100644
--- a/gtk/gtkprinteroption.c
+++ b/gtk/gtkprinteroption.c
@@ -20,7 +20,6 @@
 #include <string.h>
 #include <gmodule.h>
 
-#include "gtkintl.h"
 #include "gtkprivate.h"
 #include "gtkprinteroption.h"
 
diff --git a/gtk/gtkprinteroptionset.c b/gtk/gtkprinteroptionset.c
index 54fcc46bbe..333f110bb6 100644
--- a/gtk/gtkprinteroptionset.c
+++ b/gtk/gtkprinteroptionset.c
@@ -22,7 +22,7 @@
 #include <gmodule.h>
 
 #include "gtkprinteroptionset.h"
-#include "gtkintl.h"
+#include "gtkprivate.h"
 
 /*****************************************
  *         GtkPrinterOptionSet    *
diff --git a/gtk/gtkprinteroptionwidget.c b/gtk/gtkprinteroptionwidget.c
index 8ff622b8b3..4737171ba5 100644
--- a/gtk/gtkprinteroptionwidget.c
+++ b/gtk/gtkprinteroptionwidget.c
@@ -21,7 +21,7 @@
 #include <stdio.h>
 #include <ctype.h>
 
-#include "gtkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gtkcheckbutton.h"
 #include "gtkdropdown.h"
 #include "gtklistitem.h"
diff --git a/gtk/gtkprintjob.c b/gtk/gtkprintjob.c
index c9441948d5..b295d8d69f 100644
--- a/gtk/gtkprintjob.c
+++ b/gtk/gtkprintjob.c
@@ -42,7 +42,6 @@
 #include <sys/stat.h>
 
 #include <glib/gstdio.h>
-#include "gtkintl.h"
 #include "gtkprivate.h"
 
 #include "gtkprintjob.h"
diff --git a/gtk/gtkprintoperation-portal.c b/gtk/gtkprintoperation-portal.c
index 2ec934dcc3..d2defb56b6 100644
--- a/gtk/gtkprintoperation-portal.c
+++ b/gtk/gtkprintoperation-portal.c
@@ -35,7 +35,7 @@
 #include "gtkpagesetup.h"
 #include "gtkprintbackendprivate.h"
 #include "gtkshow.h"
-#include "gtkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gtkwindowprivate.h"
 #include "gtkprivate.h"
 
diff --git a/gtk/gtkprintoperation-unix.c b/gtk/gtkprintoperation-unix.c
index 0096ed91da..297840d7f8 100644
--- a/gtk/gtkprintoperation-unix.c
+++ b/gtk/gtkprintoperation-unix.c
@@ -42,7 +42,7 @@
 #include "gtkprinter.h"
 #include "gtkprintjob.h"
 #include "gtklabel.h"
-#include "gtkintl.h"
+#include <glib/gi18n-lib.h>
 
 
 typedef struct
diff --git a/gtk/gtkprintoperation-win32.c b/gtk/gtkprintoperation-win32.c
index b9ef0bf9aa..0e81beefd6 100644
--- a/gtk/gtkprintoperation-win32.c
+++ b/gtk/gtkprintoperation-win32.c
@@ -38,9 +38,9 @@
 #include <windows.h>
 #include <cairo-win32.h>
 #include <glib.h>
+#include <glib/gi18n-lib.h>
 #include "gtkprintoperation-private.h"
 #include "gtkprint-win32.h"
-#include "gtkintl.h"
 #include "gtkwindow.h"
 #include "gtkprivate.h"
 #include "gtkwidgetprivate.h"
diff --git a/gtk/gtkprintoperation.c b/gtk/gtkprintoperation.c
index 365bb91ee1..399faf328d 100644
--- a/gtk/gtkprintoperation.c
+++ b/gtk/gtkprintoperation.c
@@ -27,7 +27,7 @@
 
 #include "gtkprintoperation-private.h"
 #include "gtkmarshalers.h"
-#include "gtkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gtkprivate.h"
 #include "gtkmessagedialog.h"
 #include "gtkwindowgroup.h"
diff --git a/gtk/gtkprintoperationpreview.c b/gtk/gtkprintoperationpreview.c
index 3c2d9b36df..14b4350421 100644
--- a/gtk/gtkprintoperationpreview.c
+++ b/gtk/gtkprintoperationpreview.c
@@ -20,7 +20,7 @@
 
 #include "gtkprintoperationpreview.h"
 #include "gtkmarshalers.h"
-#include "gtkintl.h"
+#include "gtkprivate.h"
 
 
 /**
diff --git a/gtk/gtkprintunixdialog.c b/gtk/gtkprintunixdialog.c
index fd23cd9a89..274b051ce1 100644
--- a/gtk/gtkprintunixdialog.c
+++ b/gtk/gtkprintunixdialog.c
@@ -46,7 +46,7 @@
 #include "gtkbuildable.h"
 #include "gtkmessagedialog.h"
 #include "gtkbutton.h"
-#include "gtkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gtkprivate.h"
 #include "gtktypebuiltins.h"
 #include "gtkdialogprivate.h"
diff --git a/gtk/gtkprogressbar.c b/gtk/gtkprogressbar.c
index ac4526971f..8aab132155 100644
--- a/gtk/gtkprogressbar.c
+++ b/gtk/gtkprogressbar.c
@@ -28,7 +28,7 @@
 
 #include "gtkboxlayout.h"
 #include "gtkgizmoprivate.h"
-#include "gtkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gtklabel.h"
 #include "gtkorientable.h"
 #include "gtkprogresstrackerprivate.h"
diff --git a/gtk/gtkpropertylookuplistmodel.c b/gtk/gtkpropertylookuplistmodel.c
index 222383140e..5fc8af57fa 100644
--- a/gtk/gtkpropertylookuplistmodel.c
+++ b/gtk/gtkpropertylookuplistmodel.c
@@ -33,7 +33,6 @@
 
 #include "gtkpropertylookuplistmodelprivate.h"
 
-#include "gtkintl.h"
 #include "gtkprivate.h"
 
 enum {
diff --git a/gtk/gtkrange.c b/gtk/gtkrange.c
index 6ea8430199..7ebb2d4316 100644
--- a/gtk/gtkrange.c
+++ b/gtk/gtkrange.c
@@ -38,7 +38,6 @@
 #include "gtkgesturelongpressprivate.h"
 #include "gtkgestureclick.h"
 #include "gtkgizmoprivate.h"
-#include "gtkintl.h"
 #include "gtkmarshalers.h"
 #include "gtkorientable.h"
 #include "gtkprivate.h"
diff --git a/gtk/gtkrecentmanager.c b/gtk/gtkrecentmanager.c
index ecd1c0a224..3576718408 100644
--- a/gtk/gtkrecentmanager.c
+++ b/gtk/gtkrecentmanager.c
@@ -93,7 +93,7 @@
 #include <gio/gio.h>
 
 #include "gtkrecentmanager.h"
-#include "gtkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gtksettings.h"
 #include "gtktypebuiltins.h"
 #include "gtkprivate.h"
diff --git a/gtk/gtkrevealer.c b/gtk/gtkrevealer.c
index 35a6ce28ab..556b549b16 100644
--- a/gtk/gtkrevealer.c
+++ b/gtk/gtkrevealer.c
@@ -24,7 +24,6 @@
 
 #include "gtkrevealer.h"
 
-#include "gtkintl.h"
 #include "gtkprivate.h"
 #include "gtkprogresstrackerprivate.h"
 #include "gtksettingsprivate.h"
diff --git a/gtk/gtkroot.c b/gtk/gtkroot.c
index ed1853b578..fe1da061b1 100644
--- a/gtk/gtkroot.c
+++ b/gtk/gtkroot.c
@@ -26,7 +26,6 @@
 #include "gtkwidgetprivate.h"
 #include "gdk/gdkprivate.h"
 #include "gtkprivate.h"
-#include "gtkintl.h"
 
 #include "gtkshortcutmanager.h"
 
diff --git a/gtk/gtkscale.c b/gtk/gtkscale.c
index 801d9dde10..7280fadc53 100644
--- a/gtk/gtkscale.c
+++ b/gtk/gtkscale.c
@@ -32,7 +32,6 @@
 #include "gtkbuilderprivate.h"
 #include "gtkgizmoprivate.h"
 #include "gtkicontheme.h"
-#include "gtkintl.h"
 #include "gtklabel.h"
 #include "gtkmarshalers.h"
 #include "gtkorientable.h"
diff --git a/gtk/gtkscalebutton.c b/gtk/gtkscalebutton.c
index 4cda343249..67d919c657 100644
--- a/gtk/gtkscalebutton.c
+++ b/gtk/gtkscalebutton.c
@@ -43,7 +43,6 @@
 #include "gtkeventcontrollerscroll.h"
 #include "gtkframe.h"
 #include "gtkgesture.h"
-#include "gtkintl.h"
 #include "gtkmain.h"
 #include "gtkmarshalers.h"
 #include "gtkorientable.h"
diff --git a/gtk/gtkscrollable.c b/gtk/gtkscrollable.c
index 1ffb11be9f..b8d8ce54b8 100644
--- a/gtk/gtkscrollable.c
+++ b/gtk/gtkscrollable.c
@@ -55,7 +55,6 @@
 #include "gtkadjustment.h"
 #include "gtkprivate.h"
 #include "gtktypebuiltins.h"
-#include "gtkintl.h"
 
 G_DEFINE_INTERFACE (GtkScrollable, gtk_scrollable, G_TYPE_OBJECT)
 
diff --git a/gtk/gtkscrollbar.c b/gtk/gtkscrollbar.c
index 9a38ed2fd4..20b49a78a2 100644
--- a/gtk/gtkscrollbar.c
+++ b/gtk/gtkscrollbar.c
@@ -29,7 +29,6 @@
 #include "gtkrange.h"
 
 #include "gtkadjustment.h"
-#include "gtkintl.h"
 #include "gtkorientable.h"
 #include "gtkprivate.h"
 #include "gtkwidgetprivate.h"
diff --git a/gtk/gtkscrolledwindow.c b/gtk/gtkscrolledwindow.c
index bc48c6c6c7..8620fbdf6c 100644
--- a/gtk/gtkscrolledwindow.c
+++ b/gtk/gtkscrolledwindow.c
@@ -39,7 +39,6 @@
 #include "gtkgesturesingle.h"
 #include "gtkgestureswipe.h"
 #include "gtkgestureprivate.h"
-#include "gtkintl.h"
 #include "gtkkineticscrollingprivate.h"
 #include "gtkmain.h"
 #include "gtkmarshalers.h"
diff --git a/gtk/gtksearchbar.c b/gtk/gtksearchbar.c
index 05f8a4d08a..d6538ffe2b 100644
--- a/gtk/gtksearchbar.c
+++ b/gtk/gtksearchbar.c
@@ -35,7 +35,6 @@
 #include "gtkcenterbox.h"
 #include "gtkentryprivate.h"
 #include "gtkeventcontrollerkey.h"
-#include "gtkintl.h"
 #include "gtkprivate.h"
 #include "gtkrevealer.h"
 #include "gtksearchentryprivate.h"
diff --git a/gtk/gtksearchengine.c b/gtk/gtksearchengine.c
index 73b14aa5e8..9f867661fe 100644
--- a/gtk/gtksearchengine.c
+++ b/gtk/gtksearchengine.c
@@ -23,7 +23,8 @@
 #include "gtksearchengineprivate.h"
 #include "gtksearchenginemodelprivate.h"
 #include "gtksearchenginequartzprivate.h"
-#include "gtkintl.h"
+#include <glib/gi18n-lib.h>
+#include "gtkprivate.h"
 
 #include <gdk/gdk.h> /* for GDK_WINDOWING_MACOS */
 
diff --git a/gtk/gtksearchentry.c b/gtk/gtksearchentry.c
index 4779447719..870d5e901e 100644
--- a/gtk/gtksearchentry.c
+++ b/gtk/gtksearchentry.c
@@ -35,7 +35,7 @@
 #include "gtkgestureclick.h"
 #include "gtktextprivate.h"
 #include "gtkimage.h"
-#include "gtkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gtkprivate.h"
 #include "gtkmarshalers.h"
 #include "gtkstylecontext.h"
diff --git a/gtk/gtkselectionfiltermodel.c b/gtk/gtkselectionfiltermodel.c
index e5ad87137b..e7824cdcff 100644
--- a/gtk/gtkselectionfiltermodel.c
+++ b/gtk/gtkselectionfiltermodel.c
@@ -22,7 +22,6 @@
 #include "gtkselectionfiltermodel.h"
 #include "gtkbitset.h"
 
-#include "gtkintl.h"
 #include "gtkprivate.h"
 
 /**
diff --git a/gtk/gtkselectionmodel.c b/gtk/gtkselectionmodel.c
index e9c9dcef3c..7c93c2b4e7 100644
--- a/gtk/gtkselectionmodel.c
+++ b/gtk/gtkselectionmodel.c
@@ -22,7 +22,6 @@
 #include "gtkselectionmodel.h"
 
 #include "gtkbitset.h"
-#include "gtkintl.h"
 #include "gtkmarshalers.h"
 
 /**
diff --git a/gtk/gtkseparator.c b/gtk/gtkseparator.c
index 5eb8dc35b7..5440c3e147 100644
--- a/gtk/gtkseparator.c
+++ b/gtk/gtkseparator.c
@@ -27,7 +27,6 @@
 #include "gtkseparator.h"
 
 #include "gtkaccessible.h"
-#include "gtkintl.h"
 #include "gtkorientable.h"
 #include "gtkprivate.h"
 #include "gtkwidgetprivate.h"
diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c
index 4ece91ffbe..08c2899dab 100644
--- a/gtk/gtksettings.c
+++ b/gtk/gtksettings.c
@@ -21,7 +21,6 @@
 #include "gtksettingsprivate.h"
 
 #include "gtkcssproviderprivate.h"
-#include "gtkintl.h"
 #include "gtkprivate.h"
 #include "gtkscrolledwindow.h"
 #include "gtkstylecontextprivate.h"
diff --git a/gtk/gtkshortcut.c b/gtk/gtkshortcut.c
index 198746bec1..e3f13c391f 100644
--- a/gtk/gtkshortcut.c
+++ b/gtk/gtkshortcut.c
@@ -21,7 +21,6 @@
 
 #include "gtkshortcut.h"
 
-#include "gtkintl.h"
 #include "gtkshortcutaction.h"
 #include "gtkshortcuttrigger.h"
 #include "gtkwidget.h"
diff --git a/gtk/gtkshortcutaction.c b/gtk/gtkshortcutaction.c
index 2d2d413900..cdcb77dd33 100644
--- a/gtk/gtkshortcutaction.c
+++ b/gtk/gtkshortcutaction.c
@@ -54,7 +54,6 @@
 #include "gtkshortcutactionprivate.h"
 
 #include "gtkbuilder.h"
-#include "gtkintl.h"
 #include "gtkwidgetprivate.h"
 #include "gtkdebug.h"
 #include "gtkprivate.h"
diff --git a/gtk/gtkshortcutcontroller.c b/gtk/gtkshortcutcontroller.c
index 93aa218117..d976d9ddbf 100644
--- a/gtk/gtkshortcutcontroller.c
+++ b/gtk/gtkshortcutcontroller.c
@@ -70,7 +70,6 @@
 #include "gtkflattenlistmodel.h"
 #include "gtkbuildable.h"
 #include "gtkeventcontrollerprivate.h"
-#include "gtkintl.h"
 #include "gtkshortcut.h"
 #include "gtkshortcutmanager.h"
 #include "gtkshortcuttrigger.h"
diff --git a/gtk/gtkshortcutlabel.c b/gtk/gtkshortcutlabel.c
index 53a227ab00..906c15faa6 100644
--- a/gtk/gtkshortcutlabel.c
+++ b/gtk/gtkshortcutlabel.c
@@ -23,7 +23,8 @@
 #include "gtklabel.h"
 #include "gtkframe.h"
 #include "gtkwidgetprivate.h"
-#include "gtkintl.h"
+#include <glib/gi18n-lib.h>
+#include "gtkprivate.h"
 
 /**
  * GtkShortcutLabel:
diff --git a/gtk/gtkshortcutsgroup.c b/gtk/gtkshortcutsgroup.c
index d51c12a3ba..2be96c9cc5 100644
--- a/gtk/gtkshortcutsgroup.c
+++ b/gtk/gtkshortcutsgroup.c
@@ -22,7 +22,6 @@
 
 #include "gtkbox.h"
 #include "gtkbuildable.h"
-#include "gtkintl.h"
 #include "gtklabel.h"
 #include "gtkorientable.h"
 #include "gtkprivate.h"
diff --git a/gtk/gtkshortcutssection.c b/gtk/gtkshortcutssection.c
index c7c5e5739e..b2243f1281 100644
--- a/gtk/gtkshortcutssection.c
+++ b/gtk/gtkshortcutssection.c
@@ -35,7 +35,7 @@
 #include "gtkgesturepan.h"
 #include "gtkwidgetprivate.h"
 #include "gtkcenterbox.h"
-#include "gtkintl.h"
+#include <glib/gi18n-lib.h>
 
 /**
  * GtkShortcutsSection:
diff --git a/gtk/gtkshortcutsshortcut.c b/gtk/gtkshortcutsshortcut.c
index cf685d33c3..85d3605da7 100644
--- a/gtk/gtkshortcutsshortcut.c
+++ b/gtk/gtkshortcutsshortcut.c
@@ -22,7 +22,7 @@
 
 #include "gtkimage.h"
 #include "gtkbox.h"
-#include "gtkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gtklabel.h"
 #include "gtkprivate.h"
 #include "gtkwidgetprivate.h"
diff --git a/gtk/gtkshortcutswindow.c b/gtk/gtkshortcutswindow.c
index 7c864ec5cd..1c3d6ea667 100644
--- a/gtk/gtkshortcutswindow.c
+++ b/gtk/gtkshortcutswindow.c
@@ -24,7 +24,7 @@
 #include "gtkbuildable.h"
 #include "gtkgrid.h"
 #include "gtkheaderbar.h"
-#include "gtkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gtklabel.h"
 #include "gtklistbox.h"
 #include "gtkmain.h"
diff --git a/gtk/gtkshortcuttrigger.c b/gtk/gtkshortcuttrigger.c
index 2d7b5b8ade..a18be8aa5e 100644
--- a/gtk/gtkshortcuttrigger.c
+++ b/gtk/gtkshortcuttrigger.c
@@ -41,7 +41,6 @@
 
 #include "gtkaccelgroupprivate.h"
 #include "gtkprivate.h"
-#include "gtkintl.h"
 
 #define GTK_SHORTCUT_TRIGGER_HASH_NEVER         0u
 #define GTK_SHORTCUT_TRIGGER_HASH_KEYVAL        1u
diff --git a/gtk/gtkshow.c b/gtk/gtkshow.c
index 4dd8b9e89c..b24035c00d 100644
--- a/gtk/gtkshow.c
+++ b/gtk/gtkshow.c
@@ -25,7 +25,7 @@
 #include "gtkshow.h"
 #include "gtkwindowprivate.h"
 #include "gtkmessagedialog.h"
-#include "gtkintl.h"
+#include <glib/gi18n-lib.h>
 
 typedef struct {
   GtkWindow *parent;
diff --git a/gtk/gtksidebarrow.c b/gtk/gtksidebarrow.c
index a471705aa6..f2adfde4b8 100644
--- a/gtk/gtksidebarrow.c
+++ b/gtk/gtksidebarrow.c
@@ -25,9 +25,9 @@
 #include "gtkimage.h"
 #include "gtklabel.h"
 #include "gtkrevealer.h"
-#include "gtkintl.h"
 #include "gtkspinner.h"
 #include "gtkprivatetypebuiltins.h"
+#include "gtkprivate.h"
 
 #ifdef HAVE_CLOUDPROVIDERS
 #include <cloudproviders.h>
diff --git a/gtk/gtksignallistitemfactory.c b/gtk/gtksignallistitemfactory.c
index 923bc9c591..934047b429 100644
--- a/gtk/gtksignallistitemfactory.c
+++ b/gtk/gtksignallistitemfactory.c
@@ -21,9 +21,9 @@
 
 #include "gtksignallistitemfactory.h"
 
-#include "gtkintl.h"
 #include "gtklistitemfactoryprivate.h"
 #include "gtklistitem.h"
+#include "gtkprivate.h"
 
 /**
  * GtkSignalListItemFactory:
diff --git a/gtk/gtksingleselection.c b/gtk/gtksingleselection.c
index 0c92619447..fb5c1ad435 100644
--- a/gtk/gtksingleselection.c
+++ b/gtk/gtksingleselection.c
@@ -22,7 +22,6 @@
 #include "gtksingleselection.h"
 
 #include "gtkbitset.h"
-#include "gtkintl.h"
 #include "gtkselectionmodel.h"
 
 /**
diff --git a/gtk/gtksizegroup.c b/gtk/gtksizegroup.c
index 96845e7526..a8b6a27d6c 100644
--- a/gtk/gtksizegroup.c
+++ b/gtk/gtksizegroup.c
@@ -22,7 +22,6 @@
 #include "gtkbuildable.h"
 #include "gtkbuilderprivate.h"
 #include "gtkwidget.h"
-#include "gtkintl.h"
 #include "gtktypebuiltins.h"
 #include "gtkprivate.h"
 #include "gtksizegroup-private.h"
diff --git a/gtk/gtksizerequest.c b/gtk/gtksizerequest.c
index 100b3db809..c6f0d97b41 100644
--- a/gtk/gtksizerequest.c
+++ b/gtk/gtksizerequest.c
@@ -24,7 +24,6 @@
 #include "gtksizerequest.h"
 
 #include "gtkdebug.h"
-#include "gtkintl.h"
 #include "gtkprivate.h"
 #include "gtksizegroup-private.h"
 #include "gtksizerequestcacheprivate.h"
diff --git a/gtk/gtkslicelistmodel.c b/gtk/gtkslicelistmodel.c
index 1d83f44f47..232dbe5aac 100644
--- a/gtk/gtkslicelistmodel.c
+++ b/gtk/gtkslicelistmodel.c
@@ -21,7 +21,6 @@
 
 #include "gtkslicelistmodel.h"
 
-#include "gtkintl.h"
 #include "gtkprivate.h"
 
 /**
diff --git a/gtk/gtksorter.c b/gtk/gtksorter.c
index ab50dc08c2..2de29554ec 100644
--- a/gtk/gtksorter.c
+++ b/gtk/gtksorter.c
@@ -21,8 +21,9 @@
 
 #include "gtksorterprivate.h"
 
-#include "gtkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gtktypebuiltins.h"
+#include "gtkprivate.h"
 
 /**
  * GtkSorter:
diff --git a/gtk/gtksortlistmodel.c b/gtk/gtksortlistmodel.c
index 3e45c911cb..3bd26fdb0e 100644
--- a/gtk/gtksortlistmodel.c
+++ b/gtk/gtksortlistmodel.c
@@ -22,7 +22,6 @@
 #include "gtksortlistmodel.h"
 
 #include "gtkbitset.h"
-#include "gtkintl.h"
 #include "gtkprivate.h"
 #include "gtksorterprivate.h"
 #include "timsort/gtktimsortprivate.h"
diff --git a/gtk/gtkspinbutton.c b/gtk/gtkspinbutton.c
index e65d623b30..8506f7aa26 100644
--- a/gtk/gtkspinbutton.c
+++ b/gtk/gtkspinbutton.c
@@ -47,7 +47,6 @@
 #include "gtkgestureclick.h"
 #include "gtkgestureswipe.h"
 #include "gtkicontheme.h"
-#include "gtkintl.h"
 #include "gtkmarshalers.h"
 #include "gtkorientable.h"
 #include "gtkprivate.h"
diff --git a/gtk/gtkspinner.c b/gtk/gtkspinner.c
index 4d487e1c4a..1b80d6b075 100644
--- a/gtk/gtkspinner.c
+++ b/gtk/gtkspinner.c
@@ -32,7 +32,6 @@
 #include "gtkspinner.h"
 
 #include "gtkimage.h"
-#include "gtkintl.h"
 #include "gtkprivate.h"
 #include "gtkcssnodeprivate.h"
 #include "gtkwidgetprivate.h"
diff --git a/gtk/gtkstack.c b/gtk/gtkstack.c
index e70df2c093..4dddcd5cb3 100644
--- a/gtk/gtkstack.c
+++ b/gtk/gtkstack.c
@@ -27,7 +27,6 @@
 #include "gtkaccessibleprivate.h"
 #include "gtkatcontextprivate.h"
 #include "gtkprivate.h"
-#include "gtkintl.h"
 #include "gtkprogresstrackerprivate.h"
 #include "gtksettingsprivate.h"
 #include "gtksnapshot.h"
diff --git a/gtk/gtkstacksidebar.c b/gtk/gtkstacksidebar.c
index 675c12aeeb..c21ff9bf66 100644
--- a/gtk/gtkstacksidebar.c
+++ b/gtk/gtkstacksidebar.c
@@ -32,7 +32,6 @@
 #include "gtkstack.h"
 #include "gtkprivate.h"
 #include "gtkwidgetprivate.h"
-#include "gtkintl.h"
 
 /**
  * GtkStackSidebar:
diff --git a/gtk/gtkstackswitcher.c b/gtk/gtkstackswitcher.c
index cd1e24bd73..ffe4a79a4e 100644
--- a/gtk/gtkstackswitcher.c
+++ b/gtk/gtkstackswitcher.c
@@ -24,7 +24,6 @@
 #include "gtkboxlayout.h"
 #include "gtkdropcontrollermotion.h"
 #include "gtkimage.h"
-#include "gtkintl.h"
 #include "gtklabel.h"
 #include "gtkorientable.h"
 #include "gtkprivate.h"
diff --git a/gtk/gtkstatusbar.c b/gtk/gtkstatusbar.c
index 70afc1bdf4..5cbea341d2 100644
--- a/gtk/gtkstatusbar.c
+++ b/gtk/gtkstatusbar.c
@@ -32,7 +32,6 @@
 #include "gtklabel.h"
 #include "gtkmarshalers.h"
 #include "gtkprivate.h"
-#include "gtkintl.h"
 #include "gtkorientable.h"
 #include "gtktypebuiltins.h"
 #include "gtkwidgetprivate.h"
diff --git a/gtk/gtkstringfilter.c b/gtk/gtkstringfilter.c
index 2a33071cf4..9270a93d70 100644
--- a/gtk/gtkstringfilter.c
+++ b/gtk/gtkstringfilter.c
@@ -21,7 +21,6 @@
 
 #include "gtkstringfilter.h"
 
-#include "gtkintl.h"
 #include "gtktypebuiltins.h"
 
 /**
diff --git a/gtk/gtkstringlist.c b/gtk/gtkstringlist.c
index 74beb96a86..092840b693 100644
--- a/gtk/gtkstringlist.c
+++ b/gtk/gtkstringlist.c
@@ -23,7 +23,6 @@
 
 #include "gtkbuildable.h"
 #include "gtkbuilderprivate.h"
-#include "gtkintl.h"
 #include "gtkprivate.h"
 
 /**
diff --git a/gtk/gtkstringsorter.c b/gtk/gtkstringsorter.c
index 4297195838..59d2d8737e 100644
--- a/gtk/gtkstringsorter.c
+++ b/gtk/gtkstringsorter.c
@@ -21,7 +21,6 @@
 
 #include "gtkstringsorter.h"
 
-#include "gtkintl.h"
 #include "gtksorterprivate.h"
 #include "gtktypebuiltins.h"
 
diff --git a/gtk/gtkstylecontext.c b/gtk/gtkstylecontext.c
index 5fca489632..90c2b846b0 100644
--- a/gtk/gtkstylecontext.c
+++ b/gtk/gtkstylecontext.c
@@ -25,7 +25,6 @@
 #include "gtkcssnumbervalueprivate.h"
 #include "gtkcsstransientnodeprivate.h"
 #include "gtkdebug.h"
-#include "gtkintl.h"
 #include "gtkprivate.h"
 #include "gtksettings.h"
 #include "gtksettingsprivate.h"
diff --git a/gtk/gtkstyleproperty.c b/gtk/gtkstyleproperty.c
index 4ca3ff342f..317faa7534 100644
--- a/gtk/gtkstyleproperty.c
+++ b/gtk/gtkstyleproperty.c
@@ -26,7 +26,6 @@
 #include "gtkcssshorthandpropertyprivate.h"
 #include "gtkcssstylepropertyprivate.h"
 #include "gtkcsstypesprivate.h"
-#include "gtkintl.h"
 #include "gtkprivatetypebuiltins.h"
 
 enum {
diff --git a/gtk/gtkstyleprovider.c b/gtk/gtkstyleprovider.c
index f9f530c45a..19dca70d2a 100644
--- a/gtk/gtkstyleprovider.c
+++ b/gtk/gtkstyleprovider.c
@@ -19,7 +19,6 @@
 
 #include "gtkstyleproviderprivate.h"
 
-#include "gtkintl.h"
 #include "gtkprivate.h"
 
 /**
diff --git a/gtk/gtkswitch.c b/gtk/gtkswitch.c
index c4336cca63..e59f933617 100644
--- a/gtk/gtkswitch.c
+++ b/gtk/gtkswitch.c
@@ -64,7 +64,6 @@
 #include "gtkgesturepan.h"
 #include "gtkgesturesingle.h"
 #include "gtkgizmoprivate.h"
-#include "gtkintl.h"
 #include "gtkimage.h"
 #include "gtkcustomlayout.h"
 #include "gtkmarshalers.h"
diff --git a/gtk/gtktext.c b/gtk/gtktext.c
index 796683e44e..2e5d538df5 100644
--- a/gtk/gtktext.c
+++ b/gtk/gtktext.c
@@ -44,7 +44,7 @@
 #include "gtkimageprivate.h"
 #include "gtkimcontextsimple.h"
 #include "gtkimmulticontext.h"
-#include "gtkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gtklabel.h"
 #include "gtkmagnifierprivate.h"
 #include "gtkmain.h"
diff --git a/gtk/gtktextbuffer.c b/gtk/gtktextbuffer.c
index 1139e8b468..0d59288d93 100644
--- a/gtk/gtktextbuffer.c
+++ b/gtk/gtktextbuffer.c
@@ -37,7 +37,6 @@
 #include "gtktexttagtableprivate.h"
 #include "gtkpango.h"
 #include "gtkprivate.h"
-#include "gtkintl.h"
 
 #define DEFAULT_MAX_UNDO 200
 
diff --git a/gtk/gtktextchild.c b/gtk/gtktextchild.c
index e515d743a5..c64654835c 100644
--- a/gtk/gtktextchild.c
+++ b/gtk/gtktextchild.c
@@ -51,7 +51,7 @@
 #include "gtktextchild.h"
 #include "gtktextbtree.h"
 #include "gtktextlayoutprivate.h"
-#include "gtkintl.h"
+#include "gtkprivate.h"
 
 typedef struct {
   char *replacement;
diff --git a/gtk/gtktexthandle.c b/gtk/gtktexthandle.c
index 05f6d809aa..a373c6527c 100644
--- a/gtk/gtktexthandle.c
+++ b/gtk/gtktexthandle.c
@@ -24,13 +24,13 @@
 #include "gtkcssnodeprivate.h"
 #include "gtkgesturedrag.h"
 #include "gtkgizmoprivate.h"
-#include "gtkintl.h"
 #include "gtkmarshalers.h"
 #include "gtknativeprivate.h"
 #include "gtkprivatetypebuiltins.h"
 #include "gtkrendericonprivate.h"
 #include "gtkwidgetprivate.h"
 #include "gtkwindowprivate.h"
+#include "gtkprivate.h"
 
 #include "gdk/gdksurfaceprivate.h"
 
diff --git a/gtk/gtktextiter.c b/gtk/gtktextiter.c
index 7da46fda8c..fcc4597656 100644
--- a/gtk/gtktextiter.c
+++ b/gtk/gtktextiter.c
@@ -27,7 +27,6 @@
 #include "gtktextbtree.h"
 #include "gtktextbufferprivate.h"
 #include "gtktextiterprivate.h"
-#include "gtkintl.h"
 #include "gtkdebug.h"
 
 #include <string.h>
diff --git a/gtk/gtktextlayout.c b/gtk/gtktextlayout.c
index ad0570b6b1..f394984977 100644
--- a/gtk/gtktextlayout.c
+++ b/gtk/gtktextlayout.c
@@ -88,10 +88,10 @@
 #include "gtktextlinedisplaycacheprivate.h"
 #include "gtktextutil.h"
 #include "gskpango.h"
-#include "gtkintl.h"
 #include "gtksnapshotprivate.h"
 #include "gtkwidgetprivate.h"
 #include "gtktextviewprivate.h"
+#include "gtkprivate.h"
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/gtk/gtktextmark.c b/gtk/gtktextmark.c
index 151f00245b..ac4a2f1f22 100644
--- a/gtk/gtktextmark.c
+++ b/gtk/gtktextmark.c
@@ -50,7 +50,6 @@
 #include "config.h"
 #include "gtktextbtree.h"
 #include "gtkprivate.h"
-#include "gtkintl.h"
 
 
 /**
diff --git a/gtk/gtktexttag.c b/gtk/gtktexttag.c
index b1f670753f..397dac13af 100644
--- a/gtk/gtktexttag.c
+++ b/gtk/gtktexttag.c
@@ -79,7 +79,6 @@
 #include "gtktexttypes.h"
 #include "gtktexttagtable.h"
 #include "gtktexttagtableprivate.h"
-#include "gtkintl.h"
 #include "gtkmarshalers.h"
 #include "gtkprivate.h"
 #include "gtktypebuiltins.h"
diff --git a/gtk/gtktexttagtable.c b/gtk/gtktexttagtable.c
index eb545daec7..2052d38242 100644
--- a/gtk/gtktexttagtable.c
+++ b/gtk/gtktexttagtable.c
@@ -31,7 +31,7 @@
 #include "gtktexttagprivate.h"
 #include "gtkmarshalers.h"
 #include "gtktextbufferprivate.h" /* just for the lame notify_will_remove_tag hack */
-#include "gtkintl.h"
+#include "gtkprivate.h"
 
 #include <stdlib.h>
 
diff --git a/gtk/gtktextutil.c b/gtk/gtktextutil.c
index 75f081732a..425ae65a2b 100644
--- a/gtk/gtktextutil.c
+++ b/gtk/gtktextutil.c
@@ -31,7 +31,6 @@
 #include "gtkstylecontextprivate.h"
 #include "gtktextbuffer.h"
 #include "gtktextlayoutprivate.h"
-#include "gtkintl.h"
 #include "gtkwidgetprivate.h"
 #include "gtkcssstyleprivate.h"
 #include "gtkcsscolorvalueprivate.h"
diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c
index 2e600e01bb..3b9cce9fc8 100644
--- a/gtk/gtktextview.c
+++ b/gtk/gtktextview.c
@@ -34,7 +34,7 @@
 #include "gtkdebug.h"
 #include "gtkdragsourceprivate.h"
 #include "gtkdropcontrollermotion.h"
-#include "gtkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gtkmain.h"
 #include "gtkmarshalers.h"
 #include "gtkrenderbackgroundprivate.h"
diff --git a/gtk/gtktextviewchild.c b/gtk/gtktextviewchild.c
index d7eb7390da..e3ae004801 100644
--- a/gtk/gtktextviewchild.c
+++ b/gtk/gtktextviewchild.c
@@ -19,7 +19,6 @@
 #include "config.h"
 
 #include "gtkcssnodeprivate.h"
-#include "gtkintl.h"
 #include "gtkprivate.h"
 #include "gtktextview.h"
 #include "gtktextviewchildprivate.h"
diff --git a/gtk/gtktogglebutton.c b/gtk/gtktogglebutton.c
index 19c23040f7..b6a9869560 100644
--- a/gtk/gtktogglebutton.c
+++ b/gtk/gtktogglebutton.c
@@ -29,7 +29,6 @@
 #include "gtkaccessible.h"
 #include "gtkbuttonprivate.h"
 #include "gtkenums.h"
-#include "gtkintl.h"
 #include "gtklabel.h"
 #include "gtkmain.h"
 #include "gtkmarshalers.h"
diff --git a/gtk/gtktooltip.c b/gtk/gtktooltip.c
index 54708a14aa..25ae5f90f7 100644
--- a/gtk/gtktooltip.c
+++ b/gtk/gtktooltip.c
@@ -25,7 +25,6 @@
 #include <math.h>
 #include <string.h>
 
-#include "gtkintl.h"
 #include "gtkwindow.h"
 #include "gtkmain.h"
 #include "gtksettings.h"
diff --git a/gtk/gtktooltipwindow.c b/gtk/gtktooltipwindow.c
index 82d54533d0..b8658cf124 100644
--- a/gtk/gtktooltipwindow.c
+++ b/gtk/gtktooltipwindow.c
@@ -28,7 +28,6 @@
 
 #include "gtkbox.h"
 #include "gtkimage.h"
-#include "gtkintl.h"
 #include "gtklabel.h"
 #include "gtkprivate.h"
 #include "gtksettings.h"
diff --git a/gtk/gtktrashmonitor.c b/gtk/gtktrashmonitor.c
index 1a39ce1871..47cddcc362 100644
--- a/gtk/gtktrashmonitor.c
+++ b/gtk/gtktrashmonitor.c
@@ -20,7 +20,7 @@
 
 #include "config.h"
 
-#include "gtkintl.h"
+#include "gtkprivate.h"
 #include "gtkmarshalers.h"
 #include "gtktrashmonitor.h"
 
diff --git a/gtk/gtktreednd.c b/gtk/gtktreednd.c
index 5f29a4e616..d4816cd1b2 100644
--- a/gtk/gtktreednd.c
+++ b/gtk/gtktreednd.c
@@ -18,7 +18,6 @@
 #include "config.h"
 #include <string.h>
 #include "gtktreednd.h"
-#include "gtkintl.h"
 
 #include "gtkprivate.h"
 
diff --git a/gtk/gtktreeexpander.c b/gtk/gtktreeexpander.c
index b07a63e67f..ef40403938 100644
--- a/gtk/gtktreeexpander.c
+++ b/gtk/gtktreeexpander.c
@@ -27,7 +27,7 @@
 #include "gtkdropcontrollermotion.h"
 #include "gtkenums.h"
 #include "gtkgestureclick.h"
-#include "gtkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gtktreelistmodel.h"
 #include "gtkprivate.h"
 
diff --git a/gtk/gtktreelistmodel.c b/gtk/gtktreelistmodel.c
index ab053b323f..84538fd4cf 100644
--- a/gtk/gtktreelistmodel.c
+++ b/gtk/gtktreelistmodel.c
@@ -22,7 +22,6 @@
 #include "gtktreelistmodel.h"
 
 #include "gtkrbtreeprivate.h"
-#include "gtkintl.h"
 #include "gtkprivate.h"
 
 /**
diff --git a/gtk/gtktreelistrowsorter.c b/gtk/gtktreelistrowsorter.c
index f9f626b1c5..d7932cb067 100644
--- a/gtk/gtktreelistrowsorter.c
+++ b/gtk/gtktreelistrowsorter.c
@@ -23,7 +23,6 @@
 
 #include "gtktreelistmodel.h"
 
-#include "gtkintl.h"
 #include "gtksorterprivate.h"
 #include "gtktypebuiltins.h"
 
diff --git a/gtk/gtktreemodel.c b/gtk/gtktreemodel.c
index 306ee33710..7034bd0dd4 100644
--- a/gtk/gtktreemodel.c
+++ b/gtk/gtktreemodel.c
@@ -25,7 +25,7 @@
 #include "gtktreeview.h"
 #include "gtktreeprivate.h"
 #include "gtkmarshalers.h"
-#include "gtkintl.h"
+#include "gtkprivate.h"
 
 /**
  * GtkTreeModel:
diff --git a/gtk/gtktreemodelfilter.c b/gtk/gtktreemodelfilter.c
index 6610fa7987..cdad0ed111 100644
--- a/gtk/gtktreemodelfilter.c
+++ b/gtk/gtktreemodelfilter.c
@@ -18,7 +18,6 @@
 
 #include "config.h"
 #include "gtktreemodelfilter.h"
-#include "gtkintl.h"
 #include "gtktreednd.h"
 #include "gtkprivate.h"
 #include <string.h>
diff --git a/gtk/gtktreemodelsort.c b/gtk/gtktreemodelsort.c
index 8674b356ee..ee4bbcfe14 100644
--- a/gtk/gtktreemodelsort.c
+++ b/gtk/gtktreemodelsort.c
@@ -23,7 +23,6 @@
 #include "gtktreesortable.h"
 #include "gtktreestore.h"
 #include "gtktreedatalist.h"
-#include "gtkintl.h"
 #include "gtkprivate.h"
 #include "gtktreednd.h"
 
diff --git a/gtk/gtktreepopover.c b/gtk/gtktreepopover.c
index 77cd8f9e52..992c4574a5 100644
--- a/gtk/gtktreepopover.c
+++ b/gtk/gtktreepopover.c
@@ -25,7 +25,6 @@
 #include "gtkcellarea.h"
 #include "gtkcelllayout.h"
 #include "gtkcellview.h"
-#include "gtkintl.h"
 #include "gtkprivate.h"
 #include "gtkgizmoprivate.h"
 #include "gtkwidgetprivate.h"
diff --git a/gtk/gtktreeselection.c b/gtk/gtktreeselection.c
index a3c6ecd946..b03c5655c2 100644
--- a/gtk/gtktreeselection.c
+++ b/gtk/gtktreeselection.c
@@ -21,7 +21,6 @@
 #include "gtktreeprivate.h"
 #include "gtktreerbtreeprivate.h"
 #include "gtkmarshalers.h"
-#include "gtkintl.h"
 #include "gtkprivate.h"
 #include "gtktypebuiltins.h"
 
diff --git a/gtk/gtktreesortable.c b/gtk/gtktreesortable.c
index 622bc24603..d234530d8c 100644
--- a/gtk/gtktreesortable.c
+++ b/gtk/gtktreesortable.c
@@ -19,7 +19,7 @@
 #include "config.h"
 #include "gtktreesortable.h"
 #include "gtkmarshalers.h"
-#include "gtkintl.h"
+#include "gtkprivate.h"
 
 
 /**
diff --git a/gtk/gtktreestore.c b/gtk/gtktreestore.c
index ed7b7c4449..81ce21a674 100644
--- a/gtk/gtktreestore.c
+++ b/gtk/gtktreestore.c
@@ -25,7 +25,6 @@
 #include "gtkbuildable.h"
 #include "gtkbuilderprivate.h"
 #include "gtkdebug.h"
-#include "gtkintl.h"
 
 
 /**
diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 07e02ee7d4..b55da32e6f 100644
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -41,7 +41,6 @@
 #include "gtkgesturedrag.h"
 #include "gtkgestureclick.h"
 #include "gtkgesturesingle.h"
-#include "gtkintl.h"
 #include "gtklabel.h"
 #include "gtkmain.h"
 #include "gtkmarshalers.h"
diff --git a/gtk/gtktreeviewcolumn.c b/gtk/gtktreeviewcolumn.c
index b3cf60edb0..688f70beeb 100644
--- a/gtk/gtktreeviewcolumn.c
+++ b/gtk/gtktreeviewcolumn.c
@@ -27,7 +27,6 @@
 #include "gtkdragsourceprivate.h"
 #include "gtkframe.h"
 #include "gtkimage.h"
-#include "gtkintl.h"
 #include "gtklabel.h"
 #include "gtkmarshalers.h"
 #include "gtkprivate.h"
diff --git a/gtk/gtkvideo.c b/gtk/gtkvideo.c
index f39738ae32..89562c1ae9 100644
--- a/gtk/gtkvideo.c
+++ b/gtk/gtkvideo.c
@@ -24,13 +24,14 @@
 #include "gtkbinlayout.h"
 #include "gtkeventcontrollermotion.h"
 #include "gtkimage.h"
-#include "gtkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gtkmediacontrols.h"
 #include "gtkmediafile.h"
 #include "gtknative.h"
 #include "gtkpicture.h"
 #include "gtkrevealer.h"
 #include "gtkwidgetprivate.h"
+#include "gtkprivate.h"
 
 /**
  * GtkVideo:
diff --git a/gtk/gtkviewport.c b/gtk/gtkviewport.c
index 39b44370f2..87d3f4d49a 100644
--- a/gtk/gtkviewport.c
+++ b/gtk/gtkviewport.c
@@ -27,7 +27,6 @@
 #include "gtkviewport.h"
 
 #include "gtkadjustmentprivate.h"
-#include "gtkintl.h"
 #include "gtkmarshalers.h"
 #include "gtkprivate.h"
 #include "gtkscrollable.h"
diff --git a/gtk/gtkvolumebutton.c b/gtk/gtkvolumebutton.c
index 018c96cc18..fd82d5a4f0 100644
--- a/gtk/gtkvolumebutton.c
+++ b/gtk/gtkvolumebutton.c
@@ -30,7 +30,7 @@
 #include "gtkvolumebutton.h"
 
 #include "gtkadjustment.h"
-#include "gtkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gtktooltip.h"
 #include "gtkprivate.h"
 
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 2a90295270..4d18cfcdf7 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -46,7 +46,6 @@
 #include "gtkgesturesingle.h"
 #include "gtkgestureswipe.h"
 #include "gtkgestureprivate.h"
-#include "gtkintl.h"
 #include "gtklayoutmanagerprivate.h"
 #include "gtkmain.h"
 #include "gtkmarshalers.h"
diff --git a/gtk/gtkwidgetpaintable.c b/gtk/gtkwidgetpaintable.c
index 5c50abe33e..6e6d1ec03c 100644
--- a/gtk/gtkwidgetpaintable.c
+++ b/gtk/gtkwidgetpaintable.c
@@ -21,7 +21,6 @@
 
 #include "gtkwidgetpaintableprivate.h"
 
-#include "gtkintl.h"
 #include "gtksnapshot.h"
 #include "gtkrendernodepaintableprivate.h"
 #include "gtkwidgetprivate.h"
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index efd1cff6f0..70705cdcc8 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -44,7 +44,7 @@
 #include "gtkgestureclick.h"
 #include "gtkheaderbar.h"
 #include "gtkicontheme.h"
-#include "gtkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gtkmain.h"
 #include "gtkmarshalers.h"
 #include "gtkmessagedialog.h"
diff --git a/gtk/gtkwindowcontrols.c b/gtk/gtkwindowcontrols.c
index a9ffe2aa01..0397cda241 100644
--- a/gtk/gtkwindowcontrols.c
+++ b/gtk/gtkwindowcontrols.c
@@ -27,7 +27,7 @@
 #include "gtkenums.h"
 #include "gtkicontheme.h"
 #include "gtkimage.h"
-#include "gtkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gtkprivate.h"
 #include "gtktypebuiltins.h"
 #include "gtkwindowprivate.h"
diff --git a/gtk/gtkwindowhandle.c b/gtk/gtkwindowhandle.c
index af0f8adb99..859c381b75 100644
--- a/gtk/gtkwindowhandle.c
+++ b/gtk/gtkwindowhandle.c
@@ -28,7 +28,7 @@
 #include "gtkgestureclick.h"
 #include "gtkgesturedrag.h"
 #include "gtkgestureprivate.h"
-#include "gtkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gtkmodelbuttonprivate.h"
 #include "gtknative.h"
 #include "gtkpopovermenuprivate.h"
diff --git a/gtk/inspector/focusoverlay.c b/gtk/inspector/focusoverlay.c
index 1ed260d077..6591cfda49 100644
--- a/gtk/inspector/focusoverlay.c
+++ b/gtk/inspector/focusoverlay.c
@@ -21,7 +21,6 @@
 
 #include "focusoverlay.h"
 
-#include "gtkintl.h"
 #include "gtkwidget.h"
 #include "gtkroot.h"
 #include "gtknative.h"
diff --git a/gtk/inspector/fpsoverlay.c b/gtk/inspector/fpsoverlay.c
index 1329738a0d..f645de2675 100644
--- a/gtk/inspector/fpsoverlay.c
+++ b/gtk/inspector/fpsoverlay.c
@@ -21,7 +21,6 @@
 
 #include "fpsoverlay.h"
 
-#include "gtkintl.h"
 #include "gtkwidget.h"
 #include "gtkwindow.h"
 #include "gtknative.h"
diff --git a/gtk/inspector/highlightoverlay.c b/gtk/inspector/highlightoverlay.c
index 24874da93b..3ceabd1972 100644
--- a/gtk/inspector/highlightoverlay.c
+++ b/gtk/inspector/highlightoverlay.c
@@ -21,7 +21,6 @@
 
 #include "highlightoverlay.h"
 
-#include "gtkintl.h"
 #include "gtkwidget.h"
 
 struct _GtkHighlightOverlay
diff --git a/gtk/inspector/inspectoroverlay.c b/gtk/inspector/inspectoroverlay.c
index 303c61f7d8..b1e2ff434e 100644
--- a/gtk/inspector/inspectoroverlay.c
+++ b/gtk/inspector/inspectoroverlay.c
@@ -21,7 +21,6 @@
 
 #include "inspectoroverlay.h"
 
-#include "gtkintl.h"
 
 G_DEFINE_ABSTRACT_TYPE (GtkInspectorOverlay, gtk_inspector_overlay, G_TYPE_OBJECT)
 
diff --git a/gtk/inspector/updatesoverlay.c b/gtk/inspector/updatesoverlay.c
index 828f7c662c..2af1e674f8 100644
--- a/gtk/inspector/updatesoverlay.c
+++ b/gtk/inspector/updatesoverlay.c
@@ -21,7 +21,6 @@
 
 #include "updatesoverlay.h"
 
-#include "gtkintl.h"
 #include "gtkwidget.h"
 #include "gtknative.h"
 
diff --git a/modules/media/gtkffmediafile.c b/modules/media/gtkffmediafile.c
index b08f0f4291..2839cb8174 100644
--- a/modules/media/gtkffmediafile.c
+++ b/modules/media/gtkffmediafile.c
@@ -21,7 +21,7 @@
 
 #include "gtkffmediafileprivate.h"
 
-#include "gtkintl.h"
+#include <glib/gi18n-lib.h>
 
 #include "gdk/gdkmemorytextureprivate.h"
 
diff --git a/modules/media/gtkgstsink.c b/modules/media/gtkgstsink.c
index 62d93b6b5c..3c41af73f3 100644
--- a/modules/media/gtkgstsink.c
+++ b/modules/media/gtkgstsink.c
@@ -23,7 +23,6 @@
 #include "gtkgstsinkprivate.h"
 
 #include "gtkgstpaintableprivate.h"
-#include "gtkintl.h"
 
 #if GST_GL_HAVE_WINDOW_X11 && (GST_GL_HAVE_PLATFORM_GLX || GST_GL_HAVE_PLATFORM_EGL) && defined (GDK_WINDOWING_X11)
 #define HAVE_GST_X11_SUPPORT
diff --git a/modules/printbackends/gtkprintercups.c b/modules/printbackends/gtkprintercups.c
index 461b923b0f..de941c52e7 100644
--- a/modules/printbackends/gtkprintercups.c
+++ b/modules/printbackends/gtkprintercups.c
@@ -24,7 +24,6 @@
 #include <colord.h>
 #endif
 
-#include "gtkintl.h"
 #include "gtkprintercups.h"
 
 enum {
author	Matthias Clasen <mclasen@redhat.com>	2022-09-24 09:07:56 -0400
committer	Matthias Clasen <mclasen@redhat.com>	2022-09-24 10:03:37 -0400
commit	e499a097590372b3b9f7f9907a9a06b69a2b0daa (patch)
tree	b1138567bd9c4257b69efe7008d6c749388653fc
parent	4aabc456854069b4b2ad5044250f493359956716 (diff)
download	gtk+-e499a097590372b3b9f7f9907a9a06b69a2b0daa.tar.gz