diff --git a/gtk/a11y/gtkatspicontext.c b/gtk/a11y/gtkatspicontext.c
index e754c7c5c5..b6557148b4 100644
--- a/gtk/a11y/gtkatspicontext.c
+++ b/gtk/a11y/gtkatspicontext.c
@@ -23,7 +23,7 @@
 #include "gtkatspicontextprivate.h"
 
 #include "gtkaccessibleprivate.h"
-#include "gtkaccessibletext-private.h"
+#include "gtkaccessibletextprivate.h"
 
 #include "gtkatspiactionprivate.h"
 #include "gtkatspieditabletextprivate.h"
diff --git a/gtk/a11y/gtkatspitext.c b/gtk/a11y/gtkatspitext.c
index ec6e859933..9ef2538d36 100644
--- a/gtk/a11y/gtkatspitext.c
+++ b/gtk/a11y/gtkatspitext.c
@@ -29,6 +29,7 @@
 
 #include "a11y/atspi/atspi-text.h"
 
+#include "gtkaccessibletextprivate.h"
 #include "gtkatcontextprivate.h"
 #include "gtkdebug.h"
 #include "gtkeditable.h"
@@ -41,7 +42,6 @@
 #include "gtkspinbuttonprivate.h"
 #include "gtktextbufferprivate.h"
 #include "gtktextviewprivate.h"
-#include "gtkaccessibletext-private.h"
 
 #include <gio/gio.h>
 
diff --git a/gtk/gtkaccessibletext.c b/gtk/gtkaccessibletext.c
index 163d6f908f..7ceef4fd1f 100644
--- a/gtk/gtkaccessibletext.c
+++ b/gtk/gtkaccessibletext.c
@@ -6,7 +6,7 @@
 
 #include "config.h"
 
-#include "gtkaccessibletext-private.h"
+#include "gtkaccessibletextprivate.h"
 
 #include "gtkatcontextprivate.h"
 
