Merge branch 'matthiasc/for-main' into 'main'

gdk: Cosmetics See merge request GNOME/gtk!5087
2022-10-06 03:48:36 +00:00 · 2022-10-06 03:48:36 +00:00 · 2dc33a9de1
commit 2dc33a9de1
parent abac891bd2 7c5e1c6195
54 changed files with 84 additions and 80 deletions
--- a/gdk/gdkconfig.h.meson
+++ b/gdk/gdkconfig.h.meson
@ -16,6 +16,8 @@ G_BEGIN_DECLS
 #mesondefine GDK_WINDOWING_WAYLAND
 #mesondefine GDK_WINDOWING_WIN32

+#mesondefine GDK_RENDERING_CAIRO
+#mesondefine GDK_RENDERING_GL
 #mesondefine GDK_RENDERING_VULKAN

 G_END_DECLS
--- a/gdk/meson.build
+++ b/gdk/meson.build
@ -161,6 +161,8 @@ gdkconfig_cdata.set('GDK_WINDOWING_WAYLAND', wayland_enabled)
 gdkconfig_cdata.set('GDK_WINDOWING_WIN32', win32_enabled)
 gdkconfig_cdata.set('GDK_WINDOWING_BROADWAY', broadway_enabled)
 gdkconfig_cdata.set('GDK_WINDOWING_MACOS', macos_enabled)
