types: Move GtkAdustment declaration to gtktypes.h

... and make all the headers to not include gtkadjustment.h anymore. Of
course, also include it in the source files instead.

33 files changed, 82 insertions, 55 deletions

diff --git a/gtk/a11y/gtkiconviewaccessible.c b/gtk/a11y/gtkiconviewaccessible.c
index bdfeee3da2..9084f0e3b6 100644
--- a/gtk/a11y/gtkiconviewaccessible.c
+++ b/gtk/a11y/gtkiconviewaccessible.c
@@ -21,6 +21,7 @@
 
 #include <string.h>
 
+#include "gtk/gtkadjustment.h"
 #include "gtk/gtkiconviewprivate.h"
 #include "gtk/gtkcellrendererpixbuf.h"
 #include "gtk/gtkcellrenderertext.h"
diff --git a/gtk/deprecated/gtkcolorsel.c b/gtk/deprecated/gtkcolorsel.c
index 09d824a820..b9435f1933 100644
--- a/gtk/deprecated/gtkcolorsel.c
+++ b/gtk/deprecated/gtkcolorsel.c
@@ -33,6 +33,7 @@
 #include <string.h>
 
 #include "gdk/gdk.h"
+#include "gtkadjustment.h"
 #include "gtkorientable.h"
 #include "gtkhsv.h"
 #include "gtkwindow.h"
diff --git a/gtk/deprecated/gtkhscale.c b/gtk/deprecated/gtkhscale.c
index 7aa1f3f95d..2d2882ca45 100644
--- a/gtk/deprecated/gtkhscale.c
+++ b/gtk/deprecated/gtkhscale.c
@@ -28,6 +28,8 @@
 #include <stdlib.h>
 
 #include "gtkhscale.h"
+
+#include "gtkadjustment.h"
 #include "gtkorientable.h"
 
 
diff --git a/gtk/deprecated/gtkhscrollbar.c b/gtk/deprecated/gtkhscrollbar.c
index f776b6cd7b..c3ad481122 100644
--- a/gtk/deprecated/gtkhscrollbar.c
+++ b/gtk/deprecated/gtkhscrollbar.c
@@ -25,11 +25,12 @@
 
 #include "config.h"
 
-#include "gtkscrollbar.h"
-
 #include "gtkhscrollbar.h"
-#include "gtkorientable.h"
+
+#include "gtkadjustment.h"
 #include "gtkintl.h"