diff --git a/gtk/gtkaccessibletext-private.h b/gtk/gtkaccessibletextprivate.h
similarity index 95%
rename from gtk/gtkaccessibletext-private.h
rename to gtk/gtkaccessibletextprivate.h
index 0126d27a99..8617055dd1 100644
--- a/gtk/gtkaccessibletext-private.h
+++ b/gtk/gtkaccessibletextprivate.h
@@ -1,4 +1,4 @@
-/* gtkaccessibletext-private.h: Private definitions for GtkAccessibleText
+/* gtkaccessibletextprivate.h: Private definitions for GtkAccessibleText
  *
  * SPDX-FileCopyrightText: 2023 Emmanuele Bassi
  * SPDX-License-Identifier: LGPL-2.1-or-later
diff --git a/gtk/gtkinscription.c b/gtk/gtkinscription.c
index a5e5ecfbfc..bbd8790150 100644
--- a/gtk/gtkinscription.c
+++ b/gtk/gtkinscription.c
@@ -21,7 +21,7 @@
 
 #include "gtkinscriptionprivate.h"
 
-#include "gtkaccessibletext-private.h"
+#include "gtkaccessibletextprivate.h"
 #include "gtkcssnodeprivate.h"
 #include "gtkcssstylechangeprivate.h"
 #include "gtkpangoprivate.h"
diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
index fc00253a69..3f457369ba 100644
--- a/gtk/gtklabel.c
+++ b/gtk/gtklabel.c
@@ -26,37 +26,36 @@
 
 #include "gtklabelprivate.h"
 
+#include "gtkaccessibletextprivate.h"
 #include "gtkbuildable.h"
+#include "gtkcsscolorvalueprivate.h"
+#include "gtkdragsourceprivate.h"
+#include "gtkdragicon.h"
 #include "gtkeventcontrollermotion.h"
 #include "gtkeventcontrollerfocus.h"
 #include "gtkfilelauncher.h"
 #include "gtkgesturedrag.h"
 #include "gtkgestureclick.h"
 #include "gtkgesturesingle.h"
+#include "gtkjoinedmenuprivate.h"
 #include "gtkmarshalers.h"
+#include "gtknative.h"
 #include "gtknotebook.h"
 #include "gtkpangoprivate.h"
+#include "gtkpopovermenu.h"
 #include "gtkprivate.h"
+#include "gtkrenderbackgroundprivate.h"
+#include "gtkrenderborderprivate.h"
+#include "gtkrenderlayoutprivate.h"
 #include "gtkshortcut.h"
 #include "gtkshortcutcontroller.h"
 #include "gtkshortcuttrigger.h"
 #include "gtksnapshot.h"
-#include "gtkrenderbackgroundprivate.h"
-#include "gtkrenderborderprivate.h"
-#include "gtkrenderlayoutprivate.h"
 #include "gtktextutilprivate.h"
 #include "gtktooltip.h"
 #include "gtktypebuiltins.h"
 #include "gtkurilauncher.h"
 #include "gtkwidgetprivate.h"
-#include "gtkpopovermenu.h"
-#include "gtknative.h"
-#include "gtkdragsourceprivate.h"
-#include "gtkdragicon.h"
-#include "gtkcsscolorvalueprivate.h"
-#include "gtkjoinedmenuprivate.h"
-#include "gtkaccessibletext-private.h"
-#include "gtkpangoprivate.h"
 
 #include <math.h>
 #include <stdlib.h>
diff --git a/gtk/gtktestatcontext.c b/gtk/gtktestatcontext.c
index 662310fa3c..4e448ba374 100644
--- a/gtk/gtktestatcontext.c
+++ b/gtk/gtktestatcontext.c
@@ -24,11 +24,11 @@
 
 #include "gtkatcontextprivate.h"
 #include "gtkaccessibleprivate.h"
+#include "gtkaccessibletextprivate.h"
 #include "gtkdebug.h"
 #include "gtkenums.h"
 #include "gtkprivate.h"
 #include "gtktypebuiltins.h"
-#include "gtkaccessibletext-private.h"
 
 struct _GtkTestATContext
 {
diff --git a/gtk/gtktext.c b/gtk/gtktext.c
index 6da0ecc9d7..2dbdf9ecc1 100644
--- a/gtk/gtktext.c
+++ b/gtk/gtktext.c
@@ -23,8 +23,9 @@
 
 #include "gtktextprivate.h"
 
-#include "gtkaccessibletext-private.h"
+#include "gtkaccessibletextprivate.h"
 #include "gtkactionable.h"
+#include "gtkactionmuxerprivate.h"
 #include "gtkadjustment.h"
 #include "gtkbox.h"
 #include "gtkbutton.h"
@@ -46,19 +47,20 @@
 #include "gtkimcontextprivate.h"
 #include "gtkimcontextsimple.h"
 #include "gtkimmulticontext.h"
-#include <glib/gi18n-lib.h>
+#include "gtkjoinedmenuprivate.h"
 #include "gtklabel.h"
 #include "gtkmagnifierprivate.h"
 #include "gtkmain.h"
 #include "gtkmarshalers.h"
+#include "gtknative.h"
 #include "gtkpangoprivate.h"
 #include "gtkpopovermenu.h"
 #include "gtkprivate.h"
-#include "gtksettings.h"
-#include "gtksnapshot.h"
 #include "gtkrenderbackgroundprivate.h"
 #include "gtkrenderborderprivate.h"
 #include "gtkrenderlayoutprivate.h"
+#include "gtksettings.h"
+#include "gtksnapshot.h"
 #include "gtktexthandleprivate.h"
 #include "gtktexthistoryprivate.h"
 #include "gtktextutilprivate.h"
@@ -66,15 +68,13 @@
 #include "gtktypebuiltins.h"
 #include "gtkwidgetprivate.h"
 #include "gtkwindow.h"
-#include "gtknative.h"
-#include "gtkactionmuxerprivate.h"
-#include "gtkjoinedmenuprivate.h"
+
 #include "deprecated/gtkrender.h"
-#include "gtkaccessibletext-private.h"
 #include "a11y/gtkatspipangoprivate.h"
 
-#include <cairo-gobject.h>
 #include <string.h>
+#include <cairo-gobject.h>
+#include <glib/gi18n-lib.h>
 
 /**
  * GtkText:
diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c
index 7473117635..b64de40895 100644
--- a/gtk/gtktextview.c
+++ b/gtk/gtktextview.c
@@ -29,41 +29,40 @@
 
 #include <string.h>
 
+#include <glib/gi18n-lib.h>
+
+#include "gtkaccessibletextprivate.h"
 #include "gtkadjustmentprivate.h"
 #include "gtkcsscolorvalueprivate.h"
+#include "gtkcssenumvalueprivate.h"
+#include "gtkcsslineheightvalueprivate.h"
 #include "gtkdebug.h"
 #include "gtkdragsourceprivate.h"
 #include "gtkdropcontrollermotion.h"
-#include <glib/gi18n-lib.h>
-#include "gtkmain.h"
-#include "gtkmarshalers.h"
-#include "gtkrenderbackgroundprivate.h"
-#include "gtksettings.h"
-#include "gtktextiterprivate.h"
+#include "gtkemojichooser.h"
 #include "gtkimcontextprivate.h"
 #include "gtkimmulticontext.h"
-#include "gtkprivate.h"
-#include "gtktextutilprivate.h"
-#include "gtktextbufferprivate.h"
-#include "gtkwidgetprivate.h"
-#include "gtkwindow.h"
-#include "gtkscrollable.h"
-#include "gtktypebuiltins.h"
-#include "gtktextviewchildprivate.h"
-#include "gtktexthandleprivate.h"
-#include "gtkpopover.h"
-#include "gtkmagnifierprivate.h"
-#include "gtkemojichooser.h"
-#include "gtkpangoprivate.h"
-#include "gtknative.h"
-#include "gtkwidgetprivate.h"
 #include "gtkjoinedmenuprivate.h"
-#include "gtkcsslineheightvalueprivate.h"
-#include "gtkcssenumvalueprivate.h"
-#include "gtksnapshot.h"
+#include "gtkmagnifierprivate.h"
+#include "gtkmain.h"
+#include "gtkmarshalers.h"
+#include "gtknative.h"
+#include "gtkpangoprivate.h"
 #include "gtkrenderbackgroundprivate.h"
 #include "gtkrenderborderprivate.h"
-#include "gtkaccessibletext-private.h"
+#include "gtkscrollable.h"
+#include "gtksettings.h"
+#include "gtksnapshot.h"
+#include "gtktextiterprivate.h"
+#include "gtktexthandleprivate.h"
+#include "gtktextviewchildprivate.h"
+#include "gtkpopover.h"
+#include "gtkprivate.h"
+#include "gtktextbufferprivate.h"
+#include "gtktextutilprivate.h"
+#include "gtktypebuiltins.h"
+#include "gtkwidgetprivate.h"
+#include "gtkwindow.h"
 
 /**
  * GtkTextView:
diff --git a/testsuite/a11y/inscription.c b/testsuite/a11y/inscription.c
index 96844958bf..3cf48d374c 100644
--- a/testsuite/a11y/inscription.c
+++ b/testsuite/a11y/inscription.c
@@ -1,6 +1,6 @@
 #include <gtk/gtk.h>
 
-#include "gtk/gtkaccessibletext-private.h"
+#include "gtk/gtkaccessibletextprivate.h"
 
 static void
 inscription_text_interface (void)
diff --git a/testsuite/a11y/label.c b/testsuite/a11y/label.c
index 5f296580ee..9a54adbc72 100644
--- a/testsuite/a11y/label.c
+++ b/testsuite/a11y/label.c
@@ -1,6 +1,6 @@
 #include <gtk/gtk.h>
 
-#include "gtk/gtkaccessibletext-private.h"
+#include "gtk/gtkaccessibletextprivate.h"
 
 static void
 label_role (void)
diff --git a/testsuite/a11y/text.c b/testsuite/a11y/text.c
index 8d30acf840..454e18c469 100644
--- a/testsuite/a11y/text.c
+++ b/testsuite/a11y/text.c
@@ -1,7 +1,7 @@
 #include <gtk/gtk.h>
 
 #include "gtk/gtkatcontextprivate.h"
-#include "gtk/gtkaccessibletext-private.h"
+#include "gtk/gtkaccessibletextprivate.h"
 
 typedef struct
 {
diff --git a/testsuite/a11y/textview.c b/testsuite/a11y/textview.c
index 615dc41693..5eb0d40659 100644
--- a/testsuite/a11y/textview.c
+++ b/testsuite/a11y/textview.c
@@ -1,7 +1,7 @@
 #include <gtk/gtk.h>
 
 #include "gtk/gtkatcontextprivate.h"
-#include "gtk/gtkaccessibletext-private.h"
+#include "gtk/gtkaccessibletextprivate.h"
 
 static void
 textview_role (void)