+gdkconfig_cdata.set('GDK_RENDERING_CAIRO', true)
+gdkconfig_cdata.set('GDK_RENDERING_GL', true)
 gdkconfig_cdata.set('GDK_RENDERING_VULKAN', have_vulkan)

 gdkconfig = configure_file(
--- a/gtk/a11y/gtkatspipango.c
+++ b/gtk/a11y/gtkatspipango.c
@ -18,7 +18,7 @@

 #include "config.h"
 #include "gtkatspipangoprivate.h"
-#include "gtkpango.h"
+#include "gtkpangoprivate.h"

 void
 gtk_pango_get_font_attributes (PangoFontDescription *font,
--- a/gtk/a11y/gtkatspitext.c
+++ b/gtk/a11y/gtkatspitext.c
@ -35,7 +35,7 @@
 #include "gtkentryprivate.h"
 #include "gtkinscriptionprivate.h"
 #include "gtklabelprivate.h"
-#include "gtkpango.h"
+#include "gtkpangoprivate.h"
 #include "gtkpasswordentryprivate.h"
 #include "gtksearchentryprivate.h"
 #include "gtkspinbuttonprivate.h"
--- a/gtk/a11y/gtkatspitextbuffer.c
+++ b/gtk/a11y/gtkatspitextbuffer.c
@ -21,7 +21,7 @@
 #include "gtkatspipangoprivate.h"
 #include "gtktextbufferprivate.h"
 #include "gtktextviewprivate.h"
-#include "gtkpango.h"
+#include "gtkpangoprivate.h"

 void
 gtk_text_view_add_default_attributes (GtkTextView     *view,
--- a/gtk/gskpango.c
+++ b/gtk/gskpango.c
@ -21,7 +21,7 @@

 #include "gsk/gsk.h"
 #include "gsk/gskrendernodeprivate.h"
-#include "gskpango.h"
+#include "gskpangoprivate.h"
 #include "gtksnapshotprivate.h"
 #include "gtktextlayoutprivate.h"
 #include "gtktextviewprivate.h"
--- a/gtk/gskpangoprivate.h
+++ b/gtk/gskpangoprivate.h
@ -16,8 +16,8 @@
 * License along with this library. If not, see <http://www.gnu.org/licenses/>.
 */

-#ifndef __GSK_PANGO_H__
-#define __GSK_PANGO_H__
+#ifndef __GSK_PANGO_PRIVATE_H__
+#define __GSK_PANGO_PRIVATE_H__

 #include <pango/pango.h>
 #include "gtk/gtksnapshot.h"
@ -85,4 +85,4 @@ void              gsk_pango_renderer_release   (GskPangoRenderer      *crenderer

 G_END_DECLS

-#endif /* __GSK_PANGO_H__ */
+#endif /* __GSK_PANGO_PRIVATE_H__ */
--- a/gtk/gtkcssshadowvalue.c
+++ b/gtk/gtkcssshadowvalue.c
@ -25,7 +25,7 @@
 #include "gtkcssnumbervalueprivate.h"
 #include "gtkcsscolorvalueprivate.h"
 #include "gtksnapshotprivate.h"
-#include "gtkpango.h"
+#include "gtkpangoprivate.h"

 #include "gsk/gskcairoblurprivate.h"
 #include "gsk/gskroundedrectprivate.h"
--- a/gtk/gtkdragicon.c
+++ b/gtk/gtkdragicon.c
@ -34,7 +34,7 @@
 #include "gtkimage.h"
 #include "gtklabel.h"
 #include "gtkrendernodepaintableprivate.h"
-#include "gtktextutil.h"
+#include "gtktextutilprivate.h"


 /**
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@ -48,7 +48,7 @@
 #include "gtklabel.h"
 #include "gtkmain.h"
 #include "gtkmarshalers.h"
-#include "gtkpango.h"
+#include "gtkpangoprivate.h"
 #include "gtkpopover.h"
 #include "gtkprivate.h"
 #include "gtkprogressbar.h"
@ -56,7 +56,7 @@
 #include "gtksnapshot.h"
 #include "gtktextprivate.h"
 #include "gtktexthandleprivate.h"
-#include "gtktextutil.h"
+#include "gtktextutilprivate.h"
 #include "gtktooltip.h"
 #include "gtktypebuiltins.h"
 #include "gtkwidgetprivate.h"
--- a/gtk/gtkfilechooserwidget.c
+++ b/gtk/gtkfilechooserwidget.c
@ -45,7 +45,7 @@
 #include "gtkmessagedialog.h"
 #include "gtkmountoperation.h"
 #include "gtkpaned.h"
-#include "gtkpathbar.h"
+#include "gtkpathbarprivate.h"
 #include "gtkplacessidebarprivate.h"
 #include "gtkplacesviewprivate.h"
 #include "gtkprivate.h"
--- a/gtk/gtkfilesystemmodel.c
+++ b/gtk/gtkfilesystemmodel.c
@ -25,7 +25,7 @@

 #include "gtkfilechooserutils.h"
 #include "gtkmarshalers.h"
-#include "gtktreedatalist.h"
+#include "gtktreedatalistprivate.h"
 #include "gtktreednd.h"
 #include "gtktreemodel.h"
 #include "gtkfilter.h"
--- a/gtk/gtkinscription.c
+++ b/gtk/gtkinscription.c
@ -23,7 +23,7 @@

 #include "gtkcssnodeprivate.h"
 #include "gtkcssstylechangeprivate.h"
-#include "gtkpango.h"
+#include "gtkpangoprivate.h"
 #include "gtksnapshot.h"
 #include "gtktypebuiltins.h"
 #include "gtkwidgetprivate.h"
--- a/gtk/gtklabel.c
+++ b/gtk/gtklabel.c
@ -35,7 +35,7 @@
 #include <glib/gi18n-lib.h>
 #include "gtkmarshalers.h"
 #include "gtknotebook.h"
-#include "gtkpango.h"
+#include "gtkpangoprivate.h"
 #include "gtkprivate.h"
 #include "gtkshortcut.h"
 #include "gtkshortcutcontroller.h"
@ -43,7 +43,7 @@
 #include "gtkshow.h"
 #include "gtksnapshot.h"
 #include "gtkstylecontextprivate.h"
-#include "gtktextutil.h"
+#include "gtktextutilprivate.h"
 #include "gtktooltip.h"
 #include "gtktypebuiltins.h"
 #include "gtkwidgetprivate.h"
--- a/gtk/gtkliststore.c
+++ b/gtk/gtkliststore.c
@ -22,7 +22,7 @@
 #include <gobject/gvaluecollector.h>
 #include "gtktreemodel.h"
 #include "gtkliststore.h"
-#include "gtktreedatalist.h"
+#include "gtktreedatalistprivate.h"
 #include "gtktreednd.h"
 #include "gtkbuildable.h"
 #include "gtkbuilderprivate.h"
--- a/gtk/gtkpango.c
+++ b/gtk/gtkpango.c
@ -23,7 +23,7 @@
 */

 #include "config.h"
-#include "gtkpango.h"
+#include "gtkpangoprivate.h"
 #include <pango/pangocairo.h>
 #include "gtkbuilderprivate.h"

--- a/gtk/gtkpangoprivate.h
+++ b/gtk/gtkpangoprivate.h
@ -22,8 +22,8 @@
 * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
 */

-#ifndef __GTK_PANGO_H__
-#define __GTK_PANGO_H__
+#ifndef __GTK_PANGO_PRIVATE_H__
+#define __GTK_PANGO_PRIVATE_H__

 #include <pango/pangocairo.h>
 #include  "gtkbuildable.h"
@ -63,4 +63,4 @@ const char *pango_align_to_string (PangoAlignment align);

 G_END_DECLS

-#endif /* __GTK_PANGO_H__ */
+#endif /* __GTK_PANGO_PRIVATE_H__ */
--- a/gtk/gtkpathbar.c
+++ b/gtk/gtkpathbar.c
@ -18,7 +18,7 @@

 #include "config.h"

-#include "gtkpathbar.h"
+#include "gtkpathbarprivate.h"

 #include <string.h>

--- a/gtk/gtkpathbarprivate.h
+++ b/gtk/gtkpathbarprivate.h
@ -1,4 +1,4 @@
-/* gtkpathbar.h
+/* gtkpathbarprivate.h
 * Copyright (C) 2004  Red Hat, Inc.,  Jonathan Blandford <jrb@gnome.org>
 *
 * This library is free software; you can redistribute it and/or
@ -15,8 +15,8 @@
 * License along with this library. If not, see <http://www.gnu.org/licenses/>.
 */

-#ifndef __GTK_PATH_BAR_H__
-#define __GTK_PATH_BAR_H__
+#ifndef __GTK_PATH_BAR_PRIVATE_H__
+#define __GTK_PATH_BAR_PRIVATE_H__

 #include "gtkwidget.h"

@ -38,4 +38,4 @@ void     _gtk_path_bar_down            (GtkPathBar *path_bar);

 G_END_DECLS

-#endif /* __GTK_PATH_BAR_H__ */
+#endif /* __GTK_PATH_BAR_PRIVATE_H__ */
--- a/gtk/gtkplacessidebar.c
+++ b/gtk/gtkplacessidebar.c
@ -41,7 +41,7 @@
 #include "gtkmountoperation.h"
 #include "gtkscrolledwindow.h"
 #include "gtksettings.h"
-#include "gtktrashmonitor.h"
+#include "gtktrashmonitorprivate.h"
 #include "gtktypebuiltins.h"
 #include "gtkprivatetypebuiltins.h"
 #include "gtkpopovermenu.h"
--- a/gtk/gtksnapshot.c
+++ b/gtk/gtksnapshot.c
@ -35,7 +35,7 @@
 #include "gsk/gskrendernodeprivate.h"
 #include "gsk/gskroundedrectprivate.h"

-#include "gtk/gskpango.h"
+#include "gtk/gskpangoprivate.h"

 #define GDK_ARRAY_NAME gtk_snapshot_nodes
 #define GDK_ARRAY_TYPE_NAME GtkSnapshotNodes
--- a/gtk/gtktext.c
+++ b/gtk/gtktext.c
@ -49,7 +49,7 @@
 #include "gtkmagnifierprivate.h"
 #include "gtkmain.h"
 #include "gtkmarshalers.h"
-#include "gtkpango.h"
+#include "gtkpangoprivate.h"
 #include "gtkpopovermenu.h"
 #include "gtkprivate.h"
 #include "gtksettings.h"
@ -57,7 +57,7 @@
 #include "gtkstylecontextprivate.h"
 #include "gtktexthandleprivate.h"
 #include "gtktexthistoryprivate.h"
-#include "gtktextutil.h"
+#include "gtktextutilprivate.h"
 #include "gtktooltip.h"
 #include "gtktypebuiltins.h"
 #include "gtkwidgetprivate.h"
--- a/gtk/gtktextattributes.c
+++ b/gtk/gtktextattributes.c
@ -49,7 +49,7 @@

 #include "config.h"

-#include "gtktextattributes.h"
+#include "gtktextattributesprivate.h"
 #include "gtktexttagprivate.h"

 /**
--- a/gtk/gtktextattributesprivate.h
+++ b/gtk/gtktextattributesprivate.h
@ -47,8 +47,8 @@
 *
 */

-#ifndef __GTK_TEXT_ATTRIBUTES_H__
-#define __GTK_TEXT_ATTRIBUTES_H__
+#ifndef __GTK_TEXT_ATTRIBUTES_PRIVATE_H__
+#define __GTK_TEXT_ATTRIBUTES_PRIVATE_H__


 #include <gdk/gdk.h>
--- a/gtk/gtktextbtree.c
+++ b/gtk/gtktextbtree.c
@ -53,7 +53,7 @@
 */

 #include "config.h"
-#include "gtktextbtree.h"
+#include "gtktextbtreeprivate.h"
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
@ -65,8 +65,8 @@
 #include "gtktextiterprivate.h"
 #include "gtkdebug.h"
 #include "gtktextmarkprivate.h"
-#include "gtktextsegment.h"
-#include "gtkpango.h"
+#include "gtktextsegmentprivate.h"
+#include "gtkpangoprivate.h"
 #include "gdkprivate.h"

 /*
--- a/gtk/gtktextbtreeprivate.h
+++ b/gtk/gtktextbtreeprivate.h
@ -22,8 +22,8 @@
 * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
 */

-#ifndef __GTK_TEXT_BTREE_H__
-#define __GTK_TEXT_BTREE_H__
+#ifndef __GTK_TEXT_BTREE_PRIVATE_H__
+#define __GTK_TEXT_BTREE_PRIVATE_H__

 #if 0
 #define DEBUG_VALIDATION_AND_SCROLLING
@ -39,7 +39,7 @@
 #include <gtk/gtktexttag.h>
 #include <gtk/gtktextmark.h>
 #include <gtk/gtktextchild.h>
-#include <gtk/gtktextsegment.h>
+#include <gtk/gtktextsegmentprivate.h>
 #include <gtk/gtktextiter.h>

 G_BEGIN_DECLS
--- a/gtk/gtktextbuffer.c
+++ b/gtk/gtktextbuffer.c
@ -31,11 +31,11 @@
 #include "gtktextbuffer.h"
 #include "gtktexthistoryprivate.h"
 #include "gtktextbufferprivate.h"
-#include "gtktextbtree.h"
+#include "gtktextbtreeprivate.h"
 #include "gtktextiterprivate.h"
 #include "gtktexttagprivate.h"
 #include "gtktexttagtableprivate.h"
-#include "gtkpango.h"
+#include "gtkpangoprivate.h"
 #include "gtkprivate.h"

 #define DEFAULT_MAX_UNDO 200
--- a/gtk/gtktextbufferprivate.h
+++ b/gtk/gtktextbufferprivate.h
@ -19,7 +19,7 @@
 #define __GTK_TEXT_BUFFER_PRIVATE_H__

 #include <gtk/gtktextbuffer.h>
-#include "gtktexttypes.h"
+#include "gtktexttypesprivate.h"

 G_BEGIN_DECLS

--- a/gtk/gtktextchild.c
+++ b/gtk/gtktextchild.c
@ -49,7 +49,7 @@

 #include "config.h"
 #include "gtktextchild.h"
-#include "gtktextbtree.h"
+#include "gtktextbtreeprivate.h"
 #include "gtktextlayoutprivate.h"
 #include "gtkprivate.h"

--- a/gtk/gtktextchildprivate.h
+++ b/gtk/gtktextchildprivate.h
@ -50,7 +50,7 @@
 #ifndef __GTK_TEXT_CHILD_PRIVATE_H__
 #define __GTK_TEXT_CHILD_PRIVATE_H__

-#include <gtk/gtktexttypes.h>
+#include <gtk/gtktexttypesprivate.h>

 G_BEGIN_DECLS

--- a/gtk/gtktextiter.c
+++ b/gtk/gtktextiter.c
@ -24,7 +24,7 @@

 #include "config.h"
 #include "gtktextiter.h"
-#include "gtktextbtree.h"
+#include "gtktextbtreeprivate.h"
 #include "gtktextbufferprivate.h"
 #include "gtktextiterprivate.h"
 #include "gtkdebug.h"
--- a/gtk/gtktextiterprivate.h
+++ b/gtk/gtktextiterprivate.h
@ -30,8 +30,8 @@
 G_BEGIN_DECLS

 #include <gtk/gtktextiter.h>
-#include <gtk/gtktextbtree.h>
-#include <gtk/gtktextattributes.h>
+#include <gtk/gtktextbtreeprivate.h>
+#include <gtk/gtktextattributesprivate.h>

 GtkTextLineSegment *_gtk_text_iter_get_indexable_segment      (const GtkTextIter *iter);
 GtkTextLineSegment *_gtk_text_iter_get_any_segment            (const GtkTextIter *iter);
--- a/gtk/gtktextlayout.c
+++ b/gtk/gtktextlayout.c
@ -82,12 +82,12 @@
 #include "gtkcsscolorvalueprivate.h"
 #include "gtkmarshalers.h"
 #include "gtkstylecontextprivate.h"
-#include "gtktextbtree.h"
+#include "gtktextbtreeprivate.h"
 #include "gtktextbufferprivate.h"
 #include "gtktextiterprivate.h"
 #include "gtktextlinedisplaycacheprivate.h"
-#include "gtktextutil.h"
-#include "gskpango.h"
+#include "gtktextutilprivate.h"
+#include "gskpangoprivate.h"
 #include "gtksnapshotprivate.h"
 #include "gtkwidgetprivate.h"
 #include "gtktextviewprivate.h"
--- a/gtk/gtktextlayoutprivate.h
+++ b/gtk/gtktextlayoutprivate.h
@ -79,7 +79,7 @@
 #define __GTK_TEXT_LAYOUT_PRIVATE_H__

 #include <gtk/gtk.h>
-#include <gtk/gtktextattributes.h>
+#include <gtk/gtktextattributesprivate.h>

 G_BEGIN_DECLS

--- a/gtk/gtktextlinedisplaycache.c
+++ b/gtk/gtktextlinedisplaycache.c
@ -19,7 +19,7 @@

 #include "config.h"

-#include "gtktextbtree.h"
+#include "gtktextbtreeprivate.h"
 #include "gtktextbufferprivate.h"
 #include "gtktextiterprivate.h"
 #include "gtktextlinedisplaycacheprivate.h"
--- a/gtk/gtktextmark.c
+++ b/gtk/gtktextmark.c
@ -48,7 +48,7 @@
 */

 #include "config.h"
-#include "gtktextbtree.h"
+#include "gtktextbtreeprivate.h"
 #include "gtkprivate.h"


--- a/gtk/gtktextmarkprivate.h
+++ b/gtk/gtktextmarkprivate.h
@ -25,7 +25,7 @@
 #ifndef __GTK_TEXT_MARK_PRIVATE_H__
 #define __GTK_TEXT_MARK_PRIVATE_H__

-#include <gtk/gtktexttypes.h>
+#include <gtk/gtktexttypesprivate.h>
 #include "gtktextlayoutprivate.h"

 G_BEGIN_DECLS
--- a/gtk/gtktextsegment.c
+++ b/gtk/gtktextsegment.c
@ -51,7 +51,7 @@
 */

 #include "config.h"
-#include "gtktextbtree.h"
+#include "gtktextbtreeprivate.h"
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
--- a/gtk/gtktextsegmentprivate.h
+++ b/gtk/gtktextsegmentprivate.h
@ -22,8 +22,8 @@
 * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
 */

-#ifndef __GTK_TEXT_SEGMENT_H__
-#define __GTK_TEXT_SEGMENT_H__
+#ifndef __GTK_TEXT_SEGMENT_PRIVATE_H__
+#define __GTK_TEXT_SEGMENT_PRIVATE_H__

 #include <gtk/gtktexttag.h>
 #include <gtk/gtktextiter.h>
--- a/gtk/gtktexttag.c
+++ b/gtk/gtktexttag.c
@ -76,7 +76,7 @@
 #include <string.h>

 #include "gtktexttag.h"
-#include "gtktexttypes.h"
+#include "gtktexttypesprivate.h"
 #include "gtktexttagtable.h"
 #include "gtktexttagtableprivate.h"
 #include "gtkmarshalers.h"
--- a/gtk/gtktexttagprivate.h
+++ b/gtk/gtktexttagprivate.h
@ -26,7 +26,7 @@
 #define __GTK_TEXT_TAG_PRIVATE_H__

 #include <gtk/gtk.h>
-#include <gtk/gtktextattributes.h>
+#include <gtk/gtktextattributesprivate.h>

 typedef struct _GtkTextBTreeNode GtkTextBTreeNode;

--- a/gtk/gtktexttypes.c
+++ b/gtk/gtktexttypes.c
@ -23,7 +23,7 @@
 */

 #include "config.h"
-#include "gtktexttypes.h"
+#include "gtktexttypesprivate.h"

 /* These are used to represent embedded non-character objects
 * if you return a string representation of a text buffer
--- a/gtk/gtktexttypesprivate.h
+++ b/gtk/gtktexttypesprivate.h
@ -22,8 +22,8 @@
 * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
 */

-#ifndef __GTK_TEXT_TYPES_H__
-#define __GTK_TEXT_TYPES_H__
+#ifndef __GTK_TEXT_TYPES_PRIVATE_H__
+#define __GTK_TEXT_TYPES_PRIVATE_H__

 #include <gtk/gtk.h>
 #include <gtk/gtktexttagprivate.h>
--- a/gtk/gtktextutil.c
+++ b/gtk/gtktextutil.c
@ -25,7 +25,7 @@
 #include "config.h"

 #include "gtktextview.h"
-#include "gtktextutil.h"
+#include "gtktextutilprivate.h"

 #include "gtkcsscolorvalueprivate.h"
 #include "gtkstylecontextprivate.h"
--- a/gtk/gtktextutilprivate.h
+++ b/gtk/gtktextutilprivate.h
@ -22,8 +22,8 @@
 * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
 */

-#ifndef __GTK_TEXT_UTIL_H__
-#define __GTK_TEXT_UTIL_H__
+#ifndef __GTK_TEXT_UTIL_PRIVATE_H__
+#define __GTK_TEXT_UTIL_PRIVATE_H__

 G_BEGIN_DECLS

@ -48,4 +48,4 @@ gboolean _gtk_text_util_get_block_cursor_location (PangoLayout    *layout,

 G_END_DECLS

-#endif /* __GTK_TEXT_UTIL_H__ */
+#endif /* __GTK_TEXT_UTIL_PRIVATE_H__ */
--- a/gtk/gtktextview.c
+++ b/gtk/gtktextview.c
@ -42,7 +42,7 @@
 #include "gtktextiterprivate.h"
 #include "gtkimmulticontext.h"
 #include "gtkprivate.h"
-#include "gtktextutil.h"
+#include "gtktextutilprivate.h"
 #include "gtkwidgetprivate.h"
 #include "gtkwindow.h"
 #include "gtkscrollable.h"
@ -53,7 +53,7 @@
 #include "gtkpopover.h"
 #include "gtkmagnifierprivate.h"
 #include "gtkemojichooser.h"
-#include "gtkpango.h"
+#include "gtkpangoprivate.h"
 #include "gtknative.h"
 #include "gtkwidgetprivate.h"
 #include "gtkjoinedmenuprivate.h"
--- a/gtk/gtktextviewprivate.h
+++ b/gtk/gtktextviewprivate.h
@ -20,7 +20,7 @@
 #define __GTK_TEXT_VIEW_PRIVATE_H__

 #include "gtktextview.h"
-#include "gtktextattributes.h"
+#include "gtktextattributesprivate.h"
 #include "gtkcssnodeprivate.h"

 G_BEGIN_DECLS
--- a/gtk/gtktrashmonitor.c
+++ b/gtk/gtktrashmonitor.c
@ -22,7 +22,7 @@

 #include "gtkprivate.h"
 #include "gtkmarshalers.h"
-#include "gtktrashmonitor.h"
+#include "gtktrashmonitorprivate.h"

 #define UPDATE_RATE_SECONDS 1

--- a/gtk/gtktrashmonitorprivate.h
+++ b/gtk/gtktrashmonitorprivate.h
@ -18,8 +18,8 @@
 * Authors: Federico Mena Quintero <federico@gnome.org>
 */

-#ifndef __GTK_TRASH_MONITOR_H__
-#define __GTK_TRASH_MONITOR_H__
+#ifndef __GTK_TRASH_MONITOR_PRIVATE_H__
+#define __GTK_TRASH_MONITOR_PRIVATE_H__

 #include <gio/gio.h>

@ -44,4 +44,4 @@ gboolean _gtk_trash_monitor_get_has_trash (GtkTrashMonitor *monitor);

 G_END_DECLS

-#endif /* __GTK_TRASH_MONITOR_H__ */
+#endif /* __GTK_TRASH_MONITOR_PRIVATE_H__ */
--- a/gtk/gtktreedatalist.c
+++ b/gtk/gtktreedatalist.c
@ -19,7 +19,7 @@
 */

 #include "config.h"
-#include "gtktreedatalist.h"
+#include "gtktreedatalistprivate.h"
 #include <string.h>

 /* node allocation
--- a/gtk/gtktreedatalistprivate.h
+++ b/gtk/gtktreedatalistprivate.h
@ -15,8 +15,8 @@
 * License along with this library. If not, see <http://www.gnu.org/licenses/>.
 */

-#ifndef __GTK_TREE_DATA_LIST_H__
-#define __GTK_TREE_DATA_LIST_H__
+#ifndef __GTK_TREE_DATA_LIST_PRIVATE_H__
+#define __GTK_TREE_DATA_LIST_PRIVATE_H__

 #include <gtk/gtktreemodel.h>
 #include <gtk/gtktreesortable.h>
@ -78,4 +78,4 @@ GList                 *_gtk_tree_data_list_set_header  (GList                  *
 							gpointer                data,
 							GDestroyNotify          destroy);

-#endif /* __GTK_TREE_DATA_LIST_H__ */
+#endif /* __GTK_TREE_DATA_LIST_PRIVATE_H__ */
--- a/gtk/gtktreemodelsort.c
+++ b/gtk/gtktreemodelsort.c
@ -22,7 +22,7 @@
 #include "gtktreemodelsort.h"
 #include "gtktreesortable.h"
 #include "gtktreestore.h"
-#include "gtktreedatalist.h"
+#include "gtktreedatalistprivate.h"
 #include "gtkprivate.h"
 #include "gtktreednd.h"

--- a/gtk/gtktreestore.c
+++ b/gtk/gtktreestore.c
@ -20,7 +20,7 @@
 #include <gobject/gvaluecollector.h>
 #include "gtktreemodel.h"
 #include "gtktreestore.h"
-#include "gtktreedatalist.h"
+#include "gtktreedatalistprivate.h"
 #include "gtktreednd.h"
 #include "gtkbuildable.h"
 #include "gtkbuilderprivate.h"
--- a/testsuite/gtk/textbuffer.c
+++ b/testsuite/gtk/textbuffer.c
@ -21,7 +21,7 @@
 #include <string.h>

 #include <gtk/gtk.h>
-#include "gtk/gtktexttypes.h" /* Private header, for UNKNOWN_CHAR */
+#include "gtk/gtktexttypesprivate.h" /* Private header, for UNKNOWN_CHAR */
 #include "gtk/gtktextbufferprivate.h" /* Private header */

 static void