+#include "gtkorientable.h"
+#include "gtkscrollbar.h"
 
 
 /**
diff --git a/gtk/deprecated/gtkvscale.c b/gtk/deprecated/gtkvscale.c
index f14a06f662..540c36605d 100644
--- a/gtk/deprecated/gtkvscale.c
+++ b/gtk/deprecated/gtkvscale.c
@@ -28,6 +28,8 @@
 #include <stdlib.h>
 
 #include "gtkvscale.h"
+
+#include "gtkadjustment.h"
 #include "gtkorientable.h"
 
 
diff --git a/gtk/deprecated/gtkvscrollbar.c b/gtk/deprecated/gtkvscrollbar.c
index 132c355f59..e284b659da 100644
--- a/gtk/deprecated/gtkvscrollbar.c
+++ b/gtk/deprecated/gtkvscrollbar.c
@@ -25,11 +25,12 @@
 
 #include "config.h"
 
-#include "gtkorientable.h"
-#include "gtkscrollbar.h"
-
 #include "gtkvscrollbar.h"
+
+#include "gtkadjustment.h"
 #include "gtkintl.h"
+#include "gtkorientable.h"
+#include "gtkscrollbar.h"
 
 
 /**
diff --git a/gtk/gtkadjustment.h b/gtk/gtkadjustment.h
index 894d62aea9..8af9685151 100644
--- a/gtk/gtkadjustment.h
+++ b/gtk/gtkadjustment.h
@@ -30,6 +30,7 @@
 #define __GTK_ADJUSTMENT_H__
 
 #include <gdk/gdk.h>
+#include <gtk/gtktypes.h>
 
 G_BEGIN_DECLS
 
@@ -41,7 +42,6 @@ G_BEGIN_DECLS
 #define GTK_ADJUSTMENT_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_ADJUSTMENT, GtkAdjustmentClass))
 
 
-typedef struct _GtkAdjustment         GtkAdjustment;
 typedef struct _GtkAdjustmentPrivate  GtkAdjustmentPrivate;
 typedef struct _GtkAdjustmentClass    GtkAdjustmentClass;
 
diff --git a/gtk/gtkcellrendererspin.c b/gtk/gtkcellrendererspin.c
index ead01c78c8..d1c1148b6c 100644
--- a/gtk/gtkcellrendererspin.c
+++ b/gtk/gtkcellrendererspin.c
@@ -22,6 +22,7 @@
 
 #include "gtkcellrendererspin.h"
 
+#include "gtkadjustment.h"
 #include "gtkintl.h"
 #include "gtkprivate.h"
 #include "gtkspinbutton.h"
diff --git a/gtk/gtkcolorplane.c b/gtk/gtkcolorplane.c
index 32112411aa..c8b2d71145 100644
--- a/gtk/gtkcolorplane.c
+++ b/gtk/gtkcolorplane.c
@@ -19,8 +19,9 @@
 
 #include "gtkcolorplaneprivate.h"
 
-#include "gtkcolorutils.h"
 #include "gtkaccessible.h"
+#include "gtkadjustment.h"
+#include "gtkcolorutils.h"
 #include "gtkintl.h"
 
 struct _GtkColorPlanePrivate
diff --git a/gtk/gtkcolorplaneprivate.h b/gtk/gtkcolorplaneprivate.h
index 560e892f78..b9c372e514 100644
--- a/gtk/gtkcolorplaneprivate.h
+++ b/gtk/gtkcolorplaneprivate.h
@@ -22,8 +22,8 @@
 #ifndef __GTK_COLOR_PLANE_H__
 #define __GTK_COLOR_PLANE_H__
 
-#include <gtk/gtkadjustment.h>
 #include <gtk/gtkdrawingarea.h>
+#include <gtk/gtktypes.h>
 
 G_BEGIN_DECLS
 
diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
index 4d8be09c04..95c2deca5e 100644
--- a/gtk/gtkcombobox.c
+++ b/gtk/gtkcombobox.c
@@ -16,7 +16,10 @@
  */
 
 #include "config.h"
+
 #include "gtkcombobox.h"
+
+#include "gtkadjustment.h"
 #include "gtkcellareabox.h"
 #include "gtktreemenu.h"
 #include "gtkarrow.h"
diff --git a/gtk/gtkcontainer.c b/gtk/gtkcontainer.c
index 88f79b394e..4d5559575f 100644
--- a/gtk/gtkcontainer.c
+++ b/gtk/gtkcontainer.c
@@ -34,6 +34,7 @@
 #include <gobject/gobjectnotifyqueue.c>
 #include <gobject/gvaluecollector.h>
 
+#include "gtkadjustment.h"
 #include "gtkbuildable.h"
 #include "gtkbuilderprivate.h"
 #include "gtktypebuiltins.h"
diff --git a/gtk/gtkcontainer.h b/gtk/gtkcontainer.h
index a734e22a96..2db24889b5 100644
--- a/gtk/gtkcontainer.h
+++ b/gtk/gtkcontainer.h
@@ -31,7 +31,6 @@
 
 
 #include <gtk/gtkwidget.h>
-#include <gtk/gtkadjustment.h>
 
 
 G_BEGIN_DECLS
diff --git a/gtk/gtkfontchooserwidget.c b/gtk/gtkfontchooserwidget.c
index 5197d6fb1d..8aa9fbf7c2 100644
--- a/gtk/gtkfontchooserwidget.c
+++ b/gtk/gtkfontchooserwidget.c
@@ -24,29 +24,27 @@
 #include <atk/atk.h>
 
 #include "gtkfontchooserwidget.h"
-#include "gtkfontchooser.h"
-#include "gtkfontchooserutils.h"
+
+#include "gtkadjustment.h"
+#include "gtkbuildable.h"
+#include "gtkbox.h"
 #include "gtkcellrenderertext.h"
 #include "gtkentry.h"
