[gtk+] Clean up more includes

[Matthias Clasen <matthiasc src gnome org>]

commit b9a59c2ad6305af9bd2b5983c30c07f5ad44bc81
Author: Matthias Clasen <mclasen redhat com>
Date:   Tue Jun 7 20:54:23 2011 -0400

    Clean up more includes
    
    Mainly removing unused h/v includes, but also adding some that
    will be necessary as replacements.

 gtk/gtkcolorsel.c          |    1 -
 gtk/gtkcombobox.c          |    2 +-
 gtk/gtkfilechooserbutton.c |    1 -
 gtk/gtkfontbutton.c        |    1 -
 gtk/gtkscrolledwindow.c    |    1 +
 gtk/gtkscrolledwindow.h    |    2 --
 6 files changed, 2 insertions(+), 6 deletions(-)
---
diff --git a/gtk/gtkcolorsel.c b/gtk/gtkcolorsel.c
index 7f9a1f0..e77edc4 100644
--- a/gtk/gtkcolorsel.c
+++ b/gtk/gtkcolorsel.c
@@ -52,7 +52,6 @@
 #include "gtkhscale.h"
 #include "gtkentry.h"
 #include "gtkbutton.h"
-#include "gtkhseparator.h"
 #include "gtkinvisible.h"
 #include "gtkmenuitem.h"
 #include "gtkmain.h"
diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
index dbe7679..b123de8 100644
--- a/gtk/gtkcombobox.c
+++ b/gtk/gtkcombobox.c
@@ -38,7 +38,7 @@
 #include "gtktearoffmenuitem.h"
 #include "gtktogglebutton.h"
 #include "gtktreeselection.h"
-#include "gtkvseparator.h"
+#include "gtkseparator.h"
 #include "gtkwindow.h"
 #include "gtktypebuiltins.h"
 #include "gtkprivate.h"
diff --git a/gtk/gtkfilechooserbutton.c b/gtk/gtkfilechooserbutton.c
index 81b720d..346b778 100644
--- a/gtk/gtkfilechooserbutton.c
+++ b/gtk/gtkfilechooserbutton.c
@@ -44,7 +44,6 @@
 #include "gtkliststore.h"
 #include "gtkstock.h"
 #include "gtktreemodelfilter.h"
-#include "gtkvseparator.h"
 #include "gtkfilechooserdialog.h"
 #include "gtkfilechooserprivate.h"
 #include "gtkfilechooserutils.h"
diff --git a/gtk/gtkfontbutton.c b/gtk/gtkfontbutton.c
index 0cd08f4..8918248 100644
--- a/gtk/gtkfontbutton.c
+++ b/gtk/gtkfontbutton.c
@@ -34,7 +34,6 @@
 #include "gtkalignment.h"
 #include "gtkhbox.h"
 #include "gtklabel.h"
-#include "gtkvseparator.h"
 #include "gtkfontsel.h"
 #include "gtkimage.h"
 #include "gtkmarshalers.h"
diff --git a/gtk/gtkscrolledwindow.c b/gtk/gtkscrolledwindow.c
index d153c11..292b1e1 100644
--- a/gtk/gtkscrolledwindow.c
+++ b/gtk/gtkscrolledwindow.c
@@ -31,6 +31,7 @@
 #include "gtkbindings.h"
 #include "gtkmarshalers.h"
 #include "gtkscrollable.h"
+#include "gtkscrollbar.h"
 #include "gtkscrolledwindow.h"
 #include "gtkwindow.h"
 #include "gtkprivate.h"
diff --git a/gtk/gtkscrolledwindow.h b/gtk/gtkscrolledwindow.h
index 8266f65..9d86805 100644
--- a/gtk/gtkscrolledwindow.h
+++ b/gtk/gtkscrolledwindow.h
@@ -32,8 +32,6 @@
 #define __GTK_SCROLLED_WINDOW_H__
 
 
-#include <gtk/gtkhscrollbar.h>
-#include <gtk/gtkvscrollbar.h>
 #include <gtk/gtkviewport.h>