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.

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"

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"

gtk/deprecated/gtkhscale.c

@@ -28,6 +28,8 @@
 #include <stdlib.h>
 
 #include "gtkhscale.h"
+
+#include "gtkadjustment.h"
 #include "gtkorientable.h"
 
 

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"
 
 
 /**

gtk/deprecated/gtkvscale.c

@@ -28,6 +28,8 @@
 #include <stdlib.h>
 
 #include "gtkvscale.h"
+
+#include "gtkadjustment.h"
 #include "gtkorientable.h"
 
 

gtk/deprecated/gtkvscrollbar.c

@@ -25,12 +25,13 @@
 
 #include "config.h"
 
+#include "gtkvscrollbar.h"
+
+#include "gtkadjustment.h"
+#include "gtkintl.h"
 #include "gtkorientable.h"
 #include "gtkscrollbar.h"
 
-#include "gtkvscrollbar.h"
-#include "gtkintl.h"
-
 
 /**
  * SECTION:gtkvscrollbar

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;
 

gtk/gtkcellrendererspin.c

@@ -22,6 +22,7 @@
 
 #include "gtkcellrendererspin.h"
 
+#include "gtkadjustment.h"
 #include "gtkintl.h"
 #include "gtkprivate.h"
 #include "gtkspinbutton.h"

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

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
 

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"

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"

gtk/gtkcontainer.h

@@ -31,7 +31,6 @@
 
 
 #include <gtk/gtkwidget.h>
-#include <gtk/gtkadjustment.h>
 
 
 G_BEGIN_DECLS

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 "gtknotebook.h"
+#include "gtkprivate.h"
+#include "gtkscale.h"
+#include "gtkscrolledwindow.h"
+#include "gtkspinbutton.h"
 #include "gtktextview.h"
 #include "gtktreeselection.h"
 #include "gtktreeview.h"
-#include "gtkscrolledwindow.h"
-#include "gtkintl.h"
-#include "gtkaccessible.h"
-#include "gtkbuildable.h"
-#include "gtkprivate.h"
-#include "gtkscale.h"
-#include "gtkspinbutton.h"
-#include "gtknotebook.h"
 #include "gtkwidget.h"
-#include "gtkgrid.h"
 
 /**
  * SECTION:gtkfontchooserwidget

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"

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"
 
 

gtk/gtklayout.h

@@ -35,7 +35,6 @@
 
 
 #include <gtk/gtkcontainer.h>
-#include <gtk/gtkadjustment.h>
 
 
 G_BEGIN_DECLS

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"

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 "gtkscale.h"
-#include "gtkcolorscaleprivate.h"
-#include "gtkscrollbar.h"
-#include "gtkwindow.h"
 #include "gtkprivate.h"
-#include "gtkintl.h"
-#include "gtkmain.h"
+#include "gtkscale.h"
+#include "gtkscrollbar.h"
 #include "gtktypebuiltins.h"
+#include "gtkwindow.h"
 #include "a11y/gtkrangeaccessible.h"
 
 /**

gtk/gtkrange.h

@@ -30,7 +30,6 @@
 #define __GTK_RANGE_H__
 
 
-#include <gtk/gtkadjustment.h>
 #include <gtk/gtkwidget.h>
 
 

gtk/gtkscale.c

@@ -29,16 +29,18 @@
 #include <stdlib.h>
 
 #include "gtkscaleprivate.h"
-#include "gtkiconfactory.h"
-#include "gtkicontheme.h"
-#include "gtkmarshalers.h"
+
+#include "gtkadjustment.h"
 #include "gtkbindings.h"
-#include "gtkorientable.h"
-#include "gtktypebuiltins.h"
-#include "gtkprivate.h"
-#include "gtkintl.h"
 #include "gtkbuildable.h"
 #include "gtkbuilderprivate.h"
+#include "gtkiconfactory.h"
+#include "gtkicontheme.h"
+#include "gtkintl.h"
+#include "gtkmarshalers.h"
+#include "gtkorientable.h"
+#include "gtkprivate.h"
+#include "gtktypebuiltins.h"
 
 #include "a11y/gtkscaleaccessible.h"
 

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"

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"

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
 

gtk/gtkscrollbar.c

@@ -26,6 +26,8 @@
 #include "config.h"
 
 #include "gtkscrollbar.h"
+
+#include "gtkadjustment.h"
 #include "gtkintl.h"
 #include "gtkprivate.h"
 

gtk/gtkscrolledwindow.c

@@ -24,24 +24,25 @@
 
 #include "config.h"
 
-#include <math.h>
+#include "gtkscrolledwindow.h"
 
+#include "gtkadjustment.h"
 #include "gtkbindings.h"
+#include "gtkdnd.h"
+#include "gtkintl.h"
+#include "gtkmain.h"
 #include "gtkmarshalers.h"
+#include "gtkprivate.h"
 #include "gtkscrollable.h"
 #include "gtkscrollbar.h"
-#include "gtkscrolledwindow.h"
-#include "gtkwindow.h"
-#include "gtkviewport.h"
-#include "gtkdnd.h"
-#include "gtkmain.h"
-#include "gtkprivate.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

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"

gtk/gtkspinbutton.h

@@ -34,7 +34,6 @@
 
 
 #include <gtk/gtkentry.h>
-#include <gtk/gtkadjustment.h>
 
 
 G_BEGIN_DECLS

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"

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;

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"
 
 
 /**

gtk/gtkviewport.h

@@ -30,7 +30,6 @@
 #define __GTK_VIEWPORT_H__
 
 
-#include <gtk/gtkadjustment.h>
 #include <gtk/gtkbin.h>
 
 

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"
 
 
 /**