-#include "gtkframe.h"
-#include "gtkbbox.h"
-#include "gtkbox.h"
+#include "gtkgrid.h"
+#include "gtkfontchooser.h"
+#include "gtkfontchooserutils.h"
+#include "gtkintl.h"
 #include "gtklabel.h"
 #include "gtkliststore.h"
-#include "gtkstock.h"
-#include "gtktextview.h"
-#include "gtktreeselection.h"
-#include "gtktreeview.h"
-#include "gtkscrolledwindow.h"
-#include "gtkintl.h"
-#include "gtkaccessible.h"
-#include "gtkbuildable.h"
+#include "gtknotebook.h"
 #include "gtkprivate.h"
 #include "gtkscale.h"
+#include "gtkscrolledwindow.h"
 #include "gtkspinbutton.h"
-#include "gtknotebook.h"
+#include "gtktextview.h"
+#include "gtktreeselection.h"
+#include "gtktreeview.h"
 #include "gtkwidget.h"
-#include "gtkgrid.h"
 
 /**
  * SECTION:gtkfontchooserwidget
diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c
index 78a2b23b99..29a31ed766 100644
--- a/gtk/gtkiconview.c
+++ b/gtk/gtkiconview.c
@@ -22,6 +22,7 @@
 #include "gtkiconview.h"
 #include "gtkiconviewprivate.h"
 
+#include "gtkadjustment.h"
 #include "gtkcelllayout.h"
 #include "gtkcellrenderer.h"
 #include "gtkcellareabox.h"
diff --git a/gtk/gtklayout.c b/gtk/gtklayout.c
index da3dc9a9c9..147ea92b53 100644
--- a/gtk/gtklayout.c
+++ b/gtk/gtklayout.c
@@ -32,9 +32,10 @@
 
 #include "gdk/gdk.h"
 
-#include "gtkprivate.h"
+#include "gtkadjustment.h"
 #include "gtkintl.h"
 #include "gtkmarshalers.h"
+#include "gtkprivate.h"
 #include "gtkscrollable.h"
 
 
diff --git a/gtk/gtklayout.h b/gtk/gtklayout.h
index 8ab68b5027..f5b710e43a 100644
--- a/gtk/gtklayout.h
+++ b/gtk/gtklayout.h
@@ -35,7 +35,6 @@
 
 
 #include <gtk/gtkcontainer.h>
-#include <gtk/gtkadjustment.h>
 
 
 G_BEGIN_DECLS
diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c
index b7f95e3361..4fe6973bd6 100644
--- a/gtk/gtkmenu.c
+++ b/gtk/gtkmenu.c
@@ -95,6 +95,7 @@
 
 #include "gtkaccellabel.h"
 #include "gtkaccelmap.h"
+#include "gtkadjustment.h"
 #include "gtkbindings.h"
 #include "gtkcheckmenuitem.h"
 #include "gtkmain.h"
diff --git a/gtk/gtkrange.c b/gtk/gtkrange.c
index a81b26080f..d9acee88ec 100644
--- a/gtk/gtkrange.c
+++ b/gtk/gtkrange.c
@@ -28,18 +28,19 @@
 #include <stdio.h>
 #include <math.h>
 
+#include "gtkrange.h"
+
+#include "gtkadjustment.h"
+#include "gtkcolorscaleprivate.h"
+#include "gtkintl.h"
 #include "gtkmain.h"
 #include "gtkmarshalers.h"
 #include "gtkorientableprivate.h"
-#include "gtkrange.h"
+#include "gtkprivate.h"
 #include "gtkscale.h"
-#include "gtkcolorscaleprivate.h"
 #include "gtkscrollbar.h"
-#include "gtkwindow.h"
-#include "gtkprivate.h"
-#include "gtkintl.h"
-#include "gtkmain.h"
 #include "gtktypebuiltins.h"
+#include "gtkwindow.h"
 #include "a11y/gtkrangeaccessible.h"
 
 /**
diff --git a/gtk/gtkrange.h b/gtk/gtkrange.h
index c4d9e9eb0c..99bbb7d3be 100644
--- a/gtk/gtkrange.h
+++ b/gtk/gtkrange.h
@@ -30,7 +30,6 @@
 #define __GTK_RANGE_H__
 
 
-#include <gtk/gtkadjustment.h>
 #include <gtk/gtkwidget.h>
 
 
diff --git a/gtk/gtkscale.c b/gtk/gtkscale.c
index 22b7128788..25c5a44e55 100644
--- a/gtk/gtkscale.c
+++ b/gtk/gtkscale.c
@@ -29,16 +29,18 @@
 #include <stdlib.h>
 
 #include "gtkscaleprivate.h"
+
+#include "gtkadjustment.h"
+#include "gtkbindings.h"
+#include "gtkbuildable.h"
+#include "gtkbuilderprivate.h"
 #include "gtkiconfactory.h"
 #include "gtkicontheme.h"
+#include "gtkintl.h"
 #include "gtkmarshalers.h"
-#include "gtkbindings.h"
 #include "gtkorientable.h"
-#include "gtktypebuiltins.h"
 #include "gtkprivate.h"
-#include "gtkintl.h"
-#include "gtkbuildable.h"
-#include "gtkbuilderprivate.h"
+#include "gtktypebuiltins.h"
 
 #include "a11y/gtkscaleaccessible.h"
 
diff --git a/gtk/gtkscalebutton.c b/gtk/gtkscalebutton.c
index b91c6792cb..43055ea225 100644
--- a/gtk/gtkscalebutton.c
+++ b/gtk/gtkscalebutton.c
@@ -33,6 +33,8 @@
 
 #include "config.h"
 
+#include "gtkscalebutton.h"
+
 #ifndef _WIN32
 #define _GNU_SOURCE
 #endif
@@ -40,6 +42,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "gtkadjustment.h"
 #include "gtkbindings.h"
 #include "gtkframe.h"
 #include "gtkmain.h"
@@ -47,7 +50,6 @@
 #include "gtkorientable.h"
 #include "gtkprivate.h"
 #include "gtkscale.h"
-#include "gtkscalebutton.h"
 #include "gtkstock.h"
 #include "gtkbox.h"
 #include "gtkwindow.h"
diff --git a/gtk/gtkscrollable.c b/gtk/gtkscrollable.c
index 8c08cdf4e0..3c7c76fcc6 100644
--- a/gtk/gtkscrollable.c
+++ b/gtk/gtkscrollable.c
@@ -69,6 +69,8 @@
 #include "config.h"
 
 #include "gtkscrollable.h"
+
+#include "gtkadjustment.h"
 #include "gtkprivate.h"
 #include "gtktypebuiltins.h"
 #include "gtkintl.h"
diff --git a/gtk/gtkscrollable.h b/gtk/gtkscrollable.h
index f2774be685..ba68e90f76 100644
--- a/gtk/gtkscrollable.h
+++ b/gtk/gtkscrollable.h
@@ -22,8 +22,8 @@
 #ifndef __GTK_SCROLLABLE_H__
 #define __GTK_SCROLLABLE_H__
 
-#include <gtk/gtkadjustment.h>
 #include <gtk/gtkenums.h>
+#include <gtk/gtktypes.h>
 
 G_BEGIN_DECLS
 
diff --git a/gtk/gtkscrollbar.c b/gtk/gtkscrollbar.c
index 78d46a89f0..eb5ee5a826 100644
--- a/gtk/gtkscrollbar.c
+++ b/gtk/gtkscrollbar.c
@@ -26,6 +26,8 @@
 #include "config.h"
 
 #include "gtkscrollbar.h"
+
+#include "gtkadjustment.h"
 #include "gtkintl.h"
 #include "gtkprivate.h"
 
diff --git a/gtk/gtkscrolledwindow.c b/gtk/gtkscrolledwindow.c
index 05bad81533..dd4b71f9ca 100644
--- a/gtk/gtkscrolledwindow.c
+++ b/gtk/gtkscrolledwindow.c
@@ -24,24 +24,25 @@
 
 #include "config.h"
 
-#include <math.h>
+#include "gtkscrolledwindow.h"
 
+#include "gtkadjustment.h"
 #include "gtkbindings.h"
-#include "gtkmarshalers.h"
-#include "gtkscrollable.h"
-#include "gtkscrollbar.h"
-#include "gtkscrolledwindow.h"
-#include "gtkwindow.h"
-#include "gtkviewport.h"
 #include "gtkdnd.h"
+#include "gtkintl.h"
 #include "gtkmain.h"
+#include "gtkmarshalers.h"
 #include "gtkprivate.h"
+#include "gtkscrollable.h"
+#include "gtkscrollbar.h"
 #include "gtktypebuiltins.h"
-#include "gtkintl.h"
 #include "gtkviewport.h"
 #include "gtkwidgetprivate.h"
+#include "gtkwindow.h"
 #include "a11y/gtkscrolledwindowaccessible.h"
 
+#include <math.h>
+
 /**
  * SECTION:gtkscrolledwindow
  * @Short_description: Adds scrollbars to its child widget
diff --git a/gtk/gtkspinbutton.c b/gtk/gtkspinbutton.c
index e3caddff84..69a77e3c94 100644
--- a/gtk/gtkspinbutton.c
+++ b/gtk/gtkspinbutton.c
@@ -27,14 +27,16 @@
 
 #include "config.h"
 
+#include "gtkspinbutton.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <math.h>
 #include <string.h>
 #include <locale.h>
 
+#include "gtkadjustment.h"
 #include "gtkbindings.h"
-#include "gtkspinbutton.h"
 #include "gtkentryprivate.h"
 #include "gtkicontheme.h"
 #include "gtkmarshalers.h"
diff --git a/gtk/gtkspinbutton.h b/gtk/gtkspinbutton.h
index f71c5b42e9..362c4d56b4 100644
--- a/gtk/gtkspinbutton.h
+++ b/gtk/gtkspinbutton.h
@@ -34,7 +34,6 @@
 
 
 #include <gtk/gtkentry.h>
-#include <gtk/gtkadjustment.h>
 
 
 G_BEGIN_DECLS
diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index c22eeb1bcc..97d5cb6a8e 100644
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -22,6 +22,8 @@
 #include <string.h>
 
 #include "gtktreeview.h"
+
+#include "gtkadjustment.h"
 #include "gtkrbtree.h"
 #include "gtktreednd.h"
 #include "gtktreeprivate.h"
diff --git a/gtk/gtktypes.h b/gtk/gtktypes.h
index a14457879a..b3eade30a5 100644
--- a/gtk/gtktypes.h
+++ b/gtk/gtktypes.h
@@ -31,6 +31,7 @@
 
 G_BEGIN_DECLS
 
+typedef struct _GtkAdjustment          GtkAdjustment;
 typedef struct _GtkClipboard	       GtkClipboard;
 typedef struct _GtkIconSet             GtkIconSet;
 typedef struct _GtkIconSource          GtkIconSource;
diff --git a/gtk/gtkviewport.c b/gtk/gtkviewport.c
index eea91ad9ae..4829cde5e8 100644
--- a/gtk/gtkviewport.c
+++ b/gtk/gtkviewport.c
@@ -26,11 +26,12 @@
 
 #include "gtkviewport.h"
 
+#include "gtkadjustment.h"
 #include "gtkintl.h"
 #include "gtkmarshalers.h"
+#include "gtkprivate.h"
 #include "gtkscrollable.h"
 #include "gtktypebuiltins.h"
-#include "gtkprivate.h"
 
 
 /**
diff --git a/gtk/gtkviewport.h b/gtk/gtkviewport.h
index 50ea6b0bad..68aaa857b6 100644
--- a/gtk/gtkviewport.h
+++ b/gtk/gtkviewport.h
@@ -30,7 +30,6 @@
 #define __GTK_VIEWPORT_H__
 
 
-#include <gtk/gtkadjustment.h>
 #include <gtk/gtkbin.h>
 
 
diff --git a/gtk/gtkvolumebutton.c b/gtk/gtkvolumebutton.c
index e04fd4cff3..823d1decbf 100644
--- a/gtk/gtkvolumebutton.c
+++ b/gtk/gtkvolumebutton.c
@@ -28,9 +28,10 @@
 #include "config.h"
 
 #include "gtkvolumebutton.h"
-#include "gtkstock.h"
-#include "gtktooltip.h"
+
+#include "gtkadjustment.h"
 #include "gtkintl.h"
+#include "gtktooltip.h"
 
 
 /**