[gtk+] Reduce includes of gtktypeutils.h to a minimum

[Matthias Clasen <matthiasc src gnome org>]

commit 16877b4d7bef813a42643ae50c14b13dc8302b36
Author: Matthias Clasen <mclasen redhat com>
Date:   Tue Jan 4 12:05:05 2011 -0500

    Reduce includes of gtktypeutils.h to a minimum

 gtk/gtkactivatable.c         |    1 -
 gtk/gtkactivatable.h         |    1 -
 gtk/gtkarrow.c               |    2 +-
 gtk/gtkbbox.c                |    2 +-
 gtk/gtkbindings.c            |    2 +-
 gtk/gtkbox.c                 |    2 +-
 gtk/gtkbuildable.c           |    1 -
 gtk/gtkbuildable.h           |    1 -
 gtk/gtkbuilderparser.c       |    3 +--
 gtk/gtkcellareabox.c         |    1 +
 gtk/gtkcellrenderer.c        |    1 +
 gtk/gtkcellrendererspinner.c |    2 +-
 gtk/gtkhsv.c                 |    2 +-
 gtk/gtkorientable.c          |    2 +-
 gtk/gtkscale.c               |    1 +
 gtk/gtkscrollable.c          |    2 +-
 gtk/gtkscrolledwindow.c      |    1 -
 gtk/gtksettings.c            |    2 +-
 gtk/gtksizegroup.c           |    1 +
 gtk/gtktreesortable.h        |    1 -
 gtk/gtkviewport.c            |    2 +-
 21 files changed, 15 insertions(+), 18 deletions(-)
---
diff --git a/gtk/gtkactivatable.c b/gtk/gtkactivatable.c
index 6b93f32..c22690c 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 705bfa4..920b4a4 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 57d5a0e..c0c4ccf 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 5fdf837..24bdf1c 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 fcf5316..80bcd8b 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 e3c4b42..8c7f867 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 d813fff..25c9fc2 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 50ed14c..5f46026 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 11fe3c6..5ea15e3 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 f81d1c2..e54f018 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 e15323e..95f3340 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 bc63b5e..034e40d 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 e6591c9..c26863f 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 2a3c761..dfc0dd6 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 d81868e..c23fd15 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 eb6e046..0ff0d96 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 c18e7de..1614b6b 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 e9e4978..5ce17e8 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 be24f64..836b3da 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 c9ce6e7..ccd8bc2 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 7f7445f..dfa8f15 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"