summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gtk/gtkactivatable.c1
-rw-r--r--gtk/gtkactivatable.h1
-rw-r--r--gtk/gtkarrow.c2
-rw-r--r--gtk/gtkbbox.c2
-rw-r--r--gtk/gtkbindings.c2
-rw-r--r--gtk/gtkbox.c2
-rw-r--r--gtk/gtkbuildable.c1
-rw-r--r--gtk/gtkbuildable.h1
-rw-r--r--gtk/gtkbuilderparser.c3
-rw-r--r--gtk/gtkcellareabox.c1
-rw-r--r--gtk/gtkcellrenderer.c1
-rw-r--r--gtk/gtkcellrendererspinner.c2
-rw-r--r--gtk/gtkhsv.c2
-rw-r--r--gtk/gtkorientable.c2
-rw-r--r--gtk/gtkscale.c1
-rw-r--r--gtk/gtkscrollable.c2
-rw-r--r--gtk/gtkscrolledwindow.c1
-rw-r--r--gtk/gtksettings.c2
-rw-r--r--gtk/gtksizegroup.c1
-rw-r--r--gtk/gtktreesortable.h1
-rw-r--r--gtk/gtkviewport.c2
21 files changed, 15 insertions, 18 deletions
diff --git a/gtk/gtkactivatable.c b/gtk/gtkactivatable.c
index 6b93f32b84..c22690ccb4 100644
--- a/gtk/gtkactivatable.c
+++ b/gtk/gtkactivatable.c
@@ -263,7 +263,6 @@
#include "config.h"
#include "gtkactivatable.h"
#include "gtkactiongroup.h"
-#include "gtktypeutils.h"
#include "gtkprivate.h"
#include "gtkintl.h"
diff --git a/gtk/gtkactivatable.h b/gtk/gtkactivatable.h
index 705bfa4e80..920b4a4eae 100644
--- a/gtk/gtkactivatable.h
+++ b/gtk/gtkactivatable.h
@@ -25,7 +25,6 @@
#define __GTK_ACTIVATABLE_H__
#include <gtk/gtkaction.h>
-#include <gtk/gtktypeutils.h>
G_BEGIN_DECLS
diff --git a/gtk/gtkarrow.c b/gtk/gtkarrow.c
index 57d5a0e065..c0c4ccfa77 100644
--- a/gtk/gtkarrow.c
+++ b/gtk/gtkarrow.c
@@ -48,7 +48,7 @@
#include <math.h>
#include "gtkarrow.h"
#include "gtksizerequest.h"
-#include "gtktypeutils.h"
+#include "gtktypebuiltins.h"
#include "gtkprivate.h"
#include "gtkintl.h"
diff --git a/gtk/gtkbbox.c b/gtk/gtkbbox.c
index 5fdf837a15..24bdf1c392 100644
--- a/gtk/gtkbbox.c
+++ b/gtk/gtkbbox.c
@@ -49,9 +49,9 @@
#include "gtkbbox.h"
#include "gtkorientable.h"
+#include "gtktypebuiltins.h"
#include "gtkprivate.h"
#include "gtksizerequest.h"
-#include "gtktypeutils.h"
#include "gtkintl.h"
diff --git a/gtk/gtkbindings.c b/gtk/gtkbindings.c
index fcf531618a..80bcd8b252 100644
--- a/gtk/gtkbindings.c
+++ b/gtk/gtkbindings.c
@@ -33,8 +33,8 @@
#include <gdkkeysyms.h>
#include "gtkbindings.h"
-#include "gtkkeyhash.h"
#include "gtktypeutils.h"
+#include "gtkkeyhash.h"
#include "gtkwidget.h"
#include "gtkrc.h"
diff --git a/gtk/gtkbox.c b/gtk/gtkbox.c
index e3c4b42e83..8c7f86705e 100644
--- a/gtk/gtkbox.c
+++ b/gtk/gtkbox.c
@@ -88,7 +88,7 @@
#include "gtkbox.h"
#include "gtkorientable.h"
#include "gtksizerequest.h"
-#include "gtktypeutils.h"
+#include "gtktypebuiltins.h"
#include "gtkprivate.h"
#include "gtkintl.h"
diff --git a/gtk/gtkbuildable.c b/gtk/gtkbuildable.c
index d813fff451..25c9fc2e52 100644
--- a/gtk/gtkbuildable.c
+++ b/gtk/gtkbuildable.c
@@ -40,7 +40,6 @@
#include "config.h"
#include "gtkbuildable.h"
-#include "gtktypeutils.h"
#include "gtkintl.h"
diff --git a/gtk/gtkbuildable.h b/gtk/gtkbuildable.h
index 50ed14cd1d..5f46026a5e 100644
--- a/gtk/gtkbuildable.h
+++ b/gtk/gtkbuildable.h
@@ -26,7 +26,6 @@
#define __GTK_BUILDABLE_H__
#include <gtk/gtkbuilder.h>
-#include <gtk/gtktypeutils.h>
G_BEGIN_DECLS
diff --git a/gtk/gtkbuilderparser.c b/gtk/gtkbuilderparser.c
index 11fe3c63f1..5ea15e3c60 100644
--- a/gtk/gtkbuilderparser.c
+++ b/gtk/gtkbuilderparser.c
@@ -23,13 +23,12 @@
#include <string.h>
#include <gmodule.h>
-#include "gtktypeutils.h"
#include "gtkbuilderprivate.h"
#include "gtkbuilder.h"
#include "gtkbuildable.h"
#include "gtkdebug.h"
#include "gtkversion.h"
-#include "gtktypeutils.h"
+#include "gtktypebuiltins.h"
#include "gtkintl.h"
diff --git a/gtk/gtkcellareabox.c b/gtk/gtkcellareabox.c
index f81d1c2d9c..e54f018fab 100644
--- a/gtk/gtkcellareabox.c
+++ b/gtk/gtkcellareabox.c
@@ -53,6 +53,7 @@
#include "gtkcelllayout.h"
#include "gtkcellareabox.h"
#include "gtkcellareaboxcontext.h"
+#include "gtktypebuiltins.h"
#include "gtkprivate.h"
diff --git a/gtk/gtkcellrenderer.c b/gtk/gtkcellrenderer.c
index e15323e830..95f33406b8 100644
--- a/gtk/gtkcellrenderer.c
+++ b/gtk/gtkcellrenderer.c
@@ -21,6 +21,7 @@
#include "gtkcellrenderer.h"
#include "gtkintl.h"
#include "gtkmarshalers.h"
+#include "gtktypebuiltins.h"
#include "gtkprivate.h"
#include "gtktreeprivate.h"
diff --git a/gtk/gtkcellrendererspinner.c b/gtk/gtkcellrendererspinner.c
index bc63b5ea90..034e40dba7 100644
--- a/gtk/gtkcellrendererspinner.c
+++ b/gtk/gtkcellrendererspinner.c
@@ -32,7 +32,7 @@
#include "gtkcellrendererspinner.h"
#include "gtkiconfactory.h"
#include "gtkicontheme.h"
-#include "gtktypeutils.h"
+#include "gtktypebuiltins.h"
#include "gtkintl.h"
diff --git a/gtk/gtkhsv.c b/gtk/gtkhsv.c
index e6591c9c01..c26863ffc5 100644
--- a/gtk/gtkhsv.c
+++ b/gtk/gtkhsv.c
@@ -39,7 +39,7 @@
#include "gtkhsv.h"
#include "gtkbindings.h"
#include "gtkmarshalers.h"
-#include "gtktypeutils.h"
+#include "gtktypebuiltins.h"
#include "gtkintl.h"
/* Default width/height */
diff --git a/gtk/gtkorientable.c b/gtk/gtkorientable.c
index 2a3c761355..dfc0dd6faa 100644
--- a/gtk/gtkorientable.c
+++ b/gtk/gtkorientable.c
@@ -25,7 +25,7 @@
#include "gtkorientable.h"
#include "gtkprivate.h"
-#include "gtktypeutils.h"
+#include "gtktypebuiltins.h"
#include "gtkintl.h"
diff --git a/gtk/gtkscale.c b/gtk/gtkscale.c
index d81868e52e..c23fd15a2e 100644
--- a/gtk/gtkscale.c
+++ b/gtk/gtkscale.c
@@ -37,6 +37,7 @@
#include "gtkmarshalers.h"
#include "gtkbindings.h"
#include "gtkorientable.h"
+#include "gtktypebuiltins.h"
#include "gtkprivate.h"
#include "gtkintl.h"
#include "gtkbuildable.h"
diff --git a/gtk/gtkscrollable.c b/gtk/gtkscrollable.c
index eb6e046f50..0ff0d9612c 100644
--- a/gtk/gtkscrollable.c
+++ b/gtk/gtkscrollable.c
@@ -63,8 +63,8 @@
#include "config.h"
#include "gtkscrollable.h"
-#include "gtktypeutils.h"
#include "gtkprivate.h"
+#include "gtktypebuiltins.h"
#include "gtkintl.h"
G_DEFINE_INTERFACE (GtkScrollable, gtk_scrollable, G_TYPE_OBJECT)
diff --git a/gtk/gtkscrolledwindow.c b/gtk/gtkscrolledwindow.c
index c18e7de7e8..1614b6b9c2 100644
--- a/gtk/gtkscrolledwindow.c
+++ b/gtk/gtkscrolledwindow.c
@@ -32,7 +32,6 @@
#include "gtkscrollable.h"
#include "gtkscrolledwindow.h"
#include "gtkwindow.h"
-#include "gtktypeutils.h"
#include "gtkprivate.h"
#include "gtkintl.h"
diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c
index e9e4978bbb..5ce17e8b14 100644
--- a/gtk/gtksettings.c
+++ b/gtk/gtksettings.c
@@ -28,10 +28,10 @@
#include "gtkrc.h"
#include "gtkintl.h"
#include "gtkwidget.h"
-#include "gtktypeutils.h"
#include "gtkprivate.h"
#include "gtkcssprovider.h"
#include "gtksymboliccolor.h"
+#include "gtktypebuiltins.h"
#include "gtkversion.h"
#ifdef GDK_WINDOWING_X11
diff --git a/gtk/gtksizegroup.c b/gtk/gtksizegroup.c
index be24f64869..836b3da2a8 100644
--- a/gtk/gtksizegroup.c
+++ b/gtk/gtksizegroup.c
@@ -24,6 +24,7 @@
#include "gtkbuildable.h"
#include "gtkcontainer.h"
#include "gtkintl.h"
+#include "gtktypebuiltins.h"
#include "gtkprivate.h"
#include "gtksizegroup-private.h"
#include "gtkwidgetprivate.h"
diff --git a/gtk/gtktreesortable.h b/gtk/gtktreesortable.h
index c9ce6e787a..ccd8bc2bc9 100644
--- a/gtk/gtktreesortable.h
+++ b/gtk/gtktreesortable.h
@@ -27,7 +27,6 @@
#include <gtk/gtkenums.h>
#include <gtk/gtktreemodel.h>
-#include <gtk/gtktypeutils.h>
G_BEGIN_DECLS
diff --git a/gtk/gtkviewport.c b/gtk/gtkviewport.c
index 7f7445f4d2..dfa8f1552a 100644
--- a/gtk/gtkviewport.c
+++ b/gtk/gtkviewport.c
@@ -30,8 +30,8 @@
#include "gtkintl.h"
#include "gtkmarshalers.h"
-#include "gtktypeutils.h"
#include "gtkscrollable.h"
+#include "gtktypebuiltins.h"
#include "gtkprivate